Merge branch 'eyraud/fix_regr' into 'master'

Jugst3r · Jugst3r · commit 063e62713ab4 · 2023-09-21T10:20:45.000Z
Fix regressions

See merge request eng/cov/gnatcoverage!263

Ref: eng/cov/gnatcoverage#103
Ref: eng/cov/gnatcoverage#65
diff --git a/testsuite/tests/instr-cov/c_metaprog/main.c b/testsuite/tests/instr-cov/c_metaprog/main.c
@@ -2,7 +2,7 @@ int
 main ()
 {
   int a = 0;
-#define DECISION a
-#include "meta_print_msg.h"
+#define DECISION 1
+#include "meta_inc.h"
   return 0;
 }
diff --git a/testsuite/tests/instr-cov/c_metaprog/meta_inc.h b/testsuite/tests/instr-cov/c_metaprog/meta_inc.h
@@ -0,0 +1,4 @@
+#ifdef DECISION
+if (DECISION)
+  a++;
+#endif
diff --git a/testsuite/tests/instr-cov/c_metaprog/meta_print_msg.h b/testsuite/tests/instr-cov/c_metaprog/meta_print_msg.h
diff --git a/testsuite/tests/instr-cov/c_metaprog/test.py b/testsuite/tests/instr-cov/c_metaprog/test.py
@@ -17,7 +17,7 @@
     gprsw=GPRswitches(root_project=gprfor(srcdirs=[".."], mains=["main.c"])),
     covlevel="stmt+decision",
     mains=["main"],
-    extra_instr_args=["--ignore-source-files=meta_print_msg.h"],
+    extra_instr_args=["--ignore-source-files=meta_inc.h"],
     extra_coverage_args=["-axcov"],
     trace_mode="src",
 )
diff --git a/testsuite/tests/subp_of_interest/test.opt b/testsuite/tests/subp_of_interest/test.opt
@@ -0,0 +1 @@
+5.04a1 DEAD Uses Ada_2012 code constructs (aspects)

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +#ifdef DECISION
 +if (DECISION)
 +  a++;
 +#endif
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`gprsw=GPRswitches(root_project=gprfor(srcdirs=[".."], mains=["main.c"])),`
`18`	`18`	`covlevel="stmt+decision",`
`19`	`19`	`mains=["main"],`
`20`		`- extra_instr_args=["--ignore-source-files=meta_print_msg.h"],`
	`20`	`+ extra_instr_args=["--ignore-source-files=meta_inc.h"],`
`21`	`21`	`extra_coverage_args=["-axcov"],`
`22`	`22`	`trace_mode="src",`
`23`	`23`	`)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+5.04a1 DEAD Uses Ada_2012 code constructs (aspects)`