try to enable integration tests for linux

This commit is contained in:
Benjamin Pasero 2015-11-24 08:30:31 +01:00
parent 6505ab448b
commit 807f38ea80
2 changed files with 4 additions and 9 deletions

View file

@ -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:

View file

@ -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
./scripts/code.sh $ROOT/extensions/vscode-api-tests/testWorkspace --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out