Refactored Makefile.

rauchg · rauchg · commit bf114ddf2ea1 · 2012-02-26T16:03:04.000-03:00
diff --git a/Makefile b/Makefile
@@ -1,31 +1,18 @@
 
-ALL_TESTS = $(shell find test/ -name '*.test.js')
-ALL_BENCH = $(shell find benchmarks -name '*.bench.js')
-
-run-tests:
-	@./node_modules/.bin/expresso \
-		-t 3000 \
-		-I support \
-		--serial \
-		$(TESTFLAGS) \
-		$(TESTS)
+TESTS = test/*.js
+BENCHMARKS = $(shell find bench -type f ! -name 'runner.js')
+REPORTER = dot
 
 test:
-	@$(MAKE) NODE_PATH=lib TESTS="$(ALL_TESTS)" run-tests
-
-test-cov:
-	@TESTFLAGS=--cov $(MAKE) test
-
-test-leaks:
-	@ls test/leaks/* | xargs node --expose_debug_as=debug --expose_gc
-
-run-bench:
-	@node $(PROFILEFLAGS) benchmarks/runner.js
+	@./node_modules/.bin/mocha \
+		--require test/common \
+		--reporter $(REPORTER) \
+		--slow 500ms \
+		--bail \
+		--growl \
+		$(TESTS)
 
 bench:
-	@$(MAKE) BENCHMARKS="$(ALL_BENCH)" run-bench
-
-profile:
-	@PROFILEFLAGS='--prof --trace-opt --trace-bailout --trace-deopt' $(MAKE) bench
+	@node $(PROFILEFLAGS) bench/runner.js $(BENCHMARKS)
 
-.PHONY: test bench profile
+.PHONY: test bench
