aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-07-18 09:46:14 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-07-18 09:46:14 +0200
commiteeef82ecc585caab1298f3559ccb8f615a89e706 (patch)
tree9963fba1bd577eac61709608606f84437045af94
parent4a87bc2aa92b086bbc04a735cb0d1564e4d0c903 (diff)
parentd157c3b3f40d4779a69af691bf8a304d7666c74d (diff)
downloadforums-eeef82ecc585caab1298f3559ccb8f615a89e706.tar
forums-eeef82ecc585caab1298f3559ccb8f615a89e706.tar.gz
forums-eeef82ecc585caab1298f3559ccb8f615a89e706.tar.bz2
forums-eeef82ecc585caab1298f3559ccb8f615a89e706.tar.xz
forums-eeef82ecc585caab1298f3559ccb8f615a89e706.zip
Merge remote-tracking branch 'Noxwizard/ticket/10996' into develop-olympus
* Noxwizard/ticket/10996: [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 6a1ecedac4..2dbc2fc6d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,8 @@ env:
- DB=postgres
before_script:
- - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi"
- - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi"
+ - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi"
+ - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi"
- sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear install --force phpunit/DbUnit; else pyrus install --force phpunit/DbUnit; fi"
- phpenv rehash