| Index: trunk/phase3/maintenance/tests/phpunit/phpunit.php |
| — | — | @@ -23,12 +23,6 @@ |
| 24 | 24 | // To prevent tests from failing with SQLite, we need to turn database caching off |
| 25 | 25 | $wgCaches[CACHE_DB] = false; |
| 26 | 26 | |
| 27 | | -$targetFile = wfIsWindows() ? 'phpunit.php' : 'phpunit'; |
| 28 | | -$pathSeparator = wfIsWindows() ? ';' : ':'; |
| 29 | | - |
| 30 | | -$folders = explode( $pathSeparator, getenv('PATH') ); |
| 31 | | - |
| 32 | 27 | require_once( 'PHPUnit/TextUI/Command.php' ); |
| 33 | | -define( 'PHPUnit_MAIN_METHOD', 'PHPUnit_TextUI_Command::main' ); |
| 34 | 28 | PHPUnit_TextUI_Command::main(); |
| 35 | 29 | |
| Index: trunk/phase3/maintenance/patchSql.php |
| — | — | @@ -39,8 +39,8 @@ |
| 40 | 40 | foreach ( $this->mArgs as $arg ) { |
| 41 | 41 | $files = array( |
| 42 | 42 | $arg, |
| 43 | | - DatabaseBase::patchPath( $arg ), |
| 44 | | - DatabaseBase::patchPath( "patch-$arg.sql" ), |
| | 43 | + $dbw->patchPath( $arg ), |
| | 44 | + $dbw->patchPath( "patch-$arg.sql" ), |
| 45 | 45 | ); |
| 46 | 46 | foreach ( $files as $file ) { |
| 47 | 47 | if ( file_exists( $file ) ) { |