GNU
/
easejs
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into perf/master 

Conflicts:
	Makefile
closure/master
Mike Gerwitz 2011-03-11 19:55:29 -05:00
parent db5a5bac58 672ef82aca
commit 3c3d927e65
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -11,6 +11,9 @@ PERF_TESTS := $(shell find "$(PATH_PERF_TEST)" -name 'perf-*.js')
COMBINE=${PATH_TOOLS}/combine COMBINE=${PATH_TOOLS}/combine
TESTS_JS := $(shell find "./test" -name 'test-*.js')
TESTS_SHELL := $(shell find "./test" -name 'test-[^\.]*')
.PHONY: test .PHONY: test
@ -29,13 +32,11 @@ combine: mkbuild
cp ${PATH_BROWSER_TEST} ${PATH_BUILD} cp ${PATH_BROWSER_TEST} ${PATH_BUILD}
# run tests # run tests
test: default test: default $(TESTS_JS) $(TESTS_SHELL)
for test in `find ./test -name 'test-*.js'`; do \ test-%.js: default
node $${test}; \ node $@
done; \ test-%: default
for test in `find ./test -regex '.*/test-[^\.]*'`; do \ ./$@
./$$test; \
done;
# performance tests # performance tests
perf: default $(PERF_TESTS) perf: default $(PERF_TESTS)