phpunit: Don't override --bootstrap if supplied
SemanticMediaWiki creates its own bootstrap and displays
a bunch of information. In [0] this broke this.
We already look for bootstrap anyways, we just don't use it.
We fix this by checking for bootstrap and only setting a default
if not supplied.
[0] d2a30096f1
Change-Id: Iebb1949cc6a253640f40f1ac048ab50f99cac02a
(cherry picked from commit d43c69b25f05801ac3c255a2dfdbe03e820029ca)
This commit is contained in:
parent
fbe98a246f
commit
23fded0cd0
1 changed files with 3 additions and 1 deletions
|
|
@ -95,7 +95,9 @@ class PHPUnitMaintClass {
|
|||
// or when T227900 is resolved.
|
||||
$args[] = '--configuration=' . __DIR__ . '/suite.xml';
|
||||
}
|
||||
$args[] = '--bootstrap=' . __DIR__ . '/bootstrap.maintenance.php';
|
||||
if ( !isset( $knownOpts['bootstrap'] ) ) {
|
||||
$args[] = '--bootstrap=' . __DIR__ . '/bootstrap.maintenance.php';
|
||||
}
|
||||
$command->run( $args, true );
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue