Merge branch 'MDL-38912_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

2013-04-09 01:39:49 +02:00
parent d11c78a127 1e659c865a
commit f6a2e02702
1 changed files with 8 additions and 0 deletions
@@ -606,6 +606,14 @@ class phpunit_util {
            if ($COURSE->id != $oldsite->id) {
                $warnings[] = 'Warning: unexpected change of $COURSE';
            }
+
+            if (ini_get('max_execution_time') != 0) {
+                // TODO un-comment this warning, once we have fixed the test
+                // failures that it causes.
+                // $warnings[] = 'Warning: max_execution_time was changed.';
+                // See MDL-38989 for details.
+                set_time_limit(0);
+            }
        }

        // restore original globals