gcc: -f*-coverage implies -ftest-coverage

The --coverage flag is a useful alias for -fprofile-arcs
-ftest-coverage where the latter makes gcc output the .gcno file.
While it makes sense to use -fprofile-arcs without a .gcno file (pgo,
maybe more), it never really makes sense to request -fpath-coverage or
-fcondition-coverage without also wanting the .gcno to interpret the
results.

gcc/ChangeLog:

	* common.opt: ftest-coverage enabled by fpath-coverage or
	fcondition-coverage

gcc/testsuite/ChangeLog:

	* g++.dg/gcov/gcov-18.C: Remove --coverage.
	* g++.dg/gcov/gcov-22.C: Likewise.
	* gcc.misc-tests/gcov-19.c: Remove -ftest-coverage.
	* gcc.misc-tests/gcov-29.c: Likewise.

diff --git a/gcc/common.opt b/gcc/common.opt
index 4c73f51defac8f47091a37778fc458fc7cae3d92..88b79bbf8f56ce66da99c05005369126bec49c46 100644 (file)
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -3142,7 +3142,7 @@ Common Var(flag_syntax_only)
 Check for syntax errors, then stop.
 
 ftest-coverage
-Common Var(flag_test_coverage)
+Common Var(flag_test_coverage) EnabledBy(fpath-coverage || fcondition-coverage)
 Create data files needed by \"gcov\".
 
 fthread-jumps

diff --git a/gcc/testsuite/g++.dg/gcov/gcov-18.C b/gcc/testsuite/g++.dg/gcov/gcov-18.C
index 10578ec18655dd86a1b14a02f480b6504cf95584..945728a35e70a88953307e893f1ff0763e2bc4b1 100644 (file)
--- a/gcc/testsuite/g++.dg/gcov/gcov-18.C
+++ b/gcc/testsuite/g++.dg/gcov/gcov-18.C
@@ -1,4 +1,4 @@
-/* { dg-options "--coverage -fcondition-coverage -std=c++11" } */
+/* { dg-options "-fcondition-coverage -std=c++11" } */
 /* { dg-do run } */
 /* { dg-skip-if "requires hosted libstdc++ for vector" { ! hostedlib } } */
 

diff --git a/gcc/testsuite/g++.dg/gcov/gcov-22.C b/gcc/testsuite/g++.dg/gcov/gcov-22.C
index 69e0728e3e4a787873dcac81c80ed9914d10804e..892d59d8a71ec4db1f56725f86d9adbbaf93853c 100644 (file)
--- a/gcc/testsuite/g++.dg/gcov/gcov-22.C
+++ b/gcc/testsuite/g++.dg/gcov/gcov-22.C
@@ -1,4 +1,4 @@
-/* { dg-options "--coverage -fpath-coverage" } */
+/* { dg-options "-fpath-coverage" } */
 /* { dg-do compile } */
 
 #include <stdexcept>

diff --git a/gcc/testsuite/gcc.misc-tests/gcov-19.c b/gcc/testsuite/gcc.misc-tests/gcov-19.c
index 17d6dde87c682b68d5c84cfca35f6d4b36dc4fa3..f555fede4fcb2920e8462871f7b78ee6e7b25117 100644 (file)
--- a/gcc/testsuite/gcc.misc-tests/gcov-19.c
+++ b/gcc/testsuite/gcc.misc-tests/gcov-19.c
@@ -1,4 +1,4 @@
-/* { dg-options "-fcondition-coverage -ftest-coverage" } */
+/* { dg-options "-fcondition-coverage" } */
 /* { dg-do run } */
 
 /* Some side effect to stop branches from being pruned.  */

diff --git a/gcc/testsuite/gcc.misc-tests/gcov-29.c b/gcc/testsuite/gcc.misc-tests/gcov-29.c
index 5e3f0a914e55e34d4a1b15009ea00fbdbbad6346..ced21db831603b71f08dfe46d95eb0427a2fc215 100644 (file)
--- a/gcc/testsuite/gcc.misc-tests/gcov-29.c
+++ b/gcc/testsuite/gcc.misc-tests/gcov-29.c
@@ -1,4 +1,4 @@
-/* { dg-options "--coverage -fpath-coverage" } */
+/* { dg-options "-fpath-coverage" } */
 /* { dg-do run } */
 
 void