From 20651fb6d619ddfc1a8c28b8ca39ba7ce1badd87 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Thu, 13 Apr 2017 12:44:37 +0200 Subject: [PATCH] make xvfb an arg --- scripts/test-xvfb.sh | 3 --- scripts/test.sh | 8 +++++++- 2 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 scripts/test-xvfb.sh diff --git a/scripts/test-xvfb.sh b/scripts/test-xvfb.sh deleted file mode 100644 index 3d035a097a4..00000000000 --- a/scripts/test-xvfb.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -xvfb-run ./test.sh "$@" diff --git a/scripts/test.sh b/scripts/test.sh index c8318a434dd..ebe39774193 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -29,9 +29,15 @@ test -d node_modules || ./scripts/npm.sh install # Build test -d out || ./node_modules/.bin/gulp compile echo "code $CODE" + # Unit Tests export VSCODE_DEV=1 -if [[ "$OSTYPE" == "darwin"* ]]; then + +if [[ "$1" == "--xvfb" ]]; then + cd $ROOT ; \ + xvfb-run "$CODE" test/electron/index.js "$@" + +elif [[ "$OSTYPE" == "darwin"* ]]; then cd $ROOT ; ulimit -n 4096 ; \ "$CODE" \ test/electron/index.js "$@" -- GitLab