diff options
| author |   Dhruv <dhruv.goel92@gmail.com> | 2014-08-10 12:10:59 +0200 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2014-09-21 13:53:17 +0530 |
| commit | 8d0933ca4bf2724f7a67471edb6b5efe2cdc02e1 (patch) | |
| tree | 359030795681dad350e59bd24a17544d6475c1c3 /.travis.yml | |
| parent | [ticket/12962] Run UI tests on Travis-mysql (diff) | |
| download | phpbb-8d0933ca4bf2724f7a67471edb6b5efe2cdc02e1.tar.gz phpbb-8d0933ca4bf2724f7a67471edb6b5efe2cdc02e1.tar.bz2 phpbb-8d0933ca4bf2724f7a67471edb6b5efe2cdc02e1.zip | |
[ticket/12962] Add setup-phantomjs-server.sh
PHPBB3-12962
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 5 |
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` |