From c2fa7f6c89c4eb5b6f5112f463347bcd6b4c6028 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Mon, 3 Jul 2017 11:45:11 +0200 Subject: [PATCH] tfs: linux, remove xvfb-run support --- scripts/test.sh | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/scripts/test.sh b/scripts/test.sh index 40dc167f2f3..0812c9345fd 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -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 "$@" -- GitLab