aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index b2514d1d57..ebe2dfe8f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,8 @@ install:
before_script:
- travis/setup-database.sh $DB $TRAVIS_PHP_VERSION
- - phantomjs --webdriver=8910
+ - pidof phantomjs || nohup phantomjs --webserver=8910 > /dev/null
+ - sleep 3
script:
- travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION
@@ -43,4 +44,4 @@ script:
- travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION ./
- phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml
- 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"
-
+ - kill -9 `pidof phantomjs`