aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-01-24 20:10:49 +0100
committerJoas Schilling <nickvergessen@gmx.de>2015-01-24 21:10:35 +0100
commitc4230385877c18a70541f79552e46ab937ea462b (patch)
treee36c762b762ba2999a6e723df7213fbdb08f8596 /.travis.yml
parentMerge pull request #3321 from marc1706/ticket/13282 (diff)
downloadphpbb-c4230385877c18a70541f79552e46ab937ea462b.tar.gz
phpbb-c4230385877c18a70541f79552e46ab937ea462b.tar.bz2
phpbb-c4230385877c18a70541f79552e46ab937ea462b.zip
[ticket/13543] Add slow tests to travis matrix
PHPBB3-13543
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 2e0b68c3de..b7b17f2f19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,8 @@ matrix:
env: DB=postgres
- php: 5.4
env: DB=sqlite3
+ - php: 5.4
+ env: DB=mysqli;SLOWTESTS=1
- php: 5.5
env: DB=mysqli
- php: 5.6
@@ -41,6 +43,7 @@ script:
- travis/check-sami-parse-errors.sh $DB $TRAVIS_PHP_VERSION
- travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION
- travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION ./
- - phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml
+ - sh -c "if [ '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"
+ - sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi"
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"