Merge branch 'MDL-55504_no-phpunit-utils' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 8 Sep 2016 08:15:14 +0000 (09:15 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 8 Sep 2016 08:15:14 +0000 (09:15 +0100)
lib/xhprof/xhprof_moodle.php

index 293ffac..9a4f850 100644 (file)
@@ -865,7 +865,7 @@ class moodle_xhprofrun implements iXHProfRuns {
 
         $DB->insert_record('profiling', $rec);
 
-        if (PHPUNIT_TEST) {
+        if (PHPUNIT_TEST && !PHPUNIT_UTIL) {
             // Calculate export variables.
             $tempdir = 'profiling';
             make_temp_directory($tempdir);