diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-05-26 18:49:29 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-05-26 18:49:29 +0200 |
| commit | c0dc0fc09bb825c40c4410275ae1e09ba7ad0107 (patch) | |
| tree | 9cda9b953d7a93ace55cab64facb389e6a5ade11 /travis | |
| parent | 26674bff3999cf70840b6c15007f9c66ef4bb218 (diff) | |
| download | forums-c0dc0fc09bb825c40c4410275ae1e09ba7ad0107.tar forums-c0dc0fc09bb825c40c4410275ae1e09ba7ad0107.tar.gz forums-c0dc0fc09bb825c40c4410275ae1e09ba7ad0107.tar.bz2 forums-c0dc0fc09bb825c40c4410275ae1e09ba7ad0107.tar.xz forums-c0dc0fc09bb825c40c4410275ae1e09ba7ad0107.zip | |
[ticket/12592] Rename mysql environment to mysqli.
PHPBB3-12592
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 |