build, tools: add test-ci scripts

refack · refack · commit 7ff770c9286e · 2017-05-06T14:59:35.000-04:00
* Replace explicit use in `Makefile` and `vcbuild.bat`
diff --git a/Makefile b/Makefile
@@ -43,6 +43,7 @@ NODE_EXE = node$(EXEEXT)
 NODE ?= ./$(NODE_EXE)
 NODE_G_EXE = node_g$(EXEEXT)
 NPM ?= ./deps/npm/bin/npm-cli.js
+TEST_CI = ./tools/test-ci.sh
 
 # Flags for packaging.
 BUILD_DOWNLOAD_FLAGS ?= --download=all
@@ -195,18 +196,18 @@ test: all
 	$(MAKE) build-addons
 	$(MAKE) build-addons-napi
 	$(MAKE) cctest
-	$(PYTHON) tools/test.py --mode=release -J \
+	$(TEST_CI) \
 		doctool inspector known_issues message pseudo-tty parallel sequential $(CI_NATIVE_SUITES)
 	$(MAKE) lint
 
 test-parallel: all
-	$(PYTHON) tools/test.py --mode=release parallel -J
+	$(TEST_CI) parallel
 
 test-valgrind: all
 	$(PYTHON) tools/test.py --mode=release --valgrind sequential parallel message
 
 test-check-deopts: all
-	$(PYTHON) tools/test.py --mode=release --check-deopts parallel sequential -J
+	$(TEST_CI) --check-deopts parallel sequential
 
 # Implicitly depends on $(NODE_EXE).  We don't depend on it explicitly because
 # it always triggers a rebuild due to it being a .PHONY rule.  See the comment
diff --git a/tools/test-ci.cmd b/tools/test-ci.cmd
@@ -0,0 +1,3 @@
+pushd %~dp0\..
+python tools\test.py -J --mode=release %*
+popd
diff --git a/tools/test-ci.sh b/tools/test-ci.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+cd `dirname $0`/.. > /dev/null
+`which python` tools/test.py -J --mode=release $*
diff --git a/vcbuild.bat b/vcbuild.bat
@@ -403,7 +403,9 @@ if defined test_node_inspect goto node-test-inspect
 goto node-tests
 
 :node-check-deopts
-python tools\test.py --mode=release --check-deopts parallel sequential -J
+set "test_deopts_cmd=tools\test-ci.cmd --check-deopts parallel sequential"
+echo running '%test_deopts_cmd%'
+call %test_deopts_cmd%
 if defined test_node_inspect goto node-test-inspect
 goto node-tests
 
@@ -418,8 +420,9 @@ if "%config%"=="Debug" set test_args=--mode=debug %test_args%
 if "%config%"=="Release" set test_args=--mode=release %test_args%
 echo running 'cctest %cctest_args%'
 "%config%\cctest" %cctest_args%
-echo running 'python tools\test.py %test_args%'
-python tools\test.py %test_args%
+set "test_cmd=tools\test-ci.cmd %test_args%"
+echo running '%test_cmd%'
+call %test_cmd%
 goto cpplint
 
 :cpplint

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+pushd %~dp0\..`
	`2`	`+python tools\test.py -J --mode=release %*`
	`3`	`+popd`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/bin/bash`
	`2`	+cd `dirname $0`/.. > /dev/null
	`3`	+`which python` tools/test.py -J --mode=release $*