Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

tfs: linux, remove xvfb-run support

Browse Source
This commit is contained in:
Joao Moreno
2017-07-03 11:45:11 +02:00
parent a6a0d8c3a4
commit c2fa7f6c89
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/test.sh
View File

@@ -1,6 +1,5 @@
#!/bin/bash
echo "HERE: 1"
if [[ "$OSTYPE" == "darwin"* ]]; then
realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
@@ -9,9 +8,7 @@ else
ROOT=$(dirname $(dirname $(readlink -f $0)))
fi
echo "HERE: 2"
cd $ROOT
echo "HERE: 3"
if [[ "$OSTYPE" == "darwin"* ]]; then
NAME=`node -p "require('./product.json').nameLong"`
@@ -21,31 +18,21 @@ else
CODE=".build/electron/$NAME"
fi
echo "HERE: 4"
INTENDED_VERSION="v`node -p "require('./package.json').electronVersion"`"
INSTALLED_VERSION=$(cat .build/electron/version 2> /dev/null)
echo "HERE: 5"
# Node modules
test -d node_modules || ./scripts/npm.sh install
echo "HERE: 6"
# Get electron
(test -f "$CODE" && [ $INTENDED_VERSION == $INSTALLED_VERSION ]) || ./node_modules/.bin/gulp electron
echo "HERE: 7"
# Unit Tests
if [[ "$1" == "--xvfb" ]]; then
echo "HERE: 8"
cd $ROOT ; \
xvfb-run -a "$CODE" test/electron/index.js "$@"
elif [[ "$OSTYPE" == "darwin"* ]]; then
echo "HERE: 9"
if [[ "$OSTYPE" == "darwin"* ]]; then
cd $ROOT ; ulimit -n 4096 ; \
"$CODE" \
test/electron/index.js "$@"
else
echo "HERE: 10"
cd $ROOT ; \
"$CODE" \
test/electron/index.js "$@"