Merge "Use local context to get messages and don't use implicit Message object to...

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

diff --git a/tests/parserTests.php b/tests/parserTests.php
index bc32816..d930ac5 100644 (file)
--- a/tests/parserTests.php
+++ b/tests/parserTests.php
@@ -21,13 +21,13 @@
  * http://www.gnu.org/copyleft/gpl.html
  *
  * @file
- * @ingroup Maintenance
+ * @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__ ) . '/../commandLine.inc' );
+require_once( dirname( __FILE__ ) . '/../maintenance/commandLine.inc' );
 
 if ( isset( $options['help'] ) ) {
        echo <<<ENDS
@@ -39,19 +39,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 );
@@ -59,8 +59,9 @@ ENDS;
 
 # Cases of weird db corruption were encountered when running tests on earlyish
 # versions of SQLite
-if ( wfGetDB( DB_MASTER )->getType() == 'sqlite' ) {
-       $version = wfGetDB( DB_MASTER )->getServerVersion();
+if ( $wgDBtype == 'sqlite' ) {
+       $db = wfGetDB( DB_MASTER );
+       $version = $db->getServerVersion();
        if ( version_compare( $version, '3.6' ) < 0 ) {
                die( "Parser tests require SQLite version 3.6 or later, you have $version\n" );
        }