Permalink
Browse files

Remove Makefile and add new script for running tests.

  • Loading branch information...
1 parent 8214037 commit ce5cc16c8e77467b6c3e79803d02b909b5bb87a0 @Kami Kami committed May 30, 2012
Showing with 10 additions and 25 deletions.
  1. +0 −24 Makefile
  2. +1 −1 package.json
  3. +9 −0 scripts/tests.sh
View
@@ -1,24 +0,0 @@
-TESTS := \
- tests/test-cidr.js \
- tests/test-bitbuffer.js \
- tests/test-valve.js \
- tests/test-swiz.js
-
-
-
-PATH := ./node_modules/.bin:$(PATH)
-
-WHISKEY := $(shell bash -c 'PATH=$(PATH) type -p whiskey')
-
-default: test
-
-test:
- NODE_PATH=`pwd`/lib/ ${WHISKEY} --sequential --scope-leaks --real-time --tests "${TESTS}"
-
-tap:
- NODE_PATH=`pwd`/lib/ ${WHISKEY} --test-reporter tap --scope-leaks --sequential --real-time --tests "${TESTS}"
-
-coverage:
- NODE_PATH=`pwd`/lib/ ${WHISKEY} --sequential --coverage --coverage-reporter html --coverage-dir coverage_html --tests "${TESTS}"
-
-.PHONY: default test coverage tap scope
View
@@ -22,7 +22,7 @@
"lib": "lib"
},
"scripts": {
- "test": "make test"
+ "test": "./scripts/tests.sh"
},
"engines": {
"node": ">= 0.4.0"
View
@@ -0,0 +1,9 @@
+if [ ! $TEST_FILES ]; then
+ TEST_FILES=$(find tests/ -type f -name "test-*.js" -print0 | tr "\0" " " | sed '$s/.$//')
+fi
+
+NODE_PATH=lib node_modules/whiskey/bin/whiskey \
+ --tests "${TEST_FILES}" \
+ --scope-leaks \
+ --real-time \
+ --sequential

0 comments on commit ce5cc16

Please sign in to comment.