From 6ab9ef54a20670b4620850b9aa62740470936f43 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Tue, 26 Mar 2013 17:21:35 -0400
Subject: [ticket/11466] Remove old database driver files from PHPUnit exclude

As per the ticket comments, these can simply be removed, rather than having to
be renamed to the new file locations.

PHPBB3-11466
---
 phpunit.xml.functional | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'phpunit.xml.functional')

diff --git a/phpunit.xml.functional b/phpunit.xml.functional
index 9facbcff8b..99f11477aa 100644
--- a/phpunit.xml.functional
+++ b/phpunit.xml.functional
@@ -30,15 +30,6 @@
         <whitelist>
             <directory suffix=".php">./phpBB/includes/</directory>
             <exclude>
-                <file>./phpBB/includes/db/firebird.php</file>
-                <file>./phpBB/includes/db/mysql.php</file>
-                <file>./phpBB/includes/db/mysqli.php</file>
-                <file>./phpBB/includes/db/mssql.php</file>
-                <file>./phpBB/includes/db/mssql_odbc.php</file>
-                <file>./phpBB/includes/db/mssqlnative.php</file>
-                <file>./phpBB/includes/db/oracle.php</file>
-                <file>./phpBB/includes/db/postgres.php</file>
-                <file>./phpBB/includes/db/sqlite.php</file>
                 <file>./phpBB/includes/search/fulltext_native.php</file>
                 <file>./phpBB/includes/search/fulltext_mysql.php</file>
                 <directory suffix=".php">./phpBB/includes/captcha/</directory>
-- 
cgit v1.2.1


From a1a5a636b17f14fb3c09febe0607782f99cc7db1 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 12 Jul 2013 14:42:26 -0400
Subject: [ticket/11668] Run lint test at the end of the test suite

The lint test is very slow. Running it at the end should speed up the development cycle.

PHPBB3-11668
---
 phpunit.xml.functional | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpunit.xml.functional')

diff --git a/phpunit.xml.functional b/phpunit.xml.functional
index 376d52e6d8..919de74dec 100644
--- a/phpunit.xml.functional
+++ b/phpunit.xml.functional
@@ -15,6 +15,10 @@
         <testsuite name="phpBB Test Suite">
             <directory suffix="_test.php">./tests/</directory>
             <exclude>./tests/functional</exclude>
+            <exclude>tests/lint_test.php</exclude>
+        </testsuite>
+        <testsuite name="phpBB Lint Test">
+            <file>tests/lint_test.php</file>
         </testsuite>
         <testsuite name="phpBB Functional Tests">
             <directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">./tests/functional</directory>
-- 
cgit v1.2.1


From 7030578bbe9e11c18b5becaf8b06e670e3c2e3cd Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 14 Jul 2013 01:32:34 -0400
Subject: [ticket/11698] Moving all autoloadable files to phpbb/

PHPBB3-11698
---
 phpunit.xml.functional | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpunit.xml.functional')

diff --git a/phpunit.xml.functional b/phpunit.xml.functional
index 3a3d653b47..cd9cc8771f 100644
--- a/phpunit.xml.functional
+++ b/phpunit.xml.functional
@@ -33,9 +33,10 @@
         </blacklist>
         <whitelist>
             <directory suffix=".php">./phpBB/includes/</directory>
+            <directory suffix=".php">./phpBB/phpbb/</directory>
             <exclude>
-                <file>./phpBB/includes/search/fulltext_native.php</file>
-                <file>./phpBB/includes/search/fulltext_mysql.php</file>
+                <file>./phpBB/phpbb/search/fulltext_native.php</file>
+                <file>./phpBB/phpbb/search/fulltext_mysql.php</file>
                 <directory suffix=".php">./phpBB/includes/captcha/</directory>
             </exclude>
         </whitelist>
-- 
cgit v1.2.1