From patchwork Fri Sep 20 10:28:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 276272 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A3BCD2C00DB for ; Fri, 20 Sep 2013 20:29:04 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:reply-to:mime-version :content-type; q=dns; s=default; b=H+tk9ge2d+EE6BDLWfM0gI9OWCCCs rrBnC5VfjfglBowypt02dW2UBrBEV9ddLl4Mm3wQXRxDEpNVuq66qBqg2IwIYIAF 4ddxKSAUio6B8PEM9Z9hJw+siZ5VJZ14rJjwaepeCovTsFfIhNviwQwGx8tvdoqv FcIwPctMaIy5qU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:reply-to:mime-version :content-type; s=default; bh=cRwJ0g2wqxWNYDCCYJAGH9fq5fc=; b=rRc 6aKyMMJS6Isx3YMfiGGrKpykUtQuiCD+W6dSEQvGGG0Vc4S4F3smpdzaZN8qkkxl 2CDtRPgHrnbab1mlBJwNK8nJSBMjO77x03KXf8EHJf/cvZa17VFaSziNzqMwiuQG 9NJ2H+G5sRTmFPoDSzH1S/GW+K1RWI7cHlfj4+Y8= Received: (qmail 7101 invoked by alias); 20 Sep 2013 10:28:59 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 7091 invoked by uid 89); 20 Sep 2013 10:28:58 -0000 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; Fri, 20 Sep 2013 10:28:58 +0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r8KASpj1005018 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 20 Sep 2013 06:28:51 -0400 Received: from tucnak.zalov.cz (vpn1-5-65.ams2.redhat.com [10.36.5.65]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r8KASnnZ019150 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 20 Sep 2013 06:28:51 -0400 Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.14.7/8.14.7) with ESMTP id r8KASmBI011451; Fri, 20 Sep 2013 12:28:48 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.14.7/8.14.7/Submit) id r8KASlkZ011450; Fri, 20 Sep 2013 12:28:47 +0200 Date: Fri, 20 Sep 2013 12:28:47 +0200 From: Jakub Jelinek To: ro@CeBiTec.Uni-Bielefeld.DE, mikestump@comcast.net, janisjo@codesourcery.com Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] Ensure testing is done with -fdiagnostics-color=never in the testsuite Message-ID: <20130920102847.GY1817@tucnak.redhat.com> Reply-To: Jakub Jelinek MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes 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 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. Jakub --- 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" }