diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-08-26 15:16:08 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-08-26 15:16:08 +0200 |
| commit | a3d87a1443a651c5a3d62bd57fcdf3ce9d5b83e0 (patch) | |
| tree | 50ca8d0f0b1080b32f98b388de188f3674588b27 | |
| parent | 446607ef534650987bcda4e65023cfc1d290e794 (diff) | |
| parent | 5407f9b00dc550c3c6fb7d4415400332cfa00204 (diff) | |
| download | forums-a3d87a1443a651c5a3d62bd57fcdf3ce9d5b83e0.tar forums-a3d87a1443a651c5a3d62bd57fcdf3ce9d5b83e0.tar.gz forums-a3d87a1443a651c5a3d62bd57fcdf3ce9d5b83e0.tar.bz2 forums-a3d87a1443a651c5a3d62bd57fcdf3ce9d5b83e0.tar.xz forums-a3d87a1443a651c5a3d62bd57fcdf3ce9d5b83e0.zip | |
Merge remote-tracking branch 'github-bantu/ticket/11060' into develop-olympus
* github-bantu/ticket/11060:
[ticket/11060] Backport ca4cee86afb88820a52ac1535de18c4dbb365f0e to olympus.
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 42d7b201fa..94e7086c1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,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' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi" + - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then pyrus set auto_discover 1; fi" - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear install --force phpunit/DbUnit; else pyrus install --force phpunit/DbUnit; fi" - phpenv rehash - cd phpBB |