From 460783f343a01efa9cf39dff23bbce776d73dcdb Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Tue, 8 Mar 2016 11:50:56 +0100
Subject: [PATCH] split tests

---
 .travis.yml                 |  1 +
 scripts/test-integration.sh | 12 ++++++++++++
 scripts/test.sh             |  5 -----
 3 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100755 scripts/test-integration.sh

diff --git a/.travis.yml b/.travis.yml
index 656f5b82eb5..55ceed42ec1 100644
--- 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
new file mode 100755
index 00000000000..ca37b19dd9e
--- /dev/null
+++ 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
\ No newline at end of file
diff --git a/scripts/test.sh b/scripts/test.sh
index bbad6e94060..4b549365e20 100755
--- 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
\ No newline at end of file