Fix syntax error from r55287
[lhc/web/wiklou.git] / maintenance / parserTests.inc
index 01409c1..ab05cca 100644 (file)
  */
 
 /** */
-$options = array( 'quick', 'color', 'quiet', 'help', 'show-output', 'record' );
-$optionsWithArgs = array( 'regex' );
+$options = array( 'quick', 'color', 'quiet', 'help', 'show-output', 'record'. 'run-disabled' );
+$optionsWithArgs = array( 'regex', 'seed', 'setversion' );
 
-require_once( 'commandLine.inc' );
+require_once( dirname(__FILE__) . '/commandLine.inc' );
 require_once( "$IP/maintenance/parserTestsParserHook.php" );
 require_once( "$IP/maintenance/parserTestsStaticParserHook.php" );
 require_once( "$IP/maintenance/parserTestsParserTime.php" );
@@ -62,6 +62,10 @@ class ParserTest {
         */
        private $oldTablePrefix;
 
+       private $maxFuzzTestLength = 300;
+       private $fuzzSeed = 0;
+       private $memoryLimit = 50;
+
        /**
         * Sets terminal colorization and diff/quick modes depending on OS and
         * command-line options (--color and --quick).
@@ -112,11 +116,19 @@ class ParserTest {
                        $this->recorder = new DbTestRecorder( $this );
                } elseif( isset( $options['compare'] ) ) {
                        $this->recorder = new DbTestPreviewer( $this );
+               } elseif( isset( $options['upload'] ) ) {
+                       $this->recorder = new RemoteTestRecorder( $this );
                } else {
                        $this->recorder = new TestRecorder( $this );
                }
                $this->keepUploads = isset( $options['keep-uploads'] );
 
+               if ( isset( $options['seed'] ) ) {
+                       $this->fuzzSeed = intval( $options['seed'] ) - 1;
+               }
+
+               $this->runDisabled = isset( $options['run-disabled'] );
+
                $this->hooks = array();
                $this->functionHooks = array();
        }
@@ -133,6 +145,119 @@ class ParserTest {
                }
        }
 
+       /**
+        * Run a fuzz test series
+        * Draw input from a set of test files
+        */
+       function fuzzTest( $filenames ) {
+               $dict = $this->getFuzzInput( $filenames );
+               $dictSize = strlen( $dict );
+               $logMaxLength = log( $this->maxFuzzTestLength );
+               $this->setupDatabase();
+               ini_set( 'memory_limit', $this->memoryLimit * 1048576 );
+
+               $numTotal = 0;
+               $numSuccess = 0;
+               $user = new User;
+               $opts = ParserOptions::newFromUser( $user );
+               $title = Title::makeTitle( NS_MAIN, 'Parser_test' );
+
+               while ( true ) {
+                       // Generate test input
+                       mt_srand( ++$this->fuzzSeed );
+                       $totalLength = mt_rand( 1, $this->maxFuzzTestLength );
+                       $input = '';
+                       while ( strlen( $input ) < $totalLength ) {
+                               $logHairLength = mt_rand( 0, 1000000 ) / 1000000 * $logMaxLength;
+                               $hairLength = min( intval( exp( $logHairLength ) ), $dictSize );
+                               $offset = mt_rand( 0, $dictSize - $hairLength );
+                               $input .= substr( $dict, $offset, $hairLength );
+                       }
+
+                       $this->setupGlobals();
+                       $parser = $this->getParser();
+                       // Run the test
+                       try {
+                               $parser->parse( $input, $title, $opts );
+                               $fail = false;
+                       } catch ( Exception $exception ) {
+                               $fail = true;
+                       }
+
+                       if ( $fail ) {
+                               echo "Test failed with seed {$this->fuzzSeed}\n";
+                               echo "Input:\n";
+                               var_dump( $input );
+                               echo "\n\n";
+                               echo "$exception\n";
+                       } else {
+                               $numSuccess++;
+                       }
+                       $numTotal++;
+                       $this->teardownGlobals();
+                       $parser->__destruct();
+
+                       if ( $numTotal % 100 == 0 ) {
+                               $usage = intval( memory_get_usage( true ) / $this->memoryLimit / 1048576 * 100 );
+                               echo "{$this->fuzzSeed}: $numSuccess/$numTotal (mem: $usage%)\n";
+                               if ( $usage > 90 ) {
+                                       echo "Out of memory:\n";
+                                       $memStats = $this->getMemoryBreakdown();
+                                       foreach ( $memStats as $name => $usage ) {
+                                               echo "$name: $usage\n";
+                                       }
+                                       $this->abort();
+                               }
+                       }
+               }
+       }
+
+       /**
+        * Get an input dictionary from a set of parser test files
+        */
+       function getFuzzInput( $filenames ) {
+               $dict = '';
+               foreach( $filenames as $filename ) {
+                       $contents = file_get_contents( $filename );
+                       preg_match_all( '/!!\s*input\n(.*?)\n!!\s*result/s', $contents, $matches );
+                       foreach ( $matches[1] as $match ) {
+                               $dict .= $match . "\n";
+                       }
+               }
+               return $dict;
+       }
+
+       /**
+        * Get a memory usage breakdown
+        */
+       function getMemoryBreakdown() {
+               $memStats = array();
+               foreach ( $GLOBALS as $name => $value ) {
+                       $memStats['$'.$name] = strlen( serialize( $value ) );
+               }
+               $classes = get_declared_classes();
+               foreach ( $classes as $class ) {
+                       $rc = new ReflectionClass( $class );
+                       $props = $rc->getStaticProperties();
+                       $memStats[$class] = strlen( serialize( $props ) );
+                       $methods = $rc->getMethods();
+                       foreach ( $methods as $method ) {
+                               $memStats[$class] += strlen( serialize( $method->getStaticVariables() ) );
+                       }
+               }
+               $functions = get_defined_functions();
+               foreach ( $functions['user'] as $function ) {
+                       $rf = new ReflectionFunction( $function );
+                       $memStats["$function()"] = strlen( serialize( $rf->getStaticVariables() ) );
+               }
+               asort( $memStats );
+               return $memStats;
+       }
+
+       function abort() {
+               $this->abort();
+       }
+
        /**
         * Run a series of tests listed in the given text files.
         * Each test consists of a brief description, wikitext input,
@@ -160,7 +285,7 @@ class ParserTest {
        private function runFile( $filename ) {
                $infile = fopen( $filename, 'rt' );
                if( !$infile ) {
-                       wfDie( "Couldn't open $filename\n" );
+                       wfDie( "Couldn't open file '$filename'\n" );
                } else {
                        global $IP;
                        $relative = wfRelativePath( $filename, $IP );
@@ -232,8 +357,11 @@ class ParserTest {
                                        else {
                                                $data['options'] = $this->chomp( $data['options'] );
                                        }
-                                       if (preg_match('/\\bdisabled\\b/i', $data['options'])
-                                               || !preg_match("/{$this->regex}/i", $data['test'])) {
+                                       if (!isset( $data['config'] ) )
+                                               $data['config'] = '';
+                                       
+                                       if ( (preg_match('/\\bdisabled\\b/i', $data['options'])
+                                               || !preg_match("/{$this->regex}/i", $data['test'])) && !$this->runDisabled ) {
                                                # disabled test
                                                $data = array();
                                                $section = null;
@@ -243,7 +371,9 @@ class ParserTest {
                                                $this->chomp( $data['test'] ),
                                                $this->chomp( $data['input'] ),
                                                $this->chomp( $data['result'] ),
-                                               $this->chomp( $data['options'] ) );
+                                               $this->chomp( $data['options'] ),
+                                               $this->chomp( $data['config']   )
+                                               );
                                        $ok = $ok && $result;
                                        $this->recorder->record( $this->chomp( $data['test'] ), $result );
                                        $data = array();
@@ -266,6 +396,24 @@ class ParserTest {
                return $ok;
        }
 
+       /**
+        * Get a Parser object
+        */
+       function getParser() {
+               global $wgParserConf;
+               $class = $wgParserConf['class'];
+               $parser = new $class( $wgParserConf );
+               foreach( $this->hooks as $tag => $callback ) {
+                       $parser->setHook( $tag, $callback );
+               }
+               foreach( $this->functionHooks as $tag => $bits ) {
+                       list( $callback, $flags ) = $bits;
+                       $parser->setFunctionHook( $tag, $callback, $flags );
+               }
+               wfRunHooks( 'ParserTestParser', array( &$parser ) );
+               return $parser;
+       }
+
        /**
         * Run a given wikitext input through a freshly-constructed wiki parser,
         * and compare the output against the expected results.
@@ -275,64 +423,57 @@ class ParserTest {
         * @param string $result Result to output
         * @return bool
         */
-       private function runTest( $desc, $input, $result, $opts ) {
-               global $wgParserConf;
+       private function runTest( $desc, $input, $result, $opts, $config ) {
                if( $this->showProgress ) {
                        $this->showTesting( $desc );
                }
 
-               $this->setupGlobals($opts);
+               $opts = $this->parseOptions( $opts );
+               $this->setupGlobals($opts, $config);
 
                $user = new User();
                $options = ParserOptions::newFromUser( $user );
 
-               if (preg_match('/\\bmath\\b/i', $opts)) {
+               if ( isset( $opts['math'] ) ) {
                        # XXX this should probably be done by the ParserOptions
                        $options->setUseTex(true);
                }
 
                $m = array();
-               if (preg_match('/title=\[\[(.*)\]\]/', $opts, $m)) {
-                       $titleText = $m[1];
+               if (isset( $opts['title'] ) ) {
+                       $titleText = $opts['title'];
                }
                else {
                        $titleText = 'Parser test';
                }
 
-               $noxml = (bool)preg_match( '~\\b noxml \\b~x', $opts );
-
-               $class = $wgParserConf['class'];
-               $parser = new $class( $wgParserConf );
-               foreach( $this->hooks as $tag => $callback ) {
-                       $parser->setHook( $tag, $callback );
-               }
-               foreach( $this->functionHooks as $tag => $bits ) {
-                       list( $callback, $flags ) = $bits;
-                       $parser->setFunctionHook( $tag, $callback, $flags );
-               }
-               wfRunHooks( 'ParserTestParser', array( &$parser ) );
-
-               $title =& Title::makeTitle( NS_MAIN, $titleText );
+               $noxml = isset( $opts['noxml'] );
+               $local = isset( $opts['local'] );
+               $parser = $this->getParser();
+               $title = Title::newFromText( $titleText );
 
                $matches = array();
-               if (preg_match('/\\bpst\\b/i', $opts)) {
+               if( isset( $opts['pst'] ) ) {
                        $out = $parser->preSaveTransform( $input, $title, $user, $options );
-               } elseif (preg_match('/\\bmsg\\b/i', $opts)) {
+               } elseif( isset( $opts['msg'] ) ) {
                        $out = $parser->transformMsg( $input, $options );
-               } elseif( preg_match( '/\\bsection=([\w-]+)\b/i', $opts, $matches ) ) {
-                       $section = $matches[1];
+               } elseif( isset( $opts['section'] ) ) {
+                       $section = $opts['section'];
                        $out = $parser->getSection( $input, $section );
-               } elseif( preg_match( '/\\breplace=([\w-]+),"(.*?)"/i', $opts, $matches ) ) {
-                       $section = $matches[1];
-                       $replace = $matches[2];
+               } elseif( isset( $opts['replace'] ) ) {
+                       $section = $opts['replace'][0];
+                       $replace = $opts['replace'][1];
                        $out = $parser->replaceSection( $input, $section, $replace );
+               } elseif( isset( $opts['comment'] ) ) {
+                       $linker = $user->getSkin();
+                       $out = $linker->formatComment( $input, $title, $local );
                } else {
                        $output = $parser->parse( $input, $title, $options, true, true, 1337 );
                        $out = $output->getText();
 
-                       if (preg_match('/\\bill\\b/i', $opts)) {
+                       if (isset( $opts['ill'] ) ) {
                                $out = $this->tidy( implode( ' ', $output->getLanguageLinks() ) );
-                       } else if (preg_match('/\\bcat\\b/i', $opts)) {
+                       } elseif( isset( $opts['cat'] ) ) {
                                global $wgOut;
                                $wgOut->addCategoryLinks($output->getCategories());
                                $cats = $wgOut->getCategoryLinks();
@@ -358,35 +499,103 @@ class ParserTest {
 
        /**
         * Use a regex to find out the value of an option
-        * @param $regex A regex, the first group will be the value returned
-        * @param $opts Options line to look in
-        * @param $defaults Default value returned if the regex does not match
+        * @param $key name of option val to retrieve
+        * @param $opts Options array to look in
+        * @param $defaults Default value returned if not found
         */
-       private static function getOptionValue( $regex, $opts, $default ) {
-               $m = array();
-               if( preg_match( $regex, $opts, $m ) ) {
-                       return $m[1];
+       private static function getOptionValue( $key, $opts, $default ) {
+               $key = strtolower( $key );
+               if( isset( $opts[$key] ) ) {
+                       return $opts[$key];
                } else {
                        return $default;
                }
        }
+       
+       private function parseOptions( $instring ) {
+               $opts = array();
+               $lines = explode( "\n", $instring );
+               // foo
+               // foo=bar
+               // foo="bar baz"
+               // foo=[[bar baz]]
+               // foo=bar,"baz quux"
+               $regex = '/\b
+                       ([\w-]+)                                                # Key
+                       \b
+                       (?:\s*
+                               =                                               # First sub-value
+                               \s*
+                               (
+                                       "
+                                               [^"]*                   # Quoted val
+                                       "
+                               |
+                                       \[\[
+                                               [^]]*                   # Link target
+                                       \]\]
+                               |
+                                       [\w-]+                          # Plain word
+                               )
+                               (?:\s*
+                                       ,                                       # Sub-vals 1..N
+                                       \s*
+                                       (
+                                               "[^"]*"                 # Quoted val
+                                       |
+                                               \[\[[^]]*\]\]   # Link target
+                                       |
+                                               [\w-]+                  # Plain word
+                                       )
+                               )*
+                       )?
+                       /x';
+
+               if( preg_match_all( $regex, $instring, $matches, PREG_SET_ORDER ) ) {
+                       foreach( $matches as $bits ) {
+                               $match = array_shift( $bits );
+                               $key = strtolower( array_shift( $bits ) );
+                               if( count( $bits ) == 0 ) {
+                                       $opts[$key] = true;
+                               } elseif( count( $bits ) == 1 ) {
+                                       $opts[$key] = $this->cleanupOption( array_shift( $bits ) );
+                               } else {
+                                       // Array!
+                                       $opts[$key] = array_map( array( $this, 'cleanupOption' ), $bits );
+                               }
+                       }
+               }
+               return $opts;
+       }
+       
+       private function cleanupOption( $opt ) {
+               if( substr( $opt, 0, 1 ) == '"' ) {
+                       return substr( $opt, 1, -1 );
+               }
+               if( substr( $opt, 0, 2 ) == '[[' ) {
+                       return substr( $opt, 2, -2 );
+               }
+               return $opt;
+       }
 
        /**
         * Set up the global variables for a consistent environment for each test.
         * Ideally this should replace the global configuration entirely.
         */
-       private function setupGlobals($opts = '') {
+       private function setupGlobals($opts = '', $config = '') {
                if( !isset( $this->uploadDir ) ) {
                        $this->uploadDir = $this->setupUploadDir();
                }
 
                # Find out values for some special options.
                $lang =
-                       self::getOptionValue( '/language=([a-z]+(?:_[a-z]+)?)/', $opts, 'en' );
+                       self::getOptionValue( 'language', $opts, 'en' );
                $variant =
-                       self::getOptionValue( '/variant=([a-z]+(?:-[a-z]+)?)/', $opts, false );
+                       self::getOptionValue( 'variant', $opts, false );
                $maxtoclevel =
-                       self::getOptionValue( '/wgMaxTocLevel=(\d+)/', $opts, 999 );
+                       self::getOptionValue( 'wgMaxTocLevel', $opts, 999 );
+               $linkHolderBatchSize = 
+                       self::getOptionValue( 'wgLinkHolderBatchSize', $opts, 1000 );
 
                $settings = array(
                        'wgServer' => 'http://localhost',
@@ -409,13 +618,14 @@ class ParserTest {
                        'wgLanguageCode' => $lang,
                        'wgContLanguageCode' => $lang,
                        'wgDBprefix' => 'parsertest_',
-                       'wgRawHtml' => preg_match('/\\brawhtml\\b/i', $opts),
+                       'wgRawHtml' => isset( $opts['rawhtml'] ),
                        'wgLang' => null,
                        'wgContLang' => null,
-                       'wgNamespacesWithSubpages' => array( 0 => preg_match('/\\bsubpage\\b/i', $opts)),
+                       'wgNamespacesWithSubpages' => array( 0 => isset( $opts['subpage'] ) ),
                        'wgMaxTocLevel' => $maxtoclevel,
                        'wgCapitalLinks' => true,
                        'wgNoFollowLinks' => true,
+                       'wgNoFollowDomainExceptions' => array(),
                        'wgThumbnailScriptPath' => false,
                        'wgUseTeX' => false,
                        'wgLocaltimezone' => 'UTC',
@@ -430,9 +640,27 @@ class ParserTest {
                                'createpage'    => true,
                                'createtalk'    => true,
                        ) ),
+                       'wgNamespaceProtection' => array( NS_MEDIAWIKI => 'editinterface' ),
                        'wgDefaultExternalStore' => array(),
                        'wgForeignFileRepos' => array(),
+                       'wgLinkHolderBatchSize' => $linkHolderBatchSize,
+                       'wgEnforceHtmlIds' => true,
+                       'wgExternalLinkTarget' => false,
+                       'wgAlwaysUseTidy' => false,
+                       'wgHtml5' => true,
+                       'wgWellFormedXml' => true,
                        );
+
+               if ($config) {
+                       $configLines = explode( "\n", $config );
+                       
+                       foreach( $configLines as $line ) {
+                               list( $var, $value ) = explode( '=', $line, 2 );
+                               
+                               $settings[$var] = eval("return $value;" );
+                       }
+               }
+               
                $this->savedGlobals = array();
                foreach( $settings as $var => $val ) {
                        $this->savedGlobals[$var] = $GLOBALS[$var];
@@ -441,6 +669,7 @@ class ParserTest {
                $langObj = Language::factory( $lang );
                $GLOBALS['wgLang'] = $langObj;
                $GLOBALS['wgContLang'] = $langObj;
+               $GLOBALS['wgMemc'] = new FakeMemCachedClient;
 
                //$GLOBALS['wgMessageCache'] = new MessageCache( new BagOStuff(), false, 0, $GLOBALS['wgDBname'] );
 
@@ -459,7 +688,7 @@ class ParserTest {
                        'categorylinks', 'templatelinks', 'externallinks', 'langlinks',
                        'site_stats', 'hitcounter',     'ipblocks', 'image', 'oldimage',
                        'recentchanges', 'watchlist', 'math', 'interwiki',
-                       'querycache', 'objectcache', 'job', 'redirect', 'querycachetwo',
+                       'querycache', 'objectcache', 'job', 'l10n_cache', 'redirect', 'querycachetwo',
                        'archive', 'user_groups', 'page_props', 'category'
                );
 
@@ -480,7 +709,7 @@ class ParserTest {
         * the db will be visible to later tests in the run.
         */
        private function setupDatabase() {
-               global $wgDBprefix;
+               global $wgDBprefix, $wgDBtype;
                if ( $this->databaseSetupDone ) {
                        return;
                }
@@ -491,7 +720,9 @@ class ParserTest {
                $this->oldTablePrefix = $wgDBprefix;
 
                # CREATE TEMPORARY TABLE breaks if there is more than one server
-               if ( wfGetLB()->getServerCount() != 1 ) {
+               # FIXME: r40209 makes temporary tables break even with just one server
+               # FIXME: (bug 15892); disabling the feature entirely as a temporary fix
+               if ( true || wfGetLB()->getServerCount() != 1 ) {
                        $this->useTemporaryTables = false;
                }
 
@@ -500,15 +731,16 @@ class ParserTest {
                $db = wfGetDB( DB_MASTER );
                $tables = $this->listTables();
 
-               if (!(strcmp($db->getServerVersion(), '4.1') < 0 and stristr($db->getSoftwareLink(), 'MySQL'))) {
+               if ( !( $wgDBtype == 'mysql' && strcmp( $db->getServerVersion(), '4.1' ) < 0 ) ) {
                        # Database that supports CREATE TABLE ... LIKE
-                       global $wgDBtype;
+                       
                        if( $wgDBtype == 'postgres' ) {
                                $def = 'INCLUDING DEFAULTS';
+                               $temporary = 'TEMPORARY';
                        } else {
                                $def = '';
                        }
-                       foreach ($tables as $tbl) {
+                       foreach ( $tables as $tbl ) {
                                # Clean up from previous aborted run.  So that table escaping
                                # works correctly across DB engines, we need to change the pre-
                                # fix back and forth so tableName() works right.
@@ -517,11 +749,11 @@ class ParserTest {
                                $this->changePrefix( 'parsertest_' );
                                $newTableName = $db->tableName( $tbl );
 
-                               if ( $db->tableExists( $tbl ) ) {
-                                       $db->query("DROP TABLE $newTableName");
+                               if ( $db->tableExists( $tbl ) && $wgDBtype != 'postgres' ) {
+                                       $db->query( "DROP TABLE $newTableName" );
                                }
                                # Create new table
-                               $db->query("CREATE $temporary TABLE $newTableName (LIKE $oldTableName $def)");
+                               $db->query( "CREATE $temporary TABLE $newTableName (LIKE $oldTableName $def)" );
                        }
                } else {
                        # Hack for MySQL versions < 4.1, which don't support
@@ -551,10 +783,10 @@ class ParserTest {
                # Hack: insert a few Wikipedia in-project interwiki prefixes,
                # for testing inter-language links
                $db->insert( 'interwiki', array(
-                       array( 'iw_prefix' => 'Wikipedia',
+                       array( 'iw_prefix' => 'wikipedia',
                                   'iw_url'    => 'http://en.wikipedia.org/wiki/$1',
                                   'iw_local'  => 0 ),
-                       array( 'iw_prefix' => 'MeatBall',
+                       array( 'iw_prefix' => 'meatball',
                                   'iw_url'    => 'http://www.usemod.com/cgi-bin/mb.pl?$1',
                                   'iw_local'  => 0 ),
                        array( 'iw_prefix' => 'zh',
@@ -590,6 +822,9 @@ class ParserTest {
 
                # Update certain things in site_stats
                $db->insert( 'site_stats', array( 'ss_row_id' => 1, 'ss_images' => 1, 'ss_good_articles' => 1 ) );
+
+               # Reinitialise the LocalisationCache to match the database state
+               Language::getLocalisationCache()->unloadAll();
        }
 
        /**
@@ -621,11 +856,12 @@ class ParserTest {
                        return;
                }
 
+               /*
                $tables = $this->listTables();
                $db = wfGetDB( DB_MASTER );
                foreach ( $tables as $table ) {
                        $db->query( "DROP TABLE `parsertest_$table`" );
-               }
+               }*/
        }
        
        /**
@@ -645,9 +881,11 @@ class ParserTest {
                }
 
                wfDebug( "Creating upload directory $dir\n" );
-               mkdir( $dir );
-               mkdir( $dir . '/3' );
-               mkdir( $dir . '/3/3a' );
+               if ( file_exists( $dir ) ) {
+                       wfDebug( "Already exists!\n" );
+                       return $dir;
+               }
+               wfMkdirParents( $dir . '/3/3a' );
                copy( "$IP/skins/monobook/headbg.jpg", "$dir/3/3a/Foobar.jpg" );
                return $dir;
        }
@@ -658,6 +896,7 @@ class ParserTest {
         */
        private function teardownGlobals() {
                RepoGroup::destroySingleton();
+               LinkCache::singleton()->clear();
                foreach( $this->savedGlobals as $var => $val ) {
                        $GLOBALS[$var] = $val;
                }
@@ -871,6 +1110,7 @@ class ParserTest {
         */
        private function requireHook( $name ) {
                global $wgParser;
+               $wgParser->firstCallInit( ); //make sure hooks are loaded.
                if( isset( $wgParser->mTagHooks[$name] ) ) {
                        $this->hooks[$name] = $wgParser->mTagHooks[$name];
                } else {
@@ -886,6 +1126,7 @@ class ParserTest {
         */
        private function requireFunctionHook( $name ) {
                global $wgParser;
+               $wgParser->firstCallInit( ); //make sure hooks are loaded.
                if( isset( $wgParser->mFunctionHooks[$name] ) ) {
                        $this->functionHooks[$name] = $wgParser->mFunctionHooks[$name];
                } else {
@@ -1235,7 +1476,7 @@ class DbTestRecorder extends DbTestPreviewer  {
         * and all that fun stuff
         */
        function start() {
-               global $wgDBtype, $wgDBprefix;
+               global $wgDBtype, $wgDBprefix, $options;
                $this->db->begin();
 
                if( ! $this->db->tableExists( 'testrun' ) 
@@ -1254,7 +1495,8 @@ class DbTestRecorder extends DbTestPreviewer  {
                $this->db->insert( 'testrun',
                        array(
                                'tr_date'        => $this->db->timestamp(),
-                               'tr_mw_version'  => SpecialVersion::getVersion(),
+                               'tr_mw_version'  => isset( $options['setversion'] ) ?
+                                       $options['setversion'] : SpecialVersion::getVersion(),
                                'tr_php_version' => phpversion(),
                                'tr_db_version'  => $this->db->getServerVersion(),
                                'tr_uname'       => php_uname()
@@ -1282,3 +1524,91 @@ class DbTestRecorder extends DbTestPreviewer  {
                        __METHOD__ );
        }
 }
+
+class RemoteTestRecorder extends TestRecorder {
+       function start() {
+               parent::start();
+               $this->results = array();
+               $this->ping( 'running' );
+       }
+       
+       function record( $test, $result ) {
+               parent::record( $test, $result );
+               $this->results[$test] = (bool)$result;
+       }
+       
+       function end() {
+               $this->ping( 'complete', $this->results );
+               parent::end();
+       }
+       
+       /**
+        * Inform a CodeReview instance that we've started or completed a test run...
+        * @param $remote array: info on remote target
+        * @param $status string: "running" - tell it we've started
+        *                        "complete" - provide test results array
+        *                        "abort" - something went horribly awry
+        * @param $data array of test name => true/false
+        */
+       function ping( $status, $results=false ) {
+               global $wgParserTestRemote, $IP;
+               
+               $remote = $wgParserTestRemote;
+               $revId = SpecialVersion::getSvnRevision( $IP );
+               $jsonResults = json_encode( $results );
+               
+               if( !$remote ) {
+                       print "Can't do remote upload without configuring \$wgParserTestRemote!\n";
+                       exit( 1 );
+               }
+               
+               // Generate a hash MAC to validate our credentials
+               $message = array(
+                       $remote['repo'],
+                       $remote['suite'],
+                       $revId,
+                       $status,
+               );
+               if( $status == "complete" ) {
+                       $message[] = $jsonResults;
+               }
+               $hmac = hash_hmac( "sha1", implode( "|", $message ), $remote['secret'] );
+               
+               $postData = array(
+                       'action' => 'codetestupload',
+                       'format' => 'json',
+                       'repo'   => $remote['repo'],
+                       'suite'  => $remote['suite'],
+                       'rev'    => $revId,
+                       'status' => $status,
+                       'hmac'   => $hmac,
+               );
+               if( $status == "complete" ) {
+                       $postData['results'] = $jsonResults;
+               }
+               $response = $this->post( $remote['api-url'], $postData );
+               
+               if( $response === false ) {
+                       print "CodeReview info upload failed to reach server.\n";
+                       exit( 1 );
+               }
+               $responseData = json_decode( $response, true );
+               if( !is_array( $responseData ) ) {
+                       print "CodeReview API response not recognized...\n";
+                       wfDebug( "Unrecognized CodeReview API response: $response\n" );
+                       exit( 1 );
+               }
+               if( isset( $responseData['error'] ) ) {
+                       $code = $responseData['error']['code'];
+                       $info = $responseData['error']['info'];
+                       print "CodeReview info upload failed: $code $info\n";
+                       exit( 1 );
+               }
+       }
+       
+       function post( $url, $data ) {
+               // @fixme: for whatever reason, I get a 417 fail when using CURL's multipart form submit.
+               // If we do form URL encoding ourselves, though, it should work.
+               return Http::post( $url, array( 'postdata' => wfArrayToCGI( $data ) ) );
+       }
+}