From fe3b26f989593f956b72bece7e5649674b7a527b Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Wed, 17 Dec 2008 18:22:47 +0000
Subject: [PATCH] Fix tests so that they can work with Configure extension or
 some other special config

---
 t/inc/Database.t | 10 ++++------
 t/inc/Global.t   |  8 ++++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/t/inc/Database.t b/t/inc/Database.t
index 6355c2f540..4367fcd112 100644
--- a/t/inc/Database.t
+++ b/t/inc/Database.t
@@ -5,14 +5,12 @@ define( 'MEDIAWIKI', true );
 require 't/Test.php';
 
 require 'includes/Defines.php';
+require 'StartProfiler.php';
+require 'includes/AutoLoader.php';
 require 'LocalSettings.php';
+require 'includes/Setup.php';
 
-plan( 13 );
-
-require_ok( 'includes/ProfilerStub.php' );
-require_ok( 'includes/GlobalFunctions.php' );
-require_ok( 'includes/Exception.php' );
-require_ok( 'includes/db/Database.php' );
+plan( 9 );
 
 $db = new Database( $wgDBserver, $wgDBuser, $wgDBpassword );
 
diff --git a/t/inc/Global.t b/t/inc/Global.t
index 9675993659..7b2994e648 100644
--- a/t/inc/Global.t
+++ b/t/inc/Global.t
@@ -5,12 +5,12 @@ define( 'MEDIAWIKI', true );
 require 't/Test.php';
 
 require 'includes/Defines.php';
+require 'StartProfiler.php';
+require 'includes/AutoLoader.php';
 require 'LocalSettings.php';
+require 'includes/Setup.php';
 
-plan( 48 );
-
-require_ok( 'includes/ProfilerStub.php' );
-require_ok( 'includes/GlobalFunctions.php' );
+plan( 46 );
 
 $wgReadOnly = null;
 $wgReadOnlyFile = tempnam(wfTempDir(), "mwtest_readonly");
-- 
2.20.1