r109843 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r109842‎ | r109843 | r109844 >
Date:19:06, 23 January 2012
Author:tstarling
Status:ok
Tags:
Comment:
Make arguments to phpunit.php work. It's hard to believe this could have been broken since r79164, so maybe it was a change in the command line parser that PHPUnit uses that made it treat any options after the first non-option argument as being plain arguments rather than actual options.
Modified paths:
  • /trunk/phase3/tests/phpunit/phpunit.php (modified) (history)

Diff [purge]

Index: trunk/phase3/tests/phpunit/phpunit.php
——@@ -46,8 +46,8 @@
4747
4848 if( !in_array( '--configuration', $_SERVER['argv'] ) ) {
4949 //Hack to eliminate the need to use the Makefile (which sucks ATM)
50 - $_SERVER['argv'][] = '--configuration';
51 - $_SERVER['argv'][] = $IP . '/tests/phpunit/suite.xml';
 50+ array_splice( $_SERVER['argv'], 1, 0,
 51+ array( '--configuration', $IP . '/tests/phpunit/suite.xml' ) );
5252 }
5353
5454 require_once( 'PHPUnit/Runner/Version.php' );

Sign-offs

UserFlagDate
Nikerabbitinspected07:02, 24 January 2012

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r79164-Set configuration automatically if not set. This allows for evasion of the m...soxred9305:38, 29 December 2010

Status & tagging log