* Updated run-tests.bat to take recent changes into account

* Fixed $wgHooks being reset during tests - thanks, Platonides

diff --git a/maintenance/tests/phpunit/includes/ResourceLoaderTest.php b/maintenance/tests/phpunit/includes/ResourceLoaderTest.php
index dbb529b..2ed3d02 100644 (file)
--- a/maintenance/tests/phpunit/includes/ResourceLoaderTest.php
+++ b/maintenance/tests/phpunit/includes/ResourceLoaderTest.php
@@ -67,5 +67,5 @@ class ResourceLoaderTest extends PHPUnit_Framework_TestCase {
 class ResourceLoaderTestModule extends ResourceLoaderModule { }
 
 /* Hooks */
-
+global $wgHooks;
 $wgHooks['ResourceLoaderRegisterModules'][] = 'ResourceLoaderTest::resourceLoaderRegisterModules';
\ No newline at end of file

diff --git a/maintenance/tests/phpunit/run-tests.bat b/maintenance/tests/phpunit/run-tests.bat
index c8338a0..e6eb3e0 100644 (file)
--- a/maintenance/tests/phpunit/run-tests.bat
+++ b/maintenance/tests/phpunit/run-tests.bat
@@ -1 +1 @@
-phpunit --configuration suite.xml %1 %2 %3 %4 %5 %6 %7 %8 %9
+php phpunit.php --configuration suite.xml %*