From patchwork Sun Dec 8 19:18:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 298857 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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3F1272C0087 for ; Mon, 9 Dec 2013 06:18:55 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:references:date:in-reply-to:message-id :mime-version:content-type; q=dns; s=default; b=jVVU1jYBw0ftiZS2 C6Br2qf8iPc55FR04N8fYNOKn/xsOBwH5uBFjPA00Jgjy2lVDFPwntEds7WqwIb9 G6RISfyPcdGizNwbUwwWSqikM9121DXavA0jWj4S9bhkBvWI2XYos3WLFVFryY/t 3F9IK2D26YbiYbUmbORCRFpd/Yg= 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:from :to:cc:subject:references:date:in-reply-to:message-id :mime-version:content-type; s=default; bh=SyUS90REGjNvr2hHj183sp wwNl8=; b=meFZUAY1vGztkLcYA178y2m1JcgCIz6/7NEtDyr8W1POQ8K3vWkAwb pgVzoRNgNwM/tXoL6sfBeLNS1FJU1e8DZo4uQBLT2frkk0wNNAqWmTM9X8ptjIrX dyyvzJQP2wdFB4UAHrym0DEA0DtM4+1IRJXqEpYWtwgY0OAm56xcI= Received: (qmail 14920 invoked by alias); 8 Dec 2013 19:18:48 -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 14909 invoked by uid 89); 8 Dec 2013 19:18:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-wg0-f46.google.com Received: from Unknown (HELO mail-wg0-f46.google.com) (74.125.82.46) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Sun, 08 Dec 2013 19:18:47 +0000 Received: by mail-wg0-f46.google.com with SMTP id m15so2559726wgh.25 for ; Sun, 08 Dec 2013 11:18:38 -0800 (PST) X-Received: by 10.180.10.138 with SMTP id i10mr11044618wib.44.1386530318438; Sun, 08 Dec 2013 11:18:38 -0800 (PST) Received: from localhost ([2.28.236.156]) by mx.google.com with ESMTPSA id g16sm17677009wiw.6.2013.12.08.11.18.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Dec 2013 11:18:38 -0800 (PST) From: Richard Sandiford To: Jakub Jelinek Mail-Followup-To: Jakub Jelinek , gcc-patches@gcc.gnu.org, rdsandiford@googlemail.com Cc: gcc-patches@gcc.gnu.org Subject: Re: Remove regexp and expected output from gtest pass/fail line References: <8738m3ab1f.fsf@talisman.default> <20131208130338.GB892@tucnak.redhat.com> Date: Sun, 08 Dec 2013 19:18:37 +0000 In-Reply-To: <20131208130338.GB892@tucnak.redhat.com> (Jakub Jelinek's message of "Sun, 8 Dec 2013 14:03:38 +0100") Message-ID: <87k3ff8836.fsf@talisman.default> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Jakub Jelinek writes: > On Sun, Dec 08, 2013 at 10:31:56AM +0000, Richard Sandiford wrote: >> --- gcc/testsuite/lib/asan-dg.exp (revision 205654) >> +++ gcc/testsuite/lib/asan-dg.exp (working copy) >> @@ -288,9 +288,10 @@ >> if { "$status" == "fail" } { >> pass "$testname execution test" >> if { ![regexp $regexpr ${output}] } { >> - fail "$testname output pattern test, should match $regexpr" >> + fail "$testname output pattern test" >> + send_log "Output was:\n${output}\nShould match:\n$regexpr\n" > > Are you sure you need to print ${output}? At least looking at current > g++.log or gcc.log file, it looks like the program's output is already > there, so it is IMHO undesriable to print it there once again. OK, how about this version? Thanks, Richard gcc/testsuite/ * lib/asan-dg.exp (asan-gtest): Remove actual and expected output from the pass/fail line and add it to the log instead. Index: gcc/testsuite/lib/asan-dg.exp =================================================================== --- gcc/testsuite/lib/asan-dg.exp 2013-12-04 10:47:41.499044571 +0000 +++ gcc/testsuite/lib/asan-dg.exp 2013-12-08 19:18:01.840876860 +0000 @@ -288,9 +288,10 @@ proc asan-gtest { args } { if { "$status" == "fail" } { pass "$testname execution test" if { ![regexp $regexpr ${output}] } { - fail "$testname output pattern test, should match $regexpr" + fail "$testname output pattern test" + send_log "Output should match: $regexpr\n" } else { - pass "$testname output pattern test, $regexpr" + pass "$testname output pattern test" } } elseif { "$status" == "pass" } { fail "$testname execution test"