Merge pull request #1397 from esl/add-subdir-source-files-to-cover

Add subdir source files to cover output.
esl · Jul 20, 2017 · 105000c · 105000c
2 parents 588ca0f + 4510172
commit 105000c
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/test.disabled/ejabberd_tests/Makefile b/test.disabled/ejabberd_tests/Makefile
@@ -10,6 +10,9 @@ TLS_DIST ?= no
 
 # autogenerated, not intended for overriding
 DEPS_PATHS := $(addprefix $(PWD)/../../_build/test/lib/,$(addsuffix /ebin,$(DEPS)))
+APP_SRC_PATH := ../../apps/ejabberd/src
+SUBDIR_ERL_FILES := $(wildcard $(APP_SRC_PATH)/*/**.erl)
+SUBDIR_ERL_FILES_IN_SRCDIR := $(foreach file,$(SUBDIR_ERL_FILES),$(APP_SRC_PATH)/$(notdir $(file)))
 
 ifeq ($(TLS_DIST),yes)
 TLS_DIST_OPTS := -args_file vm.dist.args
@@ -43,7 +46,22 @@ quicktest: $(PREPARE)
 		-s run_common_test main test=quick spec=$(TESTSPEC) \
 		> $@.log 2>&1 || (cat $@.log; exit 1)
 
-cover_quicktest: $(PREPARE)
+pre_cover:
+	@cp $(SUBDIR_ERL_FILES) $(APP_SRC_PATH)
+
+post_cover:
+	@rm $(SUBDIR_ERL_FILES_IN_SRCDIR)
+
+cover_quicktest: pre_cover
+	make do_cover_quicktest; STATUS=$$?; make post_cover; exit $$STATUS
+
+cover_test_preset: pre_cover
+	make do_cover_test_preset; STATUS=$$?; make post_cover; exit $$STATUS
+
+cover_test: pre_cover
+	make do_cover_test; STATUS=$$?; make post_cover; exit $$STATUS
+
+do_cover_quicktest: $(PREPARE)
 	erl -noinput $(COMMON_OPTS) $(ADD_OPTS) \
 		-s run_common_test main test=quick spec=$(TESTSPEC) cover=true \
 		> $@.log 2>&1 || (cat $@.log; exit 1)
@@ -53,7 +71,7 @@ test_preset: $(PREPARE)
 		-s run_common_test main test=full spec=$(TESTSPEC) preset=$(PRESET) \
 		> $@.log 2>&1 || (cat $@.log; exit 1)
 
-cover_test_preset: $(PREPARE)
+do_cover_test_preset: $(PREPARE)
 	erl -noinput $(COMMON_OPTS) $(ADD_OPTS) \
 		-s run_common_test main test=full spec=$(TESTSPEC) preset=$(PRESET) cover=true \
 		> $@.log 2>&1 || (cat $@.log; exit 1)
@@ -63,7 +81,7 @@ test: $(PREPARE)
 		-s run_common_test main test=full spec=$(TESTSPEC) \
 		> $@.log 2>&1 || (cat $@.log; exit 1)
 
-cover_test: $(PREPARE)
+do_cover_test: $(PREPARE)
 	erl -noinput $(COMMON_OPTS) $(ADD_OPTS) \
 		-s run_common_test main test=full spec=$(TESTSPEC) cover=true \
 		> $@.log 2>&1 || (cat $@.log; exit 1)