Merge "Choose parentids in tests as they are in real dumps"

[lhc/web/wiklou.git] / tests / phpunit / MediaWikiPHPUnitCommand.php

diff --git a/tests/phpunit/MediaWikiPHPUnitCommand.php b/tests/phpunit/MediaWikiPHPUnitCommand.php
index 16f73ef..ea385ad 100644 (file)
--- a/tests/phpunit/MediaWikiPHPUnitCommand.php
+++ b/tests/phpunit/MediaWikiPHPUnitCommand.php
@@ -5,7 +5,10 @@ class MediaWikiPHPUnitCommand extends PHPUnit_TextUI_Command {
        static $additionalOptions = array(
                'regex=' => false,
                'file=' => false,
+               'use-filebackend=' => false,
                'keep-uploads' => false,
+               'use-normal-tables' => false,
+               'reuse-db' => false,
        );
 
        public function __construct() {
@@ -28,6 +31,17 @@ class MediaWikiPHPUnitCommand extends PHPUnit_TextUI_Command {
                        # Probably fix bug 29226
                        $command->arguments['colors'] = false;
                }
+
+               # Makes MediaWiki PHPUnit directory includable so the PHPUnit will
+               # be able to resolve relative files inclusion such as suites/*
+               # PHPUnit uses stream_resolve_include_path() internally
+               # See bug 32022
+               set_include_path(
+                       dirname( __FILE__ )
+                       .PATH_SEPARATOR
+                       . get_include_path()
+               );
+
                $command->run($_SERVER['argv'], $exit);
        }
 
@@ -51,6 +65,11 @@ ParserTest-specific options:
   --keep-uploads           Re-use the same upload directory for each test, don't delete it
 
 
+Database options:
+  --use-normal-tables      Use normal DB tables.
+  --reuse-db               Init DB only if tables are missing and keep after finish.
+
+
 EOT;
        }