Reference tape bin directly

kgryte · kgryte · commit 348e257a9d44 · 2016-06-20T14:59:14.000-07:00
Adds support for using `istanbul` on Windows. `npm` wraps bin files in `.cmd` files, which `istanbul` cannot parse. The workaround is to reference bin files directly. For details, see https://github.com/gotwarlost/istanbul#usage-on-windows.
diff --git a/tools/ci/appveyor.sh b/tools/ci/appveyor.sh
@@ -97,9 +97,8 @@ make benchmark >> "$CI_LOG_PATH" 2>&1
 echo 'Running examples...'
 make examples >> "$CI_LOG_PATH" 2>&1
 
-# TODO: uncomment once https://github.com/ForbesLindesay/cmd-shim/issues/17 is resolved.
-# echo 'Generating test coverage report...'
-# make test-cov >> "$CI_LOG_PATH" 2>&1
+echo 'Generating test coverage report...'
+make test-cov >> "$CI_LOG_PATH" 2>&1
 
 echo 'Success!'
 
diff --git a/tools/make/lib/test/tape.mk b/tools/make/lib/test/tape.mk
@@ -8,7 +8,8 @@
 #
 # [1]: https://github.com/substack/tape
 
-JAVASCRIPT_TEST ?= $(BIN_DIR)/tape
+# Note: we reference the `bin` file directly in order to support using `istanbul` for code coverage on Windows (https://github.com/gotwarlost/istanbul#usage-on-windows)
+JAVASCRIPT_TEST ?= $(NODE_MODULES)/tape/bin/tape
 
 # Define any command-line options to use when invoking the `tape` executable:
 JAVASCRIPT_TEST_FLAGS ?=

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@`
`8`	`8`	`#`
`9`	`9`	`# [1]: https://github.com/substack/tape`
`10`	`10`
`11`		`-JAVASCRIPT_TEST ?= $(BIN_DIR)/tape`
	`11`	+# Note: we reference the `bin` file directly in order to support using `istanbul` for code coverage on Windows (https://github.com/gotwarlost/istanbul#usage-on-windows)
	`12`	`+JAVASCRIPT_TEST ?= $(NODE_MODULES)/tape/bin/tape`
`12`	`13`
`13`	`14`	# Define any command-line options to use when invoking the `tape` executable:
`14`	`15`	`JAVASCRIPT_TEST_FLAGS ?=`