diff --git a/.travis.yml b/.travis.yml index 7588dfb3d1d..a18fdb63af4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,9 @@ before_install: - npm config set python `which python` - npm install -g gulp - if [ $TRAVIS_OS_NAME == "linux" ]; then - export CXX="g++-4.9" CC="gcc-4.9"; + export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0; + sh -e /etc/init.d/xvfb start; + sleep 3; fi install: diff --git a/test/run.sh b/test/run.sh index 8a94edda3a1..24147939853 100755 --- a/test/run.sh +++ b/test/run.sh @@ -19,11 +19,4 @@ else fi # Integration Tests (currently not enabled for linux because of missing display) -# if [[ "$OSTYPE" == "linux" ]]; then -# export DISPLAY=:99.0 -# sh -e /etc/init.d/xvfb start -# sleep 3 -# fi -if [[ "$OSTYPE" == "darwin"* ]]; then -./scripts/code.sh $ROOT/extensions/vscode-api-tests/testWorkspace --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out -fi \ No newline at end of file +./scripts/code.sh $ROOT/extensions/vscode-api-tests/testWorkspace --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out \ No newline at end of file