Merge "test: raise timeout on structure test"

[lhc/web/wiklou.git] / tests / parserTests.php

diff --git a/tests/parserTests.php b/tests/parserTests.php
index 761ba49..1ef6473 100644 (file)
--- a/tests/parserTests.php
+++ b/tests/parserTests.php
@@ -24,15 +24,15 @@
  * @ingroup Testing
  */
 
-$options = array( 'quick', 'color', 'quiet', 'help', 'show-output', 'record', 'run-disabled' );
-$optionsWithArgs = array( 'regex', 'seed', 'setversion' );
+$otions = array( 'quick', 'color', 'quiet', 'help', 'show-output', 'record', 'run-disabled' );
+$optionsWithArgs = array( 'regex', 'filter', 'seed', 'setversion' );
 
-require_once( dirname( __FILE__ ) . '/../maintenance/commandLine.inc' );
+require_once( __DIR__ . '/../maintenance/commandLine.inc' );
+require_once( __DIR__ . '/TestsAutoLoader.php' );
 
 if ( isset( $options['help'] ) ) {
-       $version = MW_VERSION;
        echo <<<ENDS
-MediaWiki $version parser test suite
+MediaWiki $wgVersion parser test suite
 Usage: php parserTests.php [options...]
 
 Options:
@@ -40,19 +40,19 @@ Options:
   --quiet          Suppress notification of passed tests (shows only failed tests)
   --show-output    Show expected and actual output
   --color[=yes|no] Override terminal detection and force color output on or off
-                                  use wgCommandLineDarkBg = true; if your term is dark
+                   use wgCommandLineDarkBg = true; if your term is dark
   --regex          Only run tests whose descriptions which match given regex
+  --filter         Alias for --regex
   --file=<testfile> Run test cases from a custom file instead of parserTests.txt
   --record         Record tests in database
   --compare        Compare with recorded results, without updating the database.
   --setversion     When using --record, set the version string to use (useful
-                                  with git-svn so that you can get the exact revision)
+                   with git-svn so that you can get the exact revision)
   --keep-uploads   Re-use the same upload directory for each test, don't delete it
   --fuzz           Do a fuzz test instead of a normal test
   --seed <n>       Start the fuzz test from the specified seed
   --help           Show this help message
   --run-disabled   run disabled tests
-  --upload         Upload test results to remote wiki (per \$wgParserTestRemote)
 
 ENDS;
        exit( 0 );