Follow-up to r68544: restored the ability to run tests from separate files

diff --git a/maintenance/tests/phpunit b/maintenance/tests/phpunit
index 1e477fe..b893847 100755 (executable)
--- a/maintenance/tests/phpunit
+++ b/maintenance/tests/phpunit
@@ -26,9 +26,14 @@ EOF;
 
 class MWPHPUnitCommand extends PHPUnit_TextUI_Command {
        protected function handleCustomTestSuite() {
-               require( dirname( __FILE__ ) . '/TestFileList.php' );
                $suite = new PHPUnit_Framework_TestSuite;
-               foreach ( $testFiles as $file ) {
+               if ( !empty( $this->options[1] ) ) {
+                       $files = $this->options[1];
+               } else {
+                       require( dirname( __FILE__ ) . '/TestFileList.php' );
+                       $files = $testFiles;
+               }
+               foreach ( $files as $file ) {
                        $suite->addTestFile( $file );
                }
                $suite->setName( 'MediaWiki test suite' );

diff --git a/maintenance/tests/phpunit.bat b/maintenance/tests/phpunit.bat
index c7234c1..c8aa581 100644 (file)
--- a/maintenance/tests/phpunit.bat
+++ b/maintenance/tests/phpunit.bat
@@ -1 +1 @@
-@php phpunit
\ No newline at end of file
+@php phpunit %1 %2 %3 %4 %5 %6 %7 %8 %9
\ No newline at end of file