Index: modules/simpletest/drupal_web_test_case.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/drupal_web_test_case.php,v
retrieving revision 1.127
diff -r1.127 drupal_web_test_case.php
34c34
<   protected $timeLimit = 180;
---
>   protected $timeLimit;      // initialize in constructor from settings value
71a72
>     $this->timeLimit = variable_get('simpletest_set_time_limit_value', 300);
Index: modules/simpletest/simpletest.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.install,v
retrieving revision 1.24
diff -r1.24 simpletest.install
133a134
>   $can_set_time_limit = !ini_get('safe_mode') && strpos(ini_get('disable_functions'), 'set_time_limit') === FALSE;
150c151,160
<     $requirements['php_domdocument']['description'] =t('SimpleTest requires the DOMDocument class to be available. Please check the configure command at the <a href="@link-phpinfo">PHP info page</a>.', array('@link-phpinfo' => url('admin/reports/status/php')));
---
>     $requirements['php_domdocument']['description'] = $t('SimpleTest requires the DOMDocument class to be available. Please check the configure command at the <a href="@link-phpinfo">PHP info page</a>.', array('@link-phpinfo' => url('admin/reports/status/php')));
>   }
> 
>   $requirements['php_set_time_limit'] = array(
>     'title' => $t('Can call %f', array('%f' => 'set_time_limit()')),
>     'value' => $can_set_time_limit ? $t('Yes') : $t('No'),
>   );
>   if (!$can_set_time_limit) {
>      $requirements['php_set_time_limit']['severity'] = REQUIREMENT_ERROR;
>      $requirements['php_set_time_limit']['description'] = $t('Simpletest cannot run in safe_mode or with function set_time_limit() disable. Correct this in php.ini');
Index: modules/simpletest/simpletest.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.pages.inc,v
retrieving revision 1.8
diff -r1.8 simpletest.pages.inc
431c431,438
< 
---
>   $form['general']['simpletest_set_time_limit_value'] = array(
>     '#type' => 'textfield',
>     '#title' => t('PHP script execution time limit'),
>     '#description' => t('Simpletest calls set_time_limit() with this value to increase the PHP script execution time limit to avoid possible timeout error, adjust this value upward if timeout error occur during test run.'),
>     '#default_value' => variable_get('simpletest_set_time_limit_value', 300),
>     '#size' => 5,
>   );
>