diff options
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/phing-sniff.sh | 2 | ||||
| -rw-r--r-- | travis/phpunit-mysqli-travis.xml (renamed from travis/phpunit-mysql-travis.xml) | 0 | ||||
| -rwxr-xr-x | travis/setup-database.sh | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/travis/phing-sniff.sh b/travis/phing-sniff.sh index 1473b99da4..04118af69a 100755 --- a/travis/phing-sniff.sh +++ b/travis/phing-sniff.sh @@ -9,7 +9,7 @@ set -x DB=$1 TRAVIS_PHP_VERSION=$2 -if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysql" ] +if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ] then cd build ../phpBB/vendor/bin/phing sniff diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysqli-travis.xml index 60c279d774..60c279d774 100644 --- a/travis/phpunit-mysql-travis.xml +++ b/travis/phpunit-mysqli-travis.xml diff --git a/travis/setup-database.sh b/travis/setup-database.sh index c1917042cd..0b578d180c 100755 --- a/travis/setup-database.sh +++ b/travis/setup-database.sh @@ -15,12 +15,12 @@ then psql -c 'create database phpbb_tests;' -U postgres fi -if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysql" ] +if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ] then mysql -e 'SET GLOBAL storage_engine=MyISAM;' fi -if [ "$DB" == "mysql" -o "$DB" == "mariadb" ] +if [ "$DB" == "mysqli" -o "$DB" == "mariadb" ] then mysql -e 'create database IF NOT EXISTS phpbb_tests;' fi |