From fa3c3efb388204817271981c652be4d972a62efe Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Mon, 17 Feb 2014 17:07:17 -0500
Subject: [PATCH] Move phpunit xml file into a sane place

---
 .travis.yml       |  4 ++--
 phpunit.xml       | 38 ++++++++++++++++++++++++++++++++++++++
 tests/phpunit.xml | 36 ------------------------------------
 3 files changed, 40 insertions(+), 38 deletions(-)
 create mode 100644 phpunit.xml
 delete mode 100644 tests/phpunit.xml

diff --git a/.travis.yml b/.travis.yml
index 320e8e7..9da885a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,9 @@ before_script:
   - sh -c "psql -c 'create database test;' -U postgres"
   - sh -c "mysql -e 'create database IF NOT EXISTS test;'"
 
-script: cd tests && phpunit
+script: phpunit
 
 matrix:
   allow_failures:
     - php: hhvm
-    - php: 5.2
+    - php: 5.2
\ No newline at end of file
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..649fe7f
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit
+    colors="true"
+    stopOnFailure="false"
+    bootstrap="tests/bootstrap.php">
+    <filter>
+    	<blacklist>
+    		<directory suffix=".php">coverage</directory>
+			<directory suffix=".php">docs</directory>
+			<directory suffix=".php">tests</directory>
+			<directory suffix=".php">vendor</directory>
+    		<directory suffix=".php">.</directory>
+    	</blacklist>
+    </filter>
+    <testsuites>
+        <testsuite name="CoreTests">
+            <file>tests/core/core.php</file>
+            <file>tests/core/db_qp_test.php</file>
+        </testsuite>
+        <testsuite name="FirebirdTests">
+        	<file>tests/databases/firebird/FirebirdTest.php</file>
+        	<file>tests/databases/firebird/FirebirdQBTest.php</file>
+        </testsuite>
+        <testsuite name="MySQLTests">
+        	<file>tests/databases/mysql/MySQLTest.php</file>
+        	<file>tests/databases/mysql/MySQLQBTest.php</file>
+        </testsuite>
+        <testsuite name="PgSQLTests">
+            <file>tests/databases/pgsql/PgSQLTest.php</file>
+        	<file>tests/databases/pgsql/PgSQLQBTest.php</file>
+        </testsuite>
+        <testsuite name="SQLiteTests">
+            <file>tests/databases/sqlite/SqliteTest.php</file>
+        	<file>tests/databases/mysql/SqliteQBTest.php</file>
+        </testsuite>
+    </testsuites>
+</phpunit>
\ No newline at end of file
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
deleted file mode 100644
index 187ac6f..0000000
--- a/tests/phpunit.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit
-    colors="true"
-    stopOnFailure="false"
-    bootstrap="bootstrap.php">
-    <filter>
-    	<blacklist>
-    		<directory suffix=".php">../coverage</directory>
-			<directory suffix=".php">../docs</directory>
-    		<directory suffix=".php">.</directory>
-    	</blacklist>
-    </filter>
-    <testsuites>
-        <testsuite name="CoreTests">
-            <file>core/core.php</file>
-            <file>core/db_qp_test.php</file>
-        </testsuite>
-        <testsuite name="FirebirdTests">
-        	<file>databases/firebird/FirebirdTest.php</file>
-        	<file>databases/firebird/FirebirdQBTest.php</file>
-        </testsuite>
-        <testsuite name="MySQLTests">
-        	<file>databases/mysql/MySQLTest.php</file>
-        	<file>databases/mysql/MySQLQBTest.php</file>
-        </testsuite>
-        <testsuite name="PgSQLTests">
-            <file>databases/pgsql/PgSQLTest.php</file>
-        	<file>databases/pgsql/PgSQLQBTest.php</file>
-        </testsuite>
-        <testsuite name="SQLiteTests">
-            <file>databases/sqlite/SqliteTest.php</file>
-        	<file>databases/mysql/SqliteQBTest.php</file>
-        </testsuite>
-    </testsuites>
-</phpunit>
\ No newline at end of file