1
0
Fork 0

Altered Makefile to ensure the combine test is performed after all others

closure/master
Mike Gerwitz 2011-03-12 12:07:07 -05:00
parent e83225f916
commit 540d8a4f00
1 changed files with 8 additions and 3 deletions

View File

@ -11,10 +11,14 @@ PERF_TESTS := $(shell find "$(PATH_PERF_TEST)" -name 'perf-*.js')
COMBINE=${PATH_TOOLS}/combine COMBINE=${PATH_TOOLS}/combine
TESTS := $(shell find "./test" -name 'test-*') TESTS := $(shell find "$(PATH_TEST)" \
-name 'test-*' \
-a ! -name 'test-combine.js'\
)
TEST_COMBINE := $(PATH_TEST)/test-combine.js
.PHONY: test .PHONY: test test-combine
default: combine default: combine
@ -31,7 +35,8 @@ combine: mkbuild
cp ${PATH_BROWSER_TEST} ${PATH_BUILD} cp ${PATH_BROWSER_TEST} ${PATH_BUILD}
# run tests # run tests
test: default $(TESTS) test: default $(TESTS) test-combine
test-combine: default $(TEST_COMBINE)
test-%.js: default test-%.js: default
node $@ node $@
test-%: default test-%: default