From patchwork Fri Apr 16 11:03:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Earnshaw X-Patchwork-Id: 1467005 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=Yhj3lcom; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FMCzf0Lnrz9sW4 for ; Fri, 16 Apr 2021 21:05:16 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D8B083892024; Fri, 16 Apr 2021 11:05:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D8B083892024 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1618571113; bh=0PdU430/4gh4AS7qGGWxBBuBDLpiu2kc+C4lkzy7ATI=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=Yhj3lcomRc3rs3p9VlovEqvh9flg+LxiWCcKAWRdFK23n4510HGNLtGnV7uCz3+Sp dvwcTwsvTbeL5Zh245fJXDHQsgr2Kic5Pppb2XuE9uUUXi/13xxts3acd4Hm5DmGMD fcs5K1U9jYaFSIOJEU4edrjRU1b7Nbo5HROF5LKA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by sourceware.org (Postfix) with ESMTP id 5CD4E3890435 for ; Fri, 16 Apr 2021 11:05:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5CD4E3890435 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0206A106F for ; Fri, 16 Apr 2021 04:05:11 -0700 (PDT) Received: from e126323.arm.com (unknown [10.57.1.4]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 767953F85F; Fri, 16 Apr 2021 04:05:10 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] arm: Fix some testsuite fallout from r11-8168 [PR100067] Date: Fri, 16 Apr 2021 12:03:49 +0100 Message-Id: <20210416110349.4010171-1-rearnsha@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-14.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Earnshaw via Gcc-patches From: Richard Earnshaw Reply-To: Richard Earnshaw Cc: Richard Earnshaw Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Commit r11-8168 changed the word ordering of a warning in order to make the text more consistent. Unfortunately, it neglected to update some filters in the testsuite that are intended to strip such warnings when we try to partially override the user-supplied command-line options. This patch rectifies this and also fixes some patterns that were incorrectly specified in the first place. gcc/testsuite: PR target/100067 * g++.target/arm/arm.exp (dg_runtest_extra_prunes): Update prune template. * gcc.target/arm/arm.exp (dg_runtest_extra_prunes): Likewise. * g++.target/arm/mve.exp (dg_runtest_extra_prunes): Likewise. Fix missing quotes around switch names. * gcc.target/arm/mve/mve.exp: (dg_runtest_extra_prunes): Likewise. --- gcc/testsuite/g++.target/arm/arm.exp | 2 +- gcc/testsuite/g++.target/arm/mve.exp | 2 +- gcc/testsuite/gcc.target/arm/arm.exp | 2 +- gcc/testsuite/gcc.target/arm/mve/mve.exp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/g++.target/arm/arm.exp b/gcc/testsuite/g++.target/arm/arm.exp index 182c1e9c964..7d873a4c89c 100644 --- a/gcc/testsuite/g++.target/arm/arm.exp +++ b/gcc/testsuite/g++.target/arm/arm.exp @@ -35,7 +35,7 @@ if ![info exists DEFAULT_CXXFLAGS] then { global dg_runtest_extra_prunes set dg_runtest_extra_prunes "" -lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' conflicts with '-m(cpu|arch)=.*' switch" +lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' conflicts with switch '-m(cpu|arch)=.*'" # Initialize `dg'. dg-init diff --git a/gcc/testsuite/g++.target/arm/mve.exp b/gcc/testsuite/g++.target/arm/mve.exp index 82cf928b73c..ed62561d972 100644 --- a/gcc/testsuite/g++.target/arm/mve.exp +++ b/gcc/testsuite/g++.target/arm/mve.exp @@ -33,7 +33,7 @@ if ![info exists DEFAULT_CXXFLAGS] then { # This variable should only apply to tests called in this exp file. global dg_runtest_extra_prunes set dg_runtest_extra_prunes "" -lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch" +lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' conflicts with switch '-m(cpu|arch)=.*'" set save-dg-do-what-default ${dg-do-what-default} set dg-do-what-default "assemble" diff --git a/gcc/testsuite/gcc.target/arm/arm.exp b/gcc/testsuite/gcc.target/arm/arm.exp index d306573305a..4d7c2adbe85 100644 --- a/gcc/testsuite/gcc.target/arm/arm.exp +++ b/gcc/testsuite/gcc.target/arm/arm.exp @@ -33,7 +33,7 @@ if ![info exists DEFAULT_CFLAGS] then { # This variable should only apply to tests called in this exp file. global dg_runtest_extra_prunes set dg_runtest_extra_prunes "" -lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' conflicts with '-m(cpu|arch)=.*' switch" +lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' conflicts with switch '-m(cpu|arch)=.*'" # Initialize `dg'. dg-init diff --git a/gcc/testsuite/gcc.target/arm/mve/mve.exp b/gcc/testsuite/gcc.target/arm/mve/mve.exp index f8590bfed0d..d09fc277612 100644 --- a/gcc/testsuite/gcc.target/arm/mve/mve.exp +++ b/gcc/testsuite/gcc.target/arm/mve/mve.exp @@ -33,7 +33,7 @@ if ![info exists DEFAULT_CFLAGS] then { # This variable should only apply to tests called in this exp file. global dg_runtest_extra_prunes set dg_runtest_extra_prunes "" -lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch" +lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' conflicts with switch '-m(cpu|arch)=.*'" set dg-do-what-default "assemble"