From 247500af05449621b6caed3e7c53279d59a3ee2a Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Tue, 12 Oct 2010 18:14:36 +0000 Subject: [PATCH] Follow-up r74628: convert two remaining calls of patchPath() --- maintenance/patchSql.php | 4 ++-- maintenance/tests/phpunit/phpunit.php | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/maintenance/patchSql.php b/maintenance/patchSql.php index ddfabbbe75..9c59d6adfe 100644 --- a/maintenance/patchSql.php +++ b/maintenance/patchSql.php @@ -39,8 +39,8 @@ class PatchSql extends Maintenance { foreach ( $this->mArgs as $arg ) { $files = array( $arg, - DatabaseBase::patchPath( $arg ), - DatabaseBase::patchPath( "patch-$arg.sql" ), + $dbw->patchPath( $arg ), + $dbw->patchPath( "patch-$arg.sql" ), ); foreach ( $files as $file ) { if ( file_exists( $file ) ) { diff --git a/maintenance/tests/phpunit/phpunit.php b/maintenance/tests/phpunit/phpunit.php index 759c9b57c6..c643a442aa 100755 --- a/maintenance/tests/phpunit/phpunit.php +++ b/maintenance/tests/phpunit/phpunit.php @@ -23,12 +23,6 @@ $wgLocaltimezone = 'UTC'; // To prevent tests from failing with SQLite, we need to turn database caching off $wgCaches[CACHE_DB] = false; -$targetFile = wfIsWindows() ? 'phpunit.php' : 'phpunit'; -$pathSeparator = wfIsWindows() ? ';' : ':'; - -$folders = explode( $pathSeparator, getenv('PATH') ); - require_once( 'PHPUnit/TextUI/Command.php' ); -define( 'PHPUnit_MAIN_METHOD', 'PHPUnit_TextUI_Command::main' ); PHPUnit_TextUI_Command::main(); -- 2.20.1