From patchwork Tue May 29 07:51:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 921872 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-478628-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="WtwIfVPI"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40w5Wt5Nx6z9s01 for ; Tue, 29 May 2018 17:51:19 +1000 (AEST) 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:mime-version:content-type; q=dns; s=default; b=StD558xaJNXEPnI5C4XpAGFP8KIaM57m8ZOuUWc+22Cd7Vmk9P mO+3yPN0flviRDOl3zF3us3RpXUBid5EZB5utfKF5R4ulb1z7eVteAVqDECxEPY/ i/Q7NAtPdCq0FHWJ9tpFVEKL4pY1j5Zt/+9gk+roxXJ9KVBzFSyJQERD4= 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:mime-version:content-type; s= default; bh=jmOpmZshTcJxBwCvmGwNM9D1sj4=; b=WtwIfVPIRVyLfuTlMlx3 HNEQi1K2mCA/E+qZZ+ppGZjsCGj2V02N7aCFlFy33I5/UEZfMfV63ID1+fZ9U9Sw mQG8IUFPN0XIZEqjqBTcZ0NFUtx+jBjfSHcLBCgkNpQW6efUUb7GJ4RSmhJsdj7u XRLpmjn+PzyMQMGRFQNPvVQ= Received: (qmail 7162 invoked by alias); 29 May 2018 07:51:12 -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 5120 invoked by uid 89); 29 May 2018 07:51:10 -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, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=sk:scanlt, sk:scan-lt, ads, 2137 X-HELO: mail-wm0-f68.google.com Received: from mail-wm0-f68.google.com (HELO mail-wm0-f68.google.com) (74.125.82.68) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 29 May 2018 07:51:09 +0000 Received: by mail-wm0-f68.google.com with SMTP id m129-v6so37725108wmb.3 for ; Tue, 29 May 2018 00:51:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=lhCxBOkJqRurUKVXfQkCX7H9QuY4AvV51ZQ+c6CEphs=; b=cZxflwS0iuVN3UAaRZgBad5hykjY5T/VB+M4BC1O/UCZFCM3I6SfCEu5w9Ts8ZXjfR 2ojf0jo53gHkJQFJxka9f5aoAn74gIlMztNo3IedKCWagH5CyotRXtYScTofd0uDPJFh l7NdaO+D6EGrKwrDjjItIqD4MmeU5QKTP0yUqp5oe7E5CnWVoaHtVmOqhW46Kvwy+Nkx WaOVSTlurHreNOc1j+YcAxLbJ7zE4lVbnfZenVjRHGYVCa7nQnycKTlToA2kU+VrNiRi DWSHx9/7lijwUfFxd/CtG+HJCBzjBjR0QW7BR9Co81Iem9T8VrlVlnWPTeor23sjbpht a1vg== X-Gm-Message-State: ALKqPweEHw7GwtNHRT8ARxa/6CrdctRlf1aJNdHhHJozKhS35Z2JDESB YkAcQTbsAonQP3LI8bXhMpOWsFNn X-Google-Smtp-Source: AB8JxZpF57uyNVpr1xQEFlJ1TqWzMMXltjIPwTcekuX/NTsW+pZC7sxTkxVsLHpJJVZnhVfsCzmlOg== X-Received: by 2002:a50:b654:: with SMTP id c20-v6mr18415826ede.190.1527580266982; Tue, 29 May 2018 00:51:06 -0700 (PDT) Received: from xena (ip4da43ad9.direct-adsl.nl. [77.164.58.217]) by smtp.gmail.com with ESMTPSA id v23-v6sm17367054edr.48.2018.05.29.00.51.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 May 2018 00:51:06 -0700 (PDT) Date: Tue, 29 May 2018 09:51:04 +0200 From: Tom de Vries To: gcc-patches@gcc.gnu.org Cc: Rainer Orth , Mike Stump Subject: [testsuite, commited] Use correct proc names in scanasm.exp Message-ID: <20180529075104.GA11081@xena> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-IsSubscribed: yes Hi, Consider stack-usage-1.c, which passes with: ... PASS: gcc.dg/stack-usage-1.c (test for excess errors) PASS: gcc.dg/stack-usage-1.c scan-file foo\t(256|264)\tstatic ... The dg-final directive scan-file is actually not used in the source file, instead it's scan-stack-usage: ... /* { dg-final { scan-stack-usage "foo\t\(256|264\)\tstatic" } } */ ... so we would expect: ... PASS: gcc.dg/stack-usage-1.c (test for excess errors) PASS: gcc.dg/stack-usage-1.c scan-stack-usage foo\t(256|264)\tstatic ... This patch fixes scan-stack-usage, scan-stack-usage-not, scan-ada-spec, scan-ada-spec-not and scan-lto-assembler. Committed as obvious. Thanks, - Tom [testsuite] Use correct proc names in scanasm.exp 2018-05-21 Tom de Vries * lib/scanasm.exp (scan-stack-usage, scan-stack-usage-not) (scan-ada-spec, scan-ada-spec-not, scan-lto-assembler): Use proc name as first argument to dg-scan. --- gcc/testsuite/lib/scanasm.exp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp index 5c574d5..701e1f6 100644 --- a/gcc/testsuite/lib/scanasm.exp +++ b/gcc/testsuite/lib/scanasm.exp @@ -179,7 +179,7 @@ proc scan-stack-usage { args } { set filename [lindex $testcase 0] set output_file "[file rootname [file tail $filename]].su" - dg-scan "scan-file" 1 $testcase $output_file $args + dg-scan "scan-stack-usage" 1 $testcase $output_file $args } # Check that a pattern is not present in the .su file produced by the @@ -191,7 +191,7 @@ proc scan-stack-usage-not { args } { set filename [lindex $testcase 0] set output_file "[file rootname [file tail $filename]].su" - dg-scan "scan-file-not" 0 $testcase $output_file $args + dg-scan "scan-stack-usage-not" 0 $testcase $output_file $args } # Return the filename of the Ada spec corresponding to the argument. @@ -213,7 +213,7 @@ proc scan-ada-spec { args } { set testcase [testname-for-summary] set output_file "[get_ada_spec_filename $testcase]" - dg-scan "scan-file" 1 $testcase $output_file $args + dg-scan "scan-ada-spec" 1 $testcase $output_file $args } # Check that a pattern is not present in the .ads file produced by the @@ -223,7 +223,7 @@ proc scan-ada-spec-not { args } { set testcase [testname-for-summary] set output_file "[get_ada_spec_filename $testcase]" - dg-scan "scan-file-not" 0 $testcase $output_file $args + dg-scan "scan-ada-spec-not" 0 $testcase $output_file $args } # Call pass if pattern is present given number of times, otherwise fail. @@ -541,5 +541,5 @@ proc scan-lto-assembler { args } { set filename [lindex $testcase 0] set output_file "[file rootname [file tail $filename]].exe.ltrans0.s" verbose "output_file: $output_file" - dg-scan "scan-assembler" 1 $testcase $output_file $args + dg-scan "scan-lto-assembler" 1 $testcase $output_file $args }