| Index: trunk/phase3/tests/phpunit/MediaWikiPHPUnitCommand.php |
| — | — | @@ -4,13 +4,10 @@ |
| 5 | 5 | |
| 6 | 6 | static $additionalOptions = array( |
| 7 | 7 | 'regex=' => false, |
| 8 | | - 'record' => false, |
| 9 | 8 | 'file=' => false, |
| 10 | 9 | 'keep-uploads' => false, |
| 11 | 10 | ); |
| 12 | 11 | |
| 13 | | - //Fixme: These aren't shown on the --help menu |
| 14 | | - |
| 15 | 12 | public function __construct() { |
| 16 | 13 | foreach( self::$additionalOptions as $option => $default ) { |
| 17 | 14 | $this->longOptions[$option] = $option . 'Handler'; |
| — | — | @@ -31,4 +28,19 @@ |
| 32 | 29 | } |
| 33 | 30 | } |
| 34 | 31 | |
| | 32 | + public function showHelp() { |
| | 33 | + parent::showHelp(); |
| | 34 | + |
| | 35 | + print <<<EOT |
| | 36 | + |
| | 37 | +ParserTest-specific options: |
| | 38 | + |
| | 39 | + --regex="<regex>" Only run parser tests that match the given regex |
| | 40 | + --file="<filename>" Prints the version and exits. |
| | 41 | + --keep-uploads Re-use the same upload directory for each test, don't delete it |
| | 42 | + |
| | 43 | + |
| | 44 | +EOT; |
| | 45 | + } |
| | 46 | + |
| 35 | 47 | } |
| Index: trunk/phase3/tests/phpunit/includes/parser/NewParserTest.php |
| — | — | @@ -24,10 +24,6 @@ |
| 25 | 25 | |
| 26 | 26 | //Setup CLI arguments |
| 27 | 27 | if ( $this->getCliArg( 'regex=' ) ) { |
| 28 | | - if ( $this->getCliArg( 'record' ) ) { |
| 29 | | - echo "Warning: --record cannot be used with --regex, disabling --record\n"; |
| 30 | | - $this->setCliArg( 'record', false ); |
| 31 | | - } |
| 32 | 28 | $this->regex = $this->getCliArg( 'regex=' ); |
| 33 | 29 | } else { |
| 34 | 30 | # Matches anything |