Add parsertest specific help to PHPUnit.php

diff --git a/tests/phpunit/MediaWikiPHPUnitCommand.php b/tests/phpunit/MediaWikiPHPUnitCommand.php
index 8a6665c..6ca9976 100644 (file)
--- a/tests/phpunit/MediaWikiPHPUnitCommand.php
+++ b/tests/phpunit/MediaWikiPHPUnitCommand.php
@@ -4,13 +4,10 @@ class MediaWikiPHPUnitCommand extends PHPUnit_TextUI_Command {
        
        static $additionalOptions = array( 
                'regex=' => false, 
-               'record' => false,
                'file=' => false,
                'keep-uploads' => false,
        );
        
-       //Fixme: These aren't shown on the --help menu
-
        public function __construct() {
                foreach( self::$additionalOptions as $option => $default ) {
                        $this->longOptions[$option] = $option . 'Handler';
@@ -31,4 +28,19 @@ class MediaWikiPHPUnitCommand extends PHPUnit_TextUI_Command {
                }
        }
        
+       public function showHelp() {
+               parent::showHelp();
+               
+               print <<<EOT
+
+ParserTest-specific options:
+
+  --regex="<regex>"        Only run parser tests that match the given regex
+  --file="<filename>"      Prints the version and exits.
+  --keep-uploads           Re-use the same upload directory for each test, don't delete it
+  
+
+EOT;
+       }
+       
 }

diff --git a/tests/phpunit/includes/parser/NewParserTest.php b/tests/phpunit/includes/parser/NewParserTest.php
index 68dd5e6..8292cad 100644 (file)
--- a/tests/phpunit/includes/parser/NewParserTest.php
+++ b/tests/phpunit/includes/parser/NewParserTest.php
@@ -24,10 +24,6 @@ class NewParserTest extends MediaWikiTestCase {
                
                //Setup CLI arguments
                if ( $this->getCliArg( 'regex=' ) ) {
-                       if ( $this->getCliArg( 'record' ) ) {
-                               echo "Warning: --record cannot be used with --regex, disabling --record\n";
-                               $this->setCliArg( 'record', false );
-                       }
                        $this->regex = $this->getCliArg( 'regex=' );
                } else {
                        # Matches anything