From c7f65fba627680e7de81ae6c7ea9c1e0fc4359ea Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Thu, 22 Mar 2012 14:13:25 +0000
Subject: [task/travis] Rename travis phpunit config files

PHPBB3-10718
---
 travis/phpunit-postgres-travis.xml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 travis/phpunit-postgres-travis.xml

(limited to 'travis/phpunit-postgres-travis.xml')

diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
new file mode 100644
index 0000000000..e44696a335
--- /dev/null
+++ b/travis/phpunit-postgres-travis.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="true"
+         backupStaticAttributes="true"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="true"
+		 strict="true"
+         bootstrap="../tests/bootstrap.php">
+	<testsuites>
+		<testsuite name="phpBB Test Suite">
+			<directory suffix="_test.php">../tests/</directory>
+		</testsuite>
+	</testsuites>
+
+	<php>
+		<!-- "Real" test database -->
+		<!-- uncomment, otherwise sqlite memory runs -->
+		<const name="dbms" value="postgres"/>
+		<const name="dbhost" value="localhost" />
+		<const name="dbport" value="5432" />
+		<const name="dbname" value="phpbb_tests" />
+		<const name="dbuser" value="postgres" />
+		<const name="dbpasswd" value="" />
+		<const name="table_prefix" value="phpbb_"/>
+	</php>
+</phpunit>
-- 
cgit v1.2.1


From 0ed66ad0e8d11c802520046b446aa5622a637df9 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Thu, 22 Mar 2012 16:00:10 +0000
Subject: [task/travis] Exclude functional and slow tests

PHPBB3-10718
---
 travis/phpunit-postgres-travis.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'travis/phpunit-postgres-travis.xml')

diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
index e44696a335..02db76ae78 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -16,6 +16,12 @@
 		</testsuite>
 	</testsuites>
 
+	<groups>
+		<exclude>
+			<group>slow</group>
+		</exclude>
+	</groups>
+
 	<php>
 		<!-- "Real" test database -->
 		<!-- uncomment, otherwise sqlite memory runs -->
-- 
cgit v1.2.1


From 5bcdfe94dd487441565c00450b3a8efcaeecd840 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 23 Mar 2012 06:40:15 +0000
Subject: [ticket/10723] Stop Travis running all tests on sqlite

Correct information so all tests don't run on sqlite

PHPBB3-10723
---
 travis/phpunit-postgres-travis.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'travis/phpunit-postgres-travis.xml')

diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
index 02db76ae78..461a53bcb1 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -25,12 +25,12 @@
 	<php>
 		<!-- "Real" test database -->
 		<!-- uncomment, otherwise sqlite memory runs -->
-		<const name="dbms" value="postgres"/>
-		<const name="dbhost" value="localhost" />
-		<const name="dbport" value="5432" />
-		<const name="dbname" value="phpbb_tests" />
-		<const name="dbuser" value="postgres" />
-		<const name="dbpasswd" value="" />
-		<const name="table_prefix" value="phpbb_"/>
+		<server name="PHPBB_TEST_DBMS" value="postgres"/>
+		<server name="PHPBB_TEST_DBHOST" value="localhost" />
+		<server name="PHPBB_TEST_DBPORT" value="5432" />
+		<server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
+		<server name="PHPBB_TEST_DBUSER" value="postgres" />
+		<server name="PHPBB_TEST_DBPASSWD" value="" />
+		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
 	</php>
 </phpunit>
-- 
cgit v1.2.1


From 1960629240679965ca22a98e69973dcfe2e05476 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 11 May 2012 15:17:13 +0200
Subject: [ticket/10492] Skip functional tests on PHP 5.2 on travis

PHPBB3-10492
---
 travis/phpunit-postgres-travis.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'travis/phpunit-postgres-travis.xml')

diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
index 461a53bcb1..55ba996548 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -13,6 +13,10 @@
 	<testsuites>
 		<testsuite name="phpBB Test Suite">
 			<directory suffix="_test.php">../tests/</directory>
+			<exclude>tests/functional</exclude>
+		</testsuite>
+		<testsuite name="phpBB Functional Tests">
+			<directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">../tests/functional</directory>
 		</testsuite>
 	</testsuites>
 
-- 
cgit v1.2.1