Merge pull request #1352 from MartinNowak/fixTest

output coverage reports to $(ROOT) to avoid test interference
dlang · Aug 25, 2015 · 64cceb1 · 64cceb1
2 parents 478b6c5 + d1d9128
commit 64cceb1
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 15 deletions.
diff --git a/test/coverage/Makefile b/test/coverage/Makefile
@@ -12,17 +12,17 @@ all: $(NORMAL_TESTS) $(MERGE_TESTS)
 
 $(NORMAL_TESTS): $(ROOT)/%.done: $(ROOT)/%
 	@echo Testing $*
-	@rm -f src-$*.lst
-	$(QUIET)$(ROOT)/$* $(RUN_ARGS)
-	$(QUIET)$(DIFF) src-$*.lst.exp src-$*.lst
+	@rm -f $(ROOT)/src-$*.lst
+	$(QUIET)$(ROOT)/$* $(ROOT) $(RUN_ARGS)
+	$(QUIET)$(DIFF) src-$*.lst.exp $(ROOT)/src-$*.lst
 	@touch $@
 
 $(MERGE_TESTS): $(ROOT)/%.done: $(ROOT)/%
 	@echo Testing $*
-	@rm -f src-$*.lst
-	$(QUIET)$(ROOT)/$* $(RUN_ARGS)
-	$(QUIET)$(ROOT)/$* $(RUN_ARGS)
-	$(QUIET)$(DIFF) src-$*.lst.exp src-$*.lst
+	@rm -f $(ROOT)/src-$*.lst
+	$(QUIET)$(ROOT)/$* $(ROOT) $(RUN_ARGS)
+	$(QUIET)$(ROOT)/$* $(ROOT) $(RUN_ARGS)
+	$(QUIET)$(DIFF) src-$*.lst.exp $(ROOT)/src-$*.lst
 	@touch $@
 
 $(ROOT)/%: $(SRC)/%.d

diff --git a/test/coverage/src-basic.lst.exp b/test/coverage/src-basic.lst.exp
@@ -1,5 +1,7 @@
-       |int main()
+       |import core.runtime;
+       |
+       |void main(string[] args)
        |{
-      1|    return 0;
+      1|    dmd_coverDestPath(args[1]);
        |}
 src/basic.d is 100% covered
diff --git a/test/coverage/src-merge.lst.exp b/test/coverage/src-merge.lst.exp
@@ -1,5 +1,8 @@
-       |int main()
+       |import core.runtime;
+       |
+       |int main(string[] args)
        |{
+      1|    dmd_coverDestPath(args[1]);
       1|    return 0;
        |}
 src/merge.d is 100% covered
diff --git a/test/coverage/src-merge_true.lst.exp b/test/coverage/src-merge_true.lst.exp
@@ -1,7 +1,8 @@
        |import core.runtime;
        |
-       |void main()
+       |void main(string[] args)
        |{
+      2|    dmd_coverDestPath(args[1]);
       2|    dmd_coverSetMerge(true);
        |}
 src/merge_true.d is 100% covered
diff --git a/test/coverage/src/basic.d b/test/coverage/src/basic.d
@@ -1,4 +1,6 @@
-int main()
+import core.runtime;
+
+void main(string[] args)
 {
-    return 0;
+    dmd_coverDestPath(args[1]);
 }
diff --git a/test/coverage/src/merge.d b/test/coverage/src/merge.d
@@ -1,4 +1,7 @@
-int main()
+import core.runtime;
+
+int main(string[] args)
 {
+    dmd_coverDestPath(args[1]);
     return 0;
 }
diff --git a/test/coverage/src/merge_true.d b/test/coverage/src/merge_true.d
@@ -1,6 +1,7 @@
 import core.runtime;
 
-void main()
+void main(string[] args)
 {
+    dmd_coverDestPath(args[1]);
     dmd_coverSetMerge(true);
 }