Browse Source

Add a label to ct runs when testing across all Erlang releases

Loïc Hoguin 11 years ago
parent
commit
723f1b1883
2 changed files with 4 additions and 3 deletions
  1. 1 1
      all.sh
  2. 3 2
      erlang.mk

+ 1 - 1
all.sh

@@ -13,7 +13,7 @@ do
 	. $KERL_INSTALL_PATH/$rel/activate
 	. $KERL_INSTALL_PATH/$rel/activate
 	cp ~/.kerl/builds/$rel/otp_src_*/lib/ssl/test/erl_make_certs.erl \
 	cp ~/.kerl/builds/$rel/otp_src_*/lib/ssl/test/erl_make_certs.erl \
 		deps/ct_helper/src/
 		deps/ct_helper/src/
-	make tests
+	CT_OPTS="-label $rel" make tests
 done
 done
 
 
 xdg-open logs/all_runs.html
 xdg-open logs/all_runs.html

+ 3 - 2
erlang.mk

@@ -216,13 +216,14 @@ build-tests: build-test-deps
 	$(gen_verbose) erlc -v $(ERLC_OPTS) -o test/ \
 	$(gen_verbose) erlc -v $(ERLC_OPTS) -o test/ \
 		$(wildcard test/*.erl test/*/*.erl) -pa ebin/
 		$(wildcard test/*.erl test/*/*.erl) -pa ebin/
 
 
+CT_OPTS ?=
 CT_RUN = ct_run \
 CT_RUN = ct_run \
 	-no_auto_compile \
 	-no_auto_compile \
 	-noshell \
 	-noshell \
 	-pa $(realpath ebin) $(DEPS_DIR)/*/ebin \
 	-pa $(realpath ebin) $(DEPS_DIR)/*/ebin \
 	-dir test \
 	-dir test \
-	-logdir logs
-#	-cover test/cover.spec
+	-logdir logs \
+	$(CT_OPTS)
 
 
 CT_SUITES ?=
 CT_SUITES ?=