Merge branch 'master' into perf/master
commit
be9e5796c1
5
Makefile
5
Makefile
|
@ -11,8 +11,7 @@ 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 find "./test" -name 'test-*')
|
||||||
TESTS_SHELL := $(shell find "./test" -name 'test-[^\.]*')
|
|
||||||
|
|
||||||
|
|
||||||
.PHONY: test
|
.PHONY: test
|
||||||
|
@ -32,7 +31,7 @@ combine: mkbuild
|
||||||
cp ${PATH_BROWSER_TEST} ${PATH_BUILD}
|
cp ${PATH_BROWSER_TEST} ${PATH_BUILD}
|
||||||
|
|
||||||
# run tests
|
# run tests
|
||||||
test: default $(TESTS_JS) $(TESTS_SHELL)
|
test: default $(TESTS)
|
||||||
test-%.js: default
|
test-%.js: default
|
||||||
node $@
|
node $@
|
||||||
test-%: default
|
test-%: default
|
||||||
|
|
Loading…
Reference in New Issue