From 2e916777233d8d82b93cbca9b754a023a6ca63c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 22 Apr 2013 15:55:22 +0200 Subject: Reorganize the websocket test suite We now have the suite specific modules in the data folder. Compilation is performed by the Makefile instead of ct_run. --- Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ff1e2c9..1463cb4 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,8 @@ erlc_verbose = $(erlc_verbose_$(V)) gen_verbose_0 = @echo " GEN " $@; gen_verbose = $(gen_verbose_$(V)) -.PHONY: all clean-all app clean deps clean-deps docs clean-docs tests autobahn build-plt dialyze +.PHONY: all clean-all app clean deps clean-deps docs clean-docs \ + build-tests tests autobahn build-plt dialyze # Application. @@ -71,7 +72,12 @@ clean-docs: # Tests. +build-tests: + $(gen_verbose) erlc -v $(ERLC_OPTS) \ + -o test/ test/*.erl test/*/*.erl -pa ebin/ + CT_RUN = ct_run \ + -no_auto_compile \ -noshell \ -pa ebin $(DEPS_DIR)/*/ebin \ -dir test \ @@ -79,11 +85,12 @@ CT_RUN = ct_run \ # -cover test/cover.spec tests: ERLC_OPTS += -DTEST=1 -tests: clean clean-deps deps app +tests: clean clean-deps deps app build-tests @mkdir -p logs/ @$(CT_RUN) -suite eunit_SUITE http_SUITE ws_SUITE + $(gen_verbose) rm -f test/*.beam -autobahn: clean clean-deps deps app +autobahn: clean clean-deps deps app build-tests @mkdir -p logs/ @$(CT_RUN) -suite autobahn_SUITE -- cgit v1.2.3