scripts/test

#1523

.travis.yml

@@ -38,4 +38,4 @@ script:
   - gulp hygiene
   - gulp electron
   - gulp compile
-  - ./test/run.sh
+  - ./scripts/test.sh

scripts/test.bat

+@echo off
+
+set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1
+
+pushd %~dp0\..
+.\.build\electron\Code.exe .\node_modules\mocha\bin\_mocha %*
+popd

scripts/test.sh

+#!/bin/bash
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+	realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
+	ROOT=$(dirname $(dirname $(realpath "$0")))
+else
+	ROOT=$(dirname $(dirname $(readlink -f $0)))
+fi
+
+# Unit Tests
+if [[ "$OSTYPE" == "darwin"* ]]; then
+	cd $ROOT ; ulimit -n 4096 ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
+		./.build/electron/Electron.app/Contents/MacOS/Electron \
+		node_modules/mocha/bin/_mocha $*
+else
+	cd $ROOT ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
+		./.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

test/README.md

@@ -2,17 +2,17 @@
 
 ## Run
 
-The best way to run the Code tests is from within VS Code. Simply press `CMD+Shift+T` (`Ctrl+Shift+T` on Windows) to launch the tests. To make development changes to unit tests you need to be running `gulp`. See [Development Workflow](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#incremental-build) for more details. 
+The best way to run the Code tests is from within VS Code. Simply press `CMD+Shift+T` (`Ctrl+Shift+T` on Windows) to launch the tests. To make development changes to unit tests you need to be running `gulp`. See [Development Workflow](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#incremental-build) for more details.
 
 If you wish to run the tests from a terminal, from the `vscode` folder run:
 
 **OS X and Linux**
 
-	./test/run.sh
+	./scripts/test.sh
 
 **Windows**
 
-	test\run
+	scripts\test
 
 ## Debug
 
@@ -24,8 +24,8 @@ The following command will create a `coverage` folder at the root of the workspa
 
 **OS X and Linux**
 
-	./test/run.sh --coverage
+	./scripts/test.sh --coverage
 
 **Windows**
 
-	test\run --coverage
+	scripts\test --coverage