From 713ffa90f27866c7cde2ad33f490957a53f7dd13 Mon Sep 17 00:00:00 2001
From: Max Semenik <maxsem@users.mediawiki.org>
Date: Thu, 22 Dec 2011 09:18:39 +0000
Subject: [PATCH] Moved SQLite test .sql files to the common test data
 directory

---
 tests/phpunit/{includes => data}/db/sqlite/tables-1.13.sql | 0
 tests/phpunit/{includes => data}/db/sqlite/tables-1.15.sql | 0
 tests/phpunit/{includes => data}/db/sqlite/tables-1.16.sql | 0
 tests/phpunit/{includes => data}/db/sqlite/tables-1.17.sql | 0
 tests/phpunit/{includes => data}/db/sqlite/tables-1.18.sql | 0
 tests/phpunit/includes/db/DatabaseSqliteTest.php           | 3 ++-
 6 files changed, 2 insertions(+), 1 deletion(-)
 rename tests/phpunit/{includes => data}/db/sqlite/tables-1.13.sql (100%)
 rename tests/phpunit/{includes => data}/db/sqlite/tables-1.15.sql (100%)
 rename tests/phpunit/{includes => data}/db/sqlite/tables-1.16.sql (100%)
 rename tests/phpunit/{includes => data}/db/sqlite/tables-1.17.sql (100%)
 rename tests/phpunit/{includes => data}/db/sqlite/tables-1.18.sql (100%)

diff --git a/tests/phpunit/includes/db/sqlite/tables-1.13.sql b/tests/phpunit/data/db/sqlite/tables-1.13.sql
similarity index 100%
rename from tests/phpunit/includes/db/sqlite/tables-1.13.sql
rename to tests/phpunit/data/db/sqlite/tables-1.13.sql
diff --git a/tests/phpunit/includes/db/sqlite/tables-1.15.sql b/tests/phpunit/data/db/sqlite/tables-1.15.sql
similarity index 100%
rename from tests/phpunit/includes/db/sqlite/tables-1.15.sql
rename to tests/phpunit/data/db/sqlite/tables-1.15.sql
diff --git a/tests/phpunit/includes/db/sqlite/tables-1.16.sql b/tests/phpunit/data/db/sqlite/tables-1.16.sql
similarity index 100%
rename from tests/phpunit/includes/db/sqlite/tables-1.16.sql
rename to tests/phpunit/data/db/sqlite/tables-1.16.sql
diff --git a/tests/phpunit/includes/db/sqlite/tables-1.17.sql b/tests/phpunit/data/db/sqlite/tables-1.17.sql
similarity index 100%
rename from tests/phpunit/includes/db/sqlite/tables-1.17.sql
rename to tests/phpunit/data/db/sqlite/tables-1.17.sql
diff --git a/tests/phpunit/includes/db/sqlite/tables-1.18.sql b/tests/phpunit/data/db/sqlite/tables-1.18.sql
similarity index 100%
rename from tests/phpunit/includes/db/sqlite/tables-1.18.sql
rename to tests/phpunit/data/db/sqlite/tables-1.18.sql
diff --git a/tests/phpunit/includes/db/DatabaseSqliteTest.php b/tests/phpunit/includes/db/DatabaseSqliteTest.php
index f0511f7cfe..ce8f5d6447 100644
--- a/tests/phpunit/includes/db/DatabaseSqliteTest.php
+++ b/tests/phpunit/includes/db/DatabaseSqliteTest.php
@@ -256,8 +256,9 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
 			$maint->loadParamsAndArgs( null, array( 'quiet' => 1 ) );
 		}
 
+		global $IP;
 		$db = new DatabaseSqliteStandalone( ':memory:' );
-		$db->sourceFile( dirname( __FILE__ ) . "/sqlite/tables-$version.sql" );
+		$db->sourceFile( "$IP/tests/phpunit/data/db/sqlite/tables-$version.sql" );
 		$updater = DatabaseUpdater::newForDB( $db, false, $maint );
 		$updater->doUpdates( array( 'core' ) );
 		return $db;
-- 
2.20.1