From 0971d3f975ebaa8c2874115bd82b308b244783f2 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 21 Jul 2012 19:57:00 +0200
Subject: [ticket/11015] Fix configuration for travis

PHPBB3-11015
---
 travis/phpunit-postgres-travis.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
index 55ba996548..3a09c4a826 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -29,7 +29,7 @@
 	<php>
 		<!-- "Real" test database -->
 		<!-- uncomment, otherwise sqlite memory runs -->
-		<server name="PHPBB_TEST_DBMS" value="postgres"/>
+		<server name="PHPBB_TEST_DBMS" value="phpbb_db_driver_postgres"/>
 		<server name="PHPBB_TEST_DBHOST" value="localhost" />
 		<server name="PHPBB_TEST_DBPORT" value="5432" />
 		<server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
-- 
cgit v1.2.1


From aa7350eba731496e11956b78d99d57aeaafaad58 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 22 Jan 2013 20:12:24 +0100
Subject: [ticket/11338] Travis: Define Redis hostname so unit tests for Redis
 run.

PHPBB3-11338
---
 travis/phpunit-postgres-travis.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
index 5019c225b4..a202ec4a36 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -36,6 +36,7 @@
 		<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_REDIS_HOST" value="localhost" />
 		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
 	</php>
 </phpunit>
-- 
cgit v1.2.1


From dee1b38ebcf4249a0204773c255e8ac8e348cb23 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 22 Jan 2013 19:54:48 +0100
Subject: [ticket/11337] Run functional tests on travis using nginx and
 php-fpm.

PHPBB3-11337
---
 travis/phpunit-postgres-travis.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
index 0383edd9d6..49c001b717 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -37,5 +37,6 @@
 		<server name="PHPBB_TEST_DBUSER" value="postgres" />
 		<server name="PHPBB_TEST_DBPASSWD" value="" />
 		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
+		<server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" />
 	</php>
 </phpunit>
-- 
cgit v1.2.1


From 9860cf6b165f71b58c69da0bfc42e27bea1c24c9 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 23 Jan 2013 00:26:38 +0100
Subject: [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM
 otherwise.

There is no php-fpm for PHP 5.3.3. Make sure PHP version is at least 5.3.19,
which is what 5.3 is currently aliased to.

PHPBB3-11337
---
 travis/phpunit-postgres-travis.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
index 49c001b717..12e20547ba 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -17,7 +17,7 @@
 			<exclude>tests/functional</exclude>
 		</testsuite>
 		<testsuite name="phpBB Functional Tests">
-			<directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">../tests/functional</directory>
+			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
 		</testsuite>
 	</testsuites>
 
-- 
cgit v1.2.1


From 3375f41ef1eaca8edca344372a31d4aafb739c87 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 12 Jul 2013 16:14:16 -0400
Subject: [ticket/11668] Move lint test to the end for travis

PHPBB3-11668
---
 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 12e20547ba..3d1b574716 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -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.19" phpVersionOperator=">=">../tests/functional</directory>
-- 
cgit v1.2.1


From 43538fdca15b9b6cd1d64a7808b4e4a4d2027221 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 22 Jul 2013 12:23:53 -0500
Subject: [ticket/11726] Don't run lint tests on Travis on postgres

PHPBB3-11726
---
 travis/phpunit-postgres-travis.xml | 3 ---
 1 file changed, 3 deletions(-)

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

diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
index 3d1b574716..aa829f4d30 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -17,9 +17,6 @@
 			<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.19" phpVersionOperator=">=">../tests/functional</directory>
 		</testsuite>
-- 
cgit v1.2.1