Absolutize require paths per r72858 CR.

diff --git a/maintenance/tests/phpunit/includes/UploadFromUrlTest.php b/maintenance/tests/phpunit/includes/UploadFromUrlTest.php
index 07ce99f..7187950 100644 (file)
--- a/maintenance/tests/phpunit/includes/UploadFromUrlTest.php
+++ b/maintenance/tests/phpunit/includes/UploadFromUrlTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'api/ApiSetup.php';
+require_once dirname( __FILE__ ) . '/api/ApiSetup.php';
 
 class UploadFromUrlTest extends ApiTestSetup {
 

diff --git a/maintenance/tests/phpunit/includes/api/ApiTest.php b/maintenance/tests/phpunit/includes/api/ApiTest.php
index 02d480c..7eab2d7 100644 (file)
--- a/maintenance/tests/phpunit/includes/api/ApiTest.php
+++ b/maintenance/tests/phpunit/includes/api/ApiTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once( 'ApiSetup.php' );
+require_once( dirname( __FILE__ ) . '/ApiSetup.php' );
 
 class MockApi extends ApiBase {
        public function execute() { }

diff --git a/maintenance/tests/phpunit/includes/api/ApiWatchTest.php b/maintenance/tests/phpunit/includes/api/ApiWatchTest.php
index 41c51d7..819c9a2 100644 (file)
--- a/maintenance/tests/phpunit/includes/api/ApiWatchTest.php
+++ b/maintenance/tests/phpunit/includes/api/ApiWatchTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'ApiSetup.php';
+require_once dirname( __FILE__ ) . '/ApiSetup.php';
 
 class ApiWatchTest extends ApiTestSetup {
 

diff --git a/maintenance/tests/phpunit/includes/parser/MediaWikiParserTest.php b/maintenance/tests/phpunit/includes/parser/MediaWikiParserTest.php
index 404ccf2..58be416 100644 (file)
--- a/maintenance/tests/phpunit/includes/parser/MediaWikiParserTest.php
+++ b/maintenance/tests/phpunit/includes/parser/MediaWikiParserTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once( 'ParserHelpers.php' );
+require_once( dirname( __FILE__ ) . '/ParserHelpers.php' );
 
 class MediaWikiParserTestSuite extends PHPUnit_Framework_TestSuite {
        private $count;

diff --git a/maintenance/tests/phpunit/includes/parser/ParserHelpers.php b/maintenance/tests/phpunit/includes/parser/ParserHelpers.php
index 893bf8b..baef7c9 100644 (file)
--- a/maintenance/tests/phpunit/includes/parser/ParserHelpers.php
+++ b/maintenance/tests/phpunit/includes/parser/ParserHelpers.php
@@ -16,7 +16,7 @@ class ParserUnitTest extends PHPUnit_Framework_TestCase {
                if ( $result === NULL ) {
                        $result = new PHPUnit_Framework_TestResult;
                }
-
+return $result;
                $backend = $this->suite->getBackend();
                $result->startTest( $this );
                PHPUnit_Util_Timer::start();

diff --git a/maintenance/tests/phpunit/includes/search/SearchDbTest.php b/maintenance/tests/phpunit/includes/search/SearchDbTest.php
index 2f36c6b..d103ad4 100644 (file)
--- a/maintenance/tests/phpunit/includes/search/SearchDbTest.php
+++ b/maintenance/tests/phpunit/includes/search/SearchDbTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once( 'SearchEngineTest.php' );
+require_once( dirname( __FILE__ ) . '/SearchEngineTest.php' );
 
 class SearchDbTest extends SearchEngineTest {
        var $db;