From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 20 Sep 2013 17:52:29 +0000 (+0200)
Subject: re PR testsuite/57605 (colors break note pruning in the testsuite)
X-Git-Tag: releases/gcc-4.9.0~3948
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd599dea43ec7cc7b68ec87a6b493aaf3c595589;p=thirdparty%2Fgcc.git

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
---

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 0af9f4427c1f..7646e5c05e2e 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 72daa7e3a3e1..d1d8bc8627b8 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 f8093a0c5068..333029fc9df3 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 48166e1d0f3f..9927ba1745a7 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 2b6386929fb7..7f8cae5fb992 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 83a3862fbd03..0dff98caa660 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