split tests

joaomoreno · joaomoreno · commit 460783f343a0 · 2016-03-08T11:51:00.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -40,3 +40,4 @@ script:
   - gulp electron
   - gulp compile
   - ./scripts/test.sh
+  - ./scripts/test-integration.sh
diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+	realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
+	ROOT=$(dirname $(dirname $(realpath "$0")))
+else
+	ROOT=$(dirname $(dirname $(readlink -f $0)))
+fi
+
+# Integration Tests
+./scripts/code.sh $ROOT/extensions/vscode-api-tests/testWorkspace --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out
diff --git a/scripts/test.sh b/scripts/test.sh
@@ -18,8 +18,3 @@ else
 		./.build/electron/electron \
 		node_modules/mocha/bin/_mocha $*
 fi
-
-# Integration Tests
-if [[ "$SKIP_INTEGRATION_TESTS" == "" ]]; then
-	./scripts/code.sh $ROOT/extensions/vscode-api-tests/testWorkspace --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out
-fi
