From patchwork Tue Apr 18 19:39:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 85061 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp3084472vqo; Tue, 18 Apr 2023 12:40:36 -0700 (PDT) X-Google-Smtp-Source: AKy350ZOLGpzc5iqyAh4TznFQ7UKa0LyPRVeM5MUNSDewsHWz2Z/9WexS6vzP+lMsj+8DV0XEtuw X-Received: by 2002:a17:906:4b1a:b0:94f:3f22:2d37 with SMTP id y26-20020a1709064b1a00b0094f3f222d37mr9609672eju.55.1681846835683; Tue, 18 Apr 2023 12:40:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681846835; cv=none; d=google.com; s=arc-20160816; b=SD2sDr06PE/DoHi47VITcAwAQX2AYH3idmXGicjAbyjGgGi+ly0rFKQSwZYSoaiiPw XdhUTKkKl491UgmYQ2BwGASkE/Vn8FvxdfeNsXcA7jELnfap4RI8rt2jnIw1X45C/c5S 0ZmgjpF8lLfK3O+iist6ynzcpUCVkDJ91wU98w3kob5PvLu4H3hH1/gBE5jkgFi14toA kLkk8pGcUyYbw1hwsXZQwwCBb9ygxZe0c4AlXM2VVe5vvHb+M7ITuPFWStjTASNZIPDo Oz0t1TTH+gtIKY886KCSWBwsDXOgC4TOjcZpYChYsDEpxh8pgAkeWzf5YBO3qBiGKYut /HNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:ui-outboundreport :sensitivity:importance:date:subject:to:message-id:mime-version :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=9IBn48K0BdmGD+oBN1EWVMUswpWGk4rMVN+y4eM+FoI=; b=jEcVsASTRILaE3vp95RuyT9WzxGyAeN1ErDfTM1s0e7gi5Uqw8aSMpLfjoKzB6F/41 Fll68vGDTssLtrwfXmd2Cjr9LDXLNB3YmcldBfQdl/FpxAFDsONcBIcVcyMy57QhBcRX 9NAFR/Mz+/LASzYmmmqEgMxTT628/8LI2wtXUXBpGfLeUD+7S1BqxNKxH4CNVC7ALytM +HGT9aTa5fFOgy/n0Ex6kdKkdNcEOBcLDaEMchcoBS6/ZffcTG30Cq2DLSI4WQrhXxC5 TREGB2WoMmbGDLXKIgIMmxUwAiI2ie809LfG0iCynISR5xE3BgJJd57G7HbNvWtoz+iI zTrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="j/FzeJqw"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id fn11-20020a1709069d0b00b0094ed2906fb9si6104599ejc.610.2023.04.18.12.40.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 12:40:35 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="j/FzeJqw"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B3F8E385735C for ; Tue, 18 Apr 2023 19:40:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B3F8E385735C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1681846827; bh=9IBn48K0BdmGD+oBN1EWVMUswpWGk4rMVN+y4eM+FoI=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=j/FzeJqwHuiNpXnbrQe0zo7wsEzkDvXW8HfG1kC760yl5TfbGjEVva8hyviG4ixRk +hxOHuM8PmT2Kd3hs/UGiVOiclYpLPrECkj3aP/dx9ZHkdGypoH/6Ix9V8+RB1LPRw O5UjfeeN9MUwojJAhgqiK3qdFlDIBcJBD7orAe2s= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by sourceware.org (Postfix) with ESMTPS id 9B82D3858D28; Tue, 18 Apr 2023 19:39:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9B82D3858D28 X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [79.251.14.188] ([79.251.14.188]) by web-mail.gmx.net (3c-app-gmx-bs56.server.lan [172.19.170.140]) (via HTTP); Tue, 18 Apr 2023 21:39:42 +0200 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] testsuite: fix scan-tree-dump patterns [PR83904,PR100297] Date: Tue, 18 Apr 2023 21:39:42 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:tWMje6Gx4kdpHDgREN4bvfsGbGqc2HT/jBkGE18Yx/RGV5rJxYwybr7l2Se+dzbZ0ZYQ8 77mKcRdIRUDFym5RPAiSv0Bz9pJOBRvQ5nTLC8dELoaLsGwtj7iQdOF/woejlV+SAujKuxuT8D5U 4cyy4PyihyDiQhf9QRMHQmAfX0OAWS6wkhEA+bsAekAMFBFBBkVWUMi53sDqXDOHNIF0+XH6L3NO y/iHFeZ35kxMUdZw3XE6DjfFaBvhJMlDCqmtl/LsISiC9aakGC0bwQO0Baxqzgg5cT8AImHDv0jy hs= UI-OutboundReport: notjunk:1;M01:P0:Dr+2bnNWvPc=;uHZMLbhaTpDxsx+R9lI8YrCJPpZ QKUQj97MnV7mSYjcva0I9OK2hUSgSnixTtoAvS1ChAFa1ajA6ZKjdwkjbLYrNHLvxrFHU0Rpp On/3YS8XMW73HVrSrpICcbi3al6sgl01ThLAFf0f6SblUZ1UquuI2zQYxKdmyCGXnYqTvX8mO 3HTQ5HxqTsZ52mRUOYQiS/v1Df5Xx3zoSwvZNNJRA2H4HexK1yJV8OklHfkkjZNElU39ofVFj CR3jfXmtif29sJS6ljHDSkmMwC9bBMTP8/d43AHzj+zSdj2ZCiRAMNzgMtN9VeSQ+9COEYTzC 4zSJMWYkEXIrvWo8x3TxA0OusF/5vxnLDxp0a2NTD6dxsFj47dtAlDgwA6iy7VixIOzni6f0r U+c4QSiR5u/qAEAnFW8cE4VW8b5uecyNyx25IY1gsZgSzDioRU2e1nZneX/AYQvdkDtknWHtQ REzp3IrzvqEH1r5PWqSUFrCxgjEbnvqQMFbhycdEVQlLrRH+Pz1Ueb4bg396m7Hh4k43g7i7W 6k9M4Ku0a5ZtlVjn9Idv0twWIWdYP8G8Fu/ZVPsly18gR/DyYTaLqbDcfwA8O1+dQTHXX1/+S qD3OwCL08kAxT/lLdha2XzUdMXRsSvqx9O00YQG10e8vfHbULOv6pKGw8xeFJuYlqLEGk6rUO uiIp4Wq3tsQPi6Xbzng3V+MFW8VP6gs9VF7LWnukZdI+1Z6jQvNh60CmcEzuZGbK5V4INI1KY cIy1cRCPIZTlRRTWlkwfdT3ZY3DLGzDpyggwdq6NaZyojeQTkJFExpnH+4cu6Y7ZJnhu3vNqg NPOYIG4qV8614U765gl9Te2A== X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Harald Anlauf via Gcc-patches From: Harald Anlauf Reply-To: Harald Anlauf Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763544227149433218?= X-GMAIL-MSGID: =?utf-8?q?1763544227149433218?= Dear all, the attached patch adjusts the scan-tree-dump patterns of the reported testcases which likely were run in a location such that a path in an error message showing in the tree-dump might have accidentally matched "free" or "data", respectively. For the testcase gfortran.dg/reshape_8.f90 I checked with a failing gfortran-11 that the pattern is appropriate. OK for mainline? Thanks, Harald From ad7ea82929f65ef34a13dea5a0fe23d567f220e8 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Tue, 18 Apr 2023 21:24:20 +0200 Subject: [PATCH] testsuite: fix scan-tree-dump patterns [PR83904,PR100297] Adjust scan-tree-dump patterns so that they do not accidentally match a valid path. gcc/testsuite/ChangeLog: PR testsuite/83904 PR fortran/100297 * gfortran.dg/allocatable_function_1.f90: Use "__builtin_free " instead of the naive "free". * gfortran.dg/reshape_8.f90: Extend pattern from a simple "data". --- gcc/testsuite/gfortran.dg/allocatable_function_1.f90 | 2 +- gcc/testsuite/gfortran.dg/reshape_8.f90 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/gfortran.dg/allocatable_function_1.f90 b/gcc/testsuite/gfortran.dg/allocatable_function_1.f90 index f96ebc499e8..e38953bd777 100644 --- a/gcc/testsuite/gfortran.dg/allocatable_function_1.f90 +++ b/gcc/testsuite/gfortran.dg/allocatable_function_1.f90 @@ -107,4 +107,4 @@ contains end function bar end program alloc_fun -! { dg-final { scan-tree-dump-times "free" 10 "original" } } +! { dg-final { scan-tree-dump-times "__builtin_free " 10 "original" } } diff --git a/gcc/testsuite/gfortran.dg/reshape_8.f90 b/gcc/testsuite/gfortran.dg/reshape_8.f90 index 01799ac5c19..56812124cb8 100644 --- a/gcc/testsuite/gfortran.dg/reshape_8.f90 +++ b/gcc/testsuite/gfortran.dg/reshape_8.f90 @@ -11,4 +11,4 @@ program test a = reshape([1,2,3,4], [2,0]) print *, a end -! { dg-final { scan-tree-dump-times "data" 4 "original" } } +! { dg-final { scan-tree-dump-not "data..0. =" "original" } } -- 2.35.3