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: 1770424 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.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=e7PXxFiw; 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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q1Dlq07Jxz1ybC for ; Wed, 19 Apr 2023 05:40:05 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3E6A83856DC6 for ; Tue, 18 Apr 2023 19:40:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3E6A83856DC6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1681846803; 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=e7PXxFiwRK9ch5Wk89a7dN9IUuqLvHmkjp73HRBlSqzVWdGUkf76cTdZIy/PLdjb7 6WgUt8ZOkqD1XHF29bAcvOQt0t9g7RxjPFLh6G3YTduogHPHwUMxiK3eCRCUErh4iZ AjO3R0U8SkdMHbhbbAdP3Y1hvNsfEC3xRFJV1Pw4= 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" 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