Merge branch 'w17_MDL-39343_m25_installupgrade' of git://github.com/s…

…kodak/moodle
Chitrank-Dixit · Apr 30, 2013 · 24fa63f · 24fa63f
2 parents 4410509 + 2cc9fa8
commit 24fa63f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/admin/tool/behat/cli/util.php b/admin/tool/behat/cli/util.php
@@ -50,6 +50,9 @@
     )
 );
 
+if ($options['install'] or $options['drop']) {
+    define('CACHE_DISABLE_ALL', true);
+}
 
 // Checking util.php CLI script usage.
 $help = "

diff --git a/admin/tool/phpunit/cli/util.php b/admin/tool/phpunit/cli/util.php
@@ -60,6 +60,10 @@
     }
 }
 
+if ($options['install'] or $options['drop']) {
+    define('CACHE_DISABLE_ALL', true);
+}
+
 if ($options['run']) {
     unset($options);
     unset($unrecognized);