[PATCH] Ensure testing is done with -fdiagnostics-color=never in the testsuite

[Jakub Jelinek]

Hi!

When testing gcc with GCC_COLORS=' ' in the environment,
gcc/testsuite/lib/*.exp makes sure -fdiagnostics-color=never is added
and thus doesn't confuse the regexps checking for gcc output (which
in dejagnu goes to a pseudo tty and thus can be colorized even with
-fdiagnostics-color=auto), but apparently libstdc++-v3, libgomp and
libmudflap testsuites don't do that, so some tests FAIL because of that.

Fixed thusly, ok for trunk?

2013-09-20  Jakub Jelinek  <ja...@redhat.com>

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.

--- libstdc++-v3/testsuite/lib/libstdc++.exp.jj 2013-08-12 21:18:45.000000000 
+0200
+++ libstdc++-v3/testsuite/lib/libstdc++.exp    2013-09-20 12:13:41.342720820 
+0200
@@ -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
--- libmudflap/testsuite/lib/libmudflap.exp.jj  2013-02-04 14:49:32.000000000 
+0100
+++ libmudflap/testsuite/lib/libmudflap.exp     2013-09-20 12:16:31.760710659 
+0200
@@ -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++"} {
--- libgomp/testsuite/lib/libgomp.exp.jj        2013-06-25 11:47:20.000000000 
+0200
+++ libgomp/testsuite/lib/libgomp.exp   2013-09-20 11:51:32.885800025 +0200
@@ -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"
 }

        Jakub