From fe9003ab6580a9d7b45a332b1de4d7368a643b7c Mon Sep 17 00:00:00 2001
From: Platonides <platonides@users.mediawiki.org>
Date: Wed, 15 Sep 2010 14:37:53 +0000
Subject: [PATCH] Absolutize require paths per r72858 CR.

---
 maintenance/tests/phpunit/includes/UploadFromUrlTest.php        | 2 +-
 maintenance/tests/phpunit/includes/api/ApiTest.php              | 2 +-
 maintenance/tests/phpunit/includes/api/ApiWatchTest.php         | 2 +-
 .../tests/phpunit/includes/parser/MediaWikiParserTest.php       | 2 +-
 maintenance/tests/phpunit/includes/parser/ParserHelpers.php     | 2 +-
 maintenance/tests/phpunit/includes/search/SearchDbTest.php      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/maintenance/tests/phpunit/includes/UploadFromUrlTest.php b/maintenance/tests/phpunit/includes/UploadFromUrlTest.php
index 07ce99fe0b..7187950b10 100644
--- 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 02d480c1bd..7eab2d748c 100644
--- 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 41c51d7e4a..819c9a22e2 100644
--- 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 404ccf2e27..58be416667 100644
--- 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 893bf8b420..baef7c9e12 100644
--- 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 2f36c6b00e..d103ad491e 100644
--- 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;
-- 
2.20.1