From 26aade100de6fc1f76bf1e2e28b8f8a738babaed Mon Sep 17 00:00:00 2001
From: Platonides <platonides@gmail.com>
Date: Thu, 31 May 2012 23:41:01 +0200
Subject: [PATCH] Remove more register_globals remote includes in the tests
 backupPrefetchTest.php, backupTextPassTest.php, fetchTextTest.php and
 getSlaveServerTest.php

Change-Id: Ie309f4377e4199d80c0f45dc761d3a14b8d00ec2
---
 tests/phpunit/maintenance/backupPrefetchTest.php | 4 ++--
 tests/phpunit/maintenance/backupTextPassTest.php | 5 ++---
 tests/phpunit/maintenance/fetchTextTest.php      | 3 +--
 tests/phpunit/maintenance/getSlaveServerTest.php | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/tests/phpunit/maintenance/backupPrefetchTest.php b/tests/phpunit/maintenance/backupPrefetchTest.php
index 9273233b1d..a64e6d0e26 100644
--- a/tests/phpunit/maintenance/backupPrefetchTest.php
+++ b/tests/phpunit/maintenance/backupPrefetchTest.php
@@ -1,6 +1,6 @@
 <?php
-global $IP;
-require_once( "$IP/maintenance/backupPrefetch.inc" );
+
+require_once dirname( __FILE__ ) . "/../../../maintenance/backupPrefetch.inc";
 
 /**
  * Tests for BaseDump
diff --git a/tests/phpunit/maintenance/backupTextPassTest.php b/tests/phpunit/maintenance/backupTextPassTest.php
index 0d7f155f3f..90fd902745 100644
--- a/tests/phpunit/maintenance/backupTextPassTest.php
+++ b/tests/phpunit/maintenance/backupTextPassTest.php
@@ -1,7 +1,6 @@
 <?php
-global $IP;
-require_once( "$IP/maintenance/backup.inc" );
-require_once( "$IP/maintenance/backupTextPass.inc" );
+
+require_once dirname( __FILE__ ) . "/../../../maintenance/backupTextPass.inc";
 
 /**
  * Tests for page dumps of BackupDumper
diff --git a/tests/phpunit/maintenance/fetchTextTest.php b/tests/phpunit/maintenance/fetchTextTest.php
index 42a247cb1d..f0689b607a 100644
--- a/tests/phpunit/maintenance/fetchTextTest.php
+++ b/tests/phpunit/maintenance/fetchTextTest.php
@@ -1,7 +1,6 @@
 <?php
-global $IP;
-require_once( "$IP/maintenance/fetchText.php" );
 
+require_once dirname( __FILE__ ) . "/../../../maintenance/fetchText.php";
 
 /**
  * Mock for the input/output of FetchText
diff --git a/tests/phpunit/maintenance/getSlaveServerTest.php b/tests/phpunit/maintenance/getSlaveServerTest.php
index 29e7fe62f8..86356144f0 100644
--- a/tests/phpunit/maintenance/getSlaveServerTest.php
+++ b/tests/phpunit/maintenance/getSlaveServerTest.php
@@ -1,6 +1,6 @@
 <?php
-global $IP;
-require_once( "$IP/maintenance/getSlaveServer.php" );
+
+require_once dirname( __FILE__ ) . "/../../../maintenance/getSlaveServer.php";
 
 /**
  * Tests for getSlaveServer
-- 
2.20.1