r74555 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r74554‎ | r74555 | r74556 >
Date:18:40, 9 October 2010
Author:platonides
Status:resolved
Tags:
Comment:
Follow r74554. Also take include path into account.
Modified paths:
  • /trunk/phase3/maintenance/tests/phpunit/phpunit.php (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/tests/phpunit/phpunit.php
@@ -27,6 +27,14 @@
2828 $pathSeparator = wfIsWindows() ? ';' : ':';
2929
3030 $folders = explode( $pathSeparator, getenv('PATH') );
 31+
 32+# We may not have PHPUnit folder in the path, but have
 33+# PEAR folder in the include path.
 34+$includeFolders = explode( $pathSeparator, get_include_path() );
 35+foreach ( $includeFolders as $includeFolder ) {
 36+ $folders[] = "$includeFolder/PHPUnit";
 37+}
 38+
3139 foreach ( $folders as $folder ) {
3240 if ( file_exists( "$folder/$targetFile" ) ) {
3341 require_once "$folder/$targetFile";

Follow-up revisions

RevisionCommit summaryAuthorDate
r74556Follow-up r74553, r74554 and r74555: don't guess, just include stuff properlymaxsem19:00, 9 October 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r74554Look for PHPUnit folder in the PATH and add support for Windows....platonides18:32, 9 October 2010

Status & tagging log