Merge pull request #1393 from MartinNowak/coverage_no_code

print filename in coverage reports for modules w/o code
dlang · Oct 3, 2015 · e49df27 · e49df27
2 parents 53d3955 + 93043bf
commit e49df27
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 2 deletions.
diff --git a/src/rt/cover.d b/src/rt/cover.d
@@ -232,6 +232,10 @@ shared static ~this()
                 exit(EXIT_FAILURE);
             }
         }
+        else
+        {
+            fprintf(flst, "%.*s has no code\n", cast(int)c.filename.length, c.filename.ptr);
+        }
 
         version (Windows)
             SetEndOfFile(handle(fileno(flst)));

diff --git a/test/coverage/Makefile b/test/coverage/Makefile
@@ -2,7 +2,7 @@ include ../common.mak
 
 DFLAGS+=-cov
 
-NORMAL_TESTS:=$(addprefix $(ROOT)/,$(addsuffix .done,basic))
+NORMAL_TESTS:=$(addprefix $(ROOT)/,$(addsuffix .done,basic no_code))
 MERGE_TESTS:=$(addprefix $(ROOT)/,$(addsuffix .done,merge merge_true))
 
 DIFF:=diff
@@ -25,8 +25,18 @@ $(MERGE_TESTS): $(ROOT)/%.done: $(ROOT)/%
 	$(QUIET)$(DIFF) src-$*.lst.exp $(ROOT)/src-$*.lst
 	@touch $@
 
+$(ROOT)/no_code.done: $(ROOT)/%.done: $(ROOT)/%
+	@echo Testing $*
+	@rm -f $(ROOT)/src-$*.lst
+	$(QUIET)$(ROOT)/$* $(ROOT) $(RUN_ARGS)
+	$(QUIET)$(ROOT)/$* $(ROOT) $(RUN_ARGS)
+	$(QUIET)$(DIFF) src-$*.lst.exp $(ROOT)/src-$*.lst
+	$(QUIET)$(DIFF) src-$*_imp.lst.exp $(ROOT)/src-$*_imp.lst
+	@touch $@
+
+$(ROOT)/no_code: $(SRC)/no_code_imp.d
 $(ROOT)/%: $(SRC)/%.d
-	$(QUIET)$(DMD) $(DFLAGS) -of$(ROOT)/$* $<
+	$(QUIET)$(DMD) $(DFLAGS) -of$(ROOT)/$* $^
 
 clean:
 	rm -rf $(ROOT) *.lst
diff --git a/test/coverage/src-no_code.lst.exp b/test/coverage/src-no_code.lst.exp
@@ -0,0 +1,7 @@
+       |import core.runtime;
+       |
+       |void main(string[] args)
+       |{
+      1|    dmd_coverDestPath(args[1]);
+       |}
+src/no_code.d is 100% covered
diff --git a/test/coverage/src-no_code_imp.lst.exp b/test/coverage/src-no_code_imp.lst.exp
@@ -0,0 +1,2 @@
+       |enum NO_CODE_IMP = 0;
+src/no_code_imp.d has no code
diff --git a/test/coverage/src/no_code.d b/test/coverage/src/no_code.d
@@ -0,0 +1,6 @@
+import core.runtime;
+
+void main(string[] args)
+{
+    dmd_coverDestPath(args[1]);
+}
diff --git a/test/coverage/src/no_code_imp.d b/test/coverage/src/no_code_imp.d
@@ -0,0 +1 @@
+enum NO_CODE_IMP = 0;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		\|enum NO_CODE_IMP = 0;
		src/no_code_imp.d has no code