aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2013-09-20 19:52:29 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2013-09-20 19:52:29 +0200
commitbd599dea43ec7cc7b68ec87a6b493aaf3c595589 (patch)
tree9653f097f0784bb37d8677abe3302fe87a6c48ae
parenta3cc13ccc8f4fce1b3990fa7c722924d42d19d85 (diff)
downloadgcc-bd599dea43ec7cc7b68ec87a6b493aaf3c595589.zip
gcc-bd599dea43ec7cc7b68ec87a6b493aaf3c595589.tar.gz
gcc-bd599dea43ec7cc7b68ec87a6b493aaf3c595589.tar.bz2
re PR testsuite/57605 (colors break note pruning in the testsuite)
PR testsuite/57605 libstdc++-v3/ * testsuite/lib/libstdc++.exp (libstdc++_init): Prepend -fdiagnostics-color=never to cxxflags. libmudflap/ * testsuite/lib/libmudflap.exp (libmudflap-init): Append -fdiagnostics-color=never to cxxflags. libgomp/ * testsuite/lib/libgomp.exp: Add -fdiagnostics-color=never to ALWAYS_CFLAGS. From-SVN: r202791
-rw-r--r--libgomp/ChangeLog6
-rw-r--r--libgomp/testsuite/lib/libgomp.exp3
-rw-r--r--libmudflap/ChangeLog6
-rw-r--r--libmudflap/testsuite/lib/libmudflap.exp2
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/testsuite/lib/libstdc++.exp2
6 files changed, 23 insertions, 2 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 0af9f44..7646e5c 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-20 Jakub Jelinek <jakub@redhat.com>
+
+ PR testsuite/57605
+ * testsuite/lib/libgomp.exp: Add -fdiagnostics-color=never to
+ ALWAYS_CFLAGS.
+
2013-09-20 Alan Modra <amodra@gmail.com>
* configure: Regenerate.
diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index 72daa7e..d1d8bc8 100644
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -167,6 +167,9 @@ proc libgomp_init { args } {
# Disable caret
lappend ALWAYS_CFLAGS "additional_flags=-fno-diagnostics-show-caret"
+ # Disable color diagnostics
+ lappend ALWAYS_CFLAGS "additional_flags=-fdiagnostics-color=never"
+
# And, gee, turn on OpenMP.
lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
}
diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog
index f8093a0..333029f 100644
--- a/libmudflap/ChangeLog
+++ b/libmudflap/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-20 Jakub Jelinek <jakub@redhat.com>
+
+ PR testsuite/57605
+ * testsuite/lib/libmudflap.exp (libmudflap-init): Append
+ -fdiagnostics-color=never to cxxflags.
+
2013-09-20 Alan Modra <amodra@gmail.com>
* configure: Regenerate.
diff --git a/libmudflap/testsuite/lib/libmudflap.exp b/libmudflap/testsuite/lib/libmudflap.exp
index 48166e1..9927ba1 100644
--- a/libmudflap/testsuite/lib/libmudflap.exp
+++ b/libmudflap/testsuite/lib/libmudflap.exp
@@ -85,7 +85,7 @@ proc libmudflap-init { language } {
append ld_library_path ":${blddir}/.libs"
set libs "-L${blddir}/.libs"
- set cxxflags "-ggdb3 -DDEBUG_ASSERT"
+ set cxxflags "-ggdb3 -DDEBUG_ASSERT -fdiagnostics-color=never"
set includes "-I${srcdir} -I${srcdir}/.. -I.."
if {$language == "c++"} {
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2b63869..7f8cae5 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-20 Jakub Jelinek <jakub@redhat.com>
+
+ PR testsuite/57605
+ * testsuite/lib/libstdc++.exp (libstdc++_init): Prepend
+ -fdiagnostics-color=never to cxxflags.
+
2013-09-20 Marc Glisse <marc.glisse@inria.fr>
PR libstdc++/58338
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 83a3862..0dff98c 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -283,7 +283,7 @@ proc libstdc++_init { testfile } {
v3track cxxflags 2
# Always use MO files built by this test harness.
- set cxxflags "$cxxflags -DLOCALEDIR=\".\""
+ set cxxflags "-fdiagnostics-color=never $cxxflags -DLOCALEDIR=\".\""
set ccflags "$cxxflags -DLOCALEDIR=\".\""
# If a PCH file is available, use it. We must delay performing