diff options
| author | Matt Friedman <maf675@gmail.com> | 2017-07-26 12:24:57 -0700 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-05-08 22:06:03 +0200 |
| commit | e36da012645a6c376b0ecb306ee6b99e5437a410 (patch) | |
| tree | 3c563b2f55c9194ce4869abfd857d194dfd075e4 | |
| parent | deb556fbf05eeec447234f15f4eada58526f0b81 (diff) | |
| download | forums-e36da012645a6c376b0ecb306ee6b99e5437a410.tar forums-e36da012645a6c376b0ecb306ee6b99e5437a410.tar.gz forums-e36da012645a6c376b0ecb306ee6b99e5437a410.tar.bz2 forums-e36da012645a6c376b0ecb306ee6b99e5437a410.tar.xz forums-e36da012645a6c376b0ecb306ee6b99e5437a410.zip | |
[ticket/15295] Restore tests on mysql and myisam
PHPBB3-15295
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | travis/setup-database.sh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index a92c3bb56b..fd5e4da59e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,9 @@ matrix: - php: 5.6 env: DB=mysqli;SLOWTESTS=1 - php: 5.6 - env: DB=mysqli + env: DB=mysqli # MyISAM + - php: 5.6 + env: DB=mysql - php: 7.0 env: DB=mysqli - php: 7.1 diff --git a/travis/setup-database.sh b/travis/setup-database.sh index cf196e401f..cbd5e93e83 100755 --- a/travis/setup-database.sh +++ b/travis/setup-database.sh @@ -26,7 +26,7 @@ then psql -c 'create database phpbb_tests;' -U postgres fi -if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ] +if [ "$TRAVIS_PHP_VERSION" == "5.6" -a "$DB" == "mysqli" ] then mysql -e 'SET GLOBAL storage_engine=MyISAM;' fi |