From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 114011 invoked by alias); 1 Jun 2017 18:27:23 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 113904 invoked by uid 89); 1 Jun 2017 18:27:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=rare X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 01 Jun 2017 18:27:22 +0000 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0C44B3DE3D; Thu, 1 Jun 2017 18:27:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0C44B3DE3D Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=dmalcolm@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 0C44B3DE3D Received: from c64.redhat.com (ovpn-112-15.phx2.redhat.com [10.3.112.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id B011C171E6; Thu, 1 Jun 2017 18:27:23 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: Dominique d'Humieres , David Malcolm Subject: [PATCH] testsuite: ensure GCC_COLORS is unset Date: Thu, 01 Jun 2017 18:27:00 -0000 Message-Id: <1496343580-61883-1-git-send-email-dmalcolm@redhat.com> X-IsSubscribed: yes X-SW-Source: 2017-06/txt/msg00073.txt.bz2 Dominique noted on IRC that the new test show-template-tree-color.C (r248698) fails when GCC_COLORS is set in the environment. The following patch unsets GCC_COLORS within gcc-dg.exp, fixing this issue. Successfully regrtested on x86_64-pc-linux-gnu; I also verified the fix of the failing test by hand with and without GCC_COLORS set. OK for trunk? gcc/testsuite/ChangeLog: * lib/gcc-dg.exp: Ensure GCC_COLORS is unset. --- gcc/testsuite/lib/gcc-dg.exp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp index b6865b4..e555574 100644 --- 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]" -- 1.8.5.3