From: David Malcolm <dmalcolm@redhat.com>
Date: Mon, 13 Jun 2016 21:07:18 +0000 (+0000)
Subject: pretty-print.c: skip color selftests if GCC_COLORS is set
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2fe00b1fba78d3e9fb26754e9cbf3d05ab7e1506;p=gcc.git

pretty-print.c: skip color selftests if GCC_COLORS is set

gcc/ChangeLog:
	* pretty-print.c (assert_pp_format_colored): Skip the test if
	GCC_COLORS is set.
	(test_pp_format): Remove comment about GCC_COLORS.

From-SVN: r237411
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ccb5ccff6a2..cfad51813b0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-06-13  David Malcolm  <dmalcolm@redhat.com>
+
+	* pretty-print.c (assert_pp_format_colored): Skip the test if
+	GCC_COLORS is set.
+	(test_pp_format): Remove comment about GCC_COLORS.
+
 2016-06-13  David Malcolm  <dmalcolm@redhat.com>
 
 	* input.c (test_reading_source_line): Use SELFTEST_LOCATION.
diff --git a/gcc/pretty-print.c b/gcc/pretty-print.c
index 86ae3a50e07..325263efd6a 100644
--- a/gcc/pretty-print.c
+++ b/gcc/pretty-print.c
@@ -1266,6 +1266,12 @@ static void
 assert_pp_format_colored (const location &loc, const char *expected,
 			  const char *fmt, ...)
 {
+  /* The tests of colorization assume the default color scheme.
+     If GCC_COLORS is set, then the colors have potentially been
+     overridden; skip the test.  */
+  if (getenv ("GCC_COLORS"))
+    return;
+
   va_list ap;
 
   va_start (ap, fmt);
@@ -1347,7 +1353,6 @@ test_pp_format ()
   ASSERT_PP_FORMAT_2 ("normal colored normal 12345678",
 		      "normal %rcolored%R normal %x",
 		      "error", 0x12345678);
-  /* The following assumes an empty value for GCC_COLORS.  */
   assert_pp_format_colored
     (SELFTEST_LOCATION,
      "normal \33[01;31m\33[Kcolored\33[m\33[K normal 12345678",