From bd599dea43ec7cc7b68ec87a6b493aaf3c595589 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 20 Sep 2013 19:52:29 +0200 Subject: [PATCH] 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 --- libgomp/ChangeLog | 6 ++++++ libgomp/testsuite/lib/libgomp.exp | 3 +++ libmudflap/ChangeLog | 6 ++++++ libmudflap/testsuite/lib/libmudflap.exp | 2 +- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/testsuite/lib/libstdc++.exp | 2 +- 6 files changed, 23 insertions(+), 2 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 0af9f4427c1..7646e5c05e2 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,9 @@ +2013-09-20 Jakub Jelinek + + PR testsuite/57605 + * testsuite/lib/libgomp.exp: Add -fdiagnostics-color=never to + ALWAYS_CFLAGS. + 2013-09-20 Alan Modra * configure: Regenerate. diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp index 72daa7e3a3e..d1d8bc8627b 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 f8093a0c506..333029fc9df 100644 --- a/libmudflap/ChangeLog +++ b/libmudflap/ChangeLog @@ -1,3 +1,9 @@ +2013-09-20 Jakub Jelinek + + PR testsuite/57605 + * testsuite/lib/libmudflap.exp (libmudflap-init): Append + -fdiagnostics-color=never to cxxflags. + 2013-09-20 Alan Modra * configure: Regenerate. diff --git a/libmudflap/testsuite/lib/libmudflap.exp b/libmudflap/testsuite/lib/libmudflap.exp index 48166e1d0f3..9927ba1745a 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 2b6386929fb..7f8cae5fb99 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2013-09-20 Jakub Jelinek + + PR testsuite/57605 + * testsuite/lib/libstdc++.exp (libstdc++_init): Prepend + -fdiagnostics-color=never to cxxflags. + 2013-09-20 Marc Glisse PR libstdc++/58338 diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 83a3862fbd0..0dff98caa66 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