Move xvfb startup to script section

This commit is contained in:
Alexey Andreev 2017-04-23 17:58:42 +03:00
parent 0f5a4c9ef4
commit df5545ffd6

View File

@ -21,8 +21,6 @@ branches:
before_install: before_install:
- nvm install 7 - nvm install 7
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- OLD_VERSION=`mvn help:evaluate -Dexpression=project.version 2>/dev/null | grep -Ev "(^\[|Download\w+:)"` - OLD_VERSION=`mvn help:evaluate -Dexpression=project.version 2>/dev/null | grep -Ev "(^\[|Download\w+:)"`
- NEW_VERSION=${OLD_VERSION%-SNAPSHOT}-dev-`printf %d $TRAVIS_BUILD_NUMBER` - NEW_VERSION=${OLD_VERSION%-SNAPSHOT}-dev-`printf %d $TRAVIS_BUILD_NUMBER`
- echo "Building version $NEW_VERSION" - echo "Building version $NEW_VERSION"
@ -40,6 +38,9 @@ script:
- mvn -e test -P \!htmlUnit - mvn -e test -P \!htmlUnit
- BASE_PATH=`pwd` - BASE_PATH=`pwd`
- pushd tests/src/test/js - pushd tests/src/test/js
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- sleep 3
- firefox index.html & - firefox index.html &
- FIREFOX_PID=$! - FIREFOX_PID=$!
- node start.js $BASE_PATH/tests/target/js-tests - node start.js $BASE_PATH/tests/target/js-tests