From: X! <soxred93@users.mediawiki.org>
Date: Sat, 1 Jan 2011 06:49:00 +0000 (+0000)
Subject: Add parsertest specific help to PHPUnit.php
X-Git-Tag: 1.31.0-rc.0~32934
X-Git-Url: http://git.cyclocoop.org/clavettes/images/siteon3.jpg?a=commitdiff_plain;h=332e01addfd6738b0ffbd3b44699ce03cf213d81;p=lhc%2Fweb%2Fwiklou.git

Add parsertest specific help to PHPUnit.php
---

diff --git a/tests/phpunit/MediaWikiPHPUnitCommand.php b/tests/phpunit/MediaWikiPHPUnitCommand.php
index 8a6665c603..6ca9976be5 100644
--- 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 68dd5e6465..8292cadfd3 100644
--- 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