testsuite: ensure GCC_COLORS is unset

gcc/testsuite/ChangeLog:
	* lib/gcc-dg.exp: Ensure GCC_COLORS is unset.

From-SVN: r248800

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ff1b0703d51c773c6e08b955c1c9cd2d010d7d1a..1f1bc3cc9c1dc54cc6f2a50916155b9e704c7d59 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2017-06-01  David Malcolm  <dmalcolm@redhat.com>
+
+       * lib/gcc-dg.exp: Ensure GCC_COLORS is unset.
+
 2017-06-01  Pierre-Marie de Rodat  <derodat@adacore.com>
 
        * debug12.adb, debug12.ads: New testcase.

diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index b6865b441dce5603b1ec67b2bdffb830bb4f6621..e55557491bcda19934fb28a239f04ae2ce2dca60 100644 (file)
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -43,6 +43,12 @@ if { [ishost "*-*-cygwin*"] } {
   setenv LANG C.ASCII
 }
 
+# Ensure GCC_COLORS is unset, for the rare testcases that verify
+# how output is colorized.
+if [info exists ::env(GCC_COLORS) ] {
+    unsetenv GCC_COLORS
+}
+
 global GCC_UNDER_TEST
 if ![info exists GCC_UNDER_TEST] {
     set GCC_UNDER_TEST "[find_gcc]"