diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-27 14:31:23 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-27 14:31:23 +0100 |
| commit | 40ed3f677699f2d9801bb75168e84766c35722f4 (patch) | |
| tree | 26dd9835a54d381fef7473baae91821ab06c95b9 | |
| parent | 47ab801440ff51cda270c6dbe5dc487a8e68e55d (diff) | |
| parent | ca8fa036597578f8782a3f8678029e8b151d01d3 (diff) | |
| download | forums-40ed3f677699f2d9801bb75168e84766c35722f4.tar forums-40ed3f677699f2d9801bb75168e84766c35722f4.tar.gz forums-40ed3f677699f2d9801bb75168e84766c35722f4.tar.bz2 forums-40ed3f677699f2d9801bb75168e84766c35722f4.tar.xz forums-40ed3f677699f2d9801bb75168e84766c35722f4.zip | |
Merge remote-tracking branch 'bantu/ticket/12257' into develop-olympus
* bantu/ticket/12257:
[ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT tests run.
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 1e5f453c76..6915ba4304 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ before_script: - 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' = 'mariadb' ]; then travis/setup-mariadb.sh; fi" + - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3' -a '$DB' = 'mysql' ]; then mysql -e 'SET GLOBAL storage_engine=MyISAM;'; fi" - sh -c "if [ '$DB' = 'mysql' -o '$DB' = 'mariadb' ]; 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; phpenv rehash; fi" - cd phpBB |