From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 2ACVCBN2w2BwbQAAWB0awg (envelope-from ) for ; Fri, 11 Jun 2021 10:41:23 -0400 Received: by simark.ca (Postfix, from userid 112) id 13B541F163; Fri, 11 Jun 2021 10:41:23 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id E1C691E813 for ; Fri, 11 Jun 2021 10:41:21 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 49CF73954430 for ; Fri, 11 Jun 2021 14:41:21 +0000 (GMT) Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by sourceware.org (Postfix) with ESMTPS id CD2903836019 for ; Fri, 11 Jun 2021 14:41:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CD2903836019 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wm1-x330.google.com with SMTP id f16-20020a05600c1550b02901b00c1be4abso8805922wmg.2 for ; Fri, 11 Jun 2021 07:41:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=R8jJ8hnJU/2xP2Vi9sDBAcNmd4FSz2VX1aIQukXNP+A=; b=Dltp+Lv7XHA6BJFHJHiIoX1/Pd11sLp9TZpWtqlAedC09AX6XtxNf7S8tstE5feEl5 90Et7q+hhNd4gHtRSd1qJTO6pgf+v8ESl/AgO4/cAAwnyZV2LAJz9IjAif0kr+tVTdgj EH9DkxCHqozFlOeSmkHUwXoRTBenlclvgRI3jUlH2tWS7rtcOpZRPo9ISjf1rDjQwytl arg8FWOr418wiimtNifoJ04sou3n3C/YvnD5cs9q5BgAzcGMhtaiLf+M6jUTlnF4xpE9 LnLkCqByivd5jhd1bPQ1Zhbu6pYafJutiIszHMH/zbT+ngoMIq6jTy1K1pjgcFAEKg4N gxJg== 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:references :mime-version:content-disposition:in-reply-to; bh=R8jJ8hnJU/2xP2Vi9sDBAcNmd4FSz2VX1aIQukXNP+A=; b=VzaYM+MovAb5thr0dC1dbyG+R57gAHKMfBYbAtPXI0G3xXxV7LnIvGccx4quuj9hgh ImbFeNELvCQfONvUQolwA39/7+gg9KdxmDjWkUYQLBF0uEIBj5yetVAGnPElg9BBGrxm CswK5MaoPcjjLYAuAjP5w4dru35aTH0+FJdlne63pQtE2Z1RsaJSjYORu4FV5WM0syoW XEUcGiCjzw5+hjTVqie3L5fShmIuR2kcaHJ4BBy6KR+liK3X8llSGF9kdrrk9xFarOBw PPNWY3d4Lc6dvOM8HprhUV0hOXJ62jmT68wRAyLiVOpZ7J05dH84AST1mZFrFyaZ47CX 51CA== X-Gm-Message-State: AOAM531by+echHyUFmLTyGxxhhfT/FlQnNfuDQq6eYBqTppLA22XszFC 40GmIXD9hM3ZjiDdcn3wdYbstw== X-Google-Smtp-Source: ABdhPJxUlJ+a5IKcA7xqiifMyy7wASfAx2zviSTNkdihxIHABwQoOb9Kf0X5X3jNcoNnUnMuagl2rA== X-Received: by 2002:a1c:a382:: with SMTP id m124mr4252241wme.40.1623422466895; Fri, 11 Jun 2021 07:41:06 -0700 (PDT) Received: from localhost (host109-151-46-70.range109-151.btcentralplus.com. [109.151.46.70]) by smtp.gmail.com with ESMTPSA id r7sm16529628wma.9.2021.06.11.07.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 07:41:06 -0700 (PDT) Date: Fri, 11 Jun 2021 15:41:05 +0100 From: Andrew Burgess To: "Willgerodt, Felix" Subject: Re: [PING**3] [PATCH] gdb, testsuite: Fix mi-var-child-f.exp for Intel compilers. Message-ID: <20210611144105.GW2672@embecosm.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Operating-System: Linux/5.8.18-100.fc31.x86_64 (x86_64) X-Uptime: 15:38:43 up 23 days, 4:22, X-Editor: GNU Emacs [ http://www.gnu.org/software/emacs ] X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "gdb-patches@sourceware.org" Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" > > GDB however uses DW_AT_name mostly in its output, which fails the regex. > To fix this testcase immediately, I modernized array.f and gave it a named main. There was no specific reason it was unnamed anyway. Fixing the testsuite properly is not straightforward. fortran_main and test_compiler_info would need some changes, which has broader influences. > I might look at this later down the road. You should try to keep lines < 80 characters in the commit message. Otherwise, LGTM. Thanks, Andrew > > gdb/testsuite/ChangeLog: > 2021-05-06 Felix Willgerodt > > * gdb.mi/array.f: Convert into... > * gdb.mi/array.f90: ...this. > * gdb.mi/mi-var-child-f.exp: Use array.f90. > --- > gdb/testsuite/gdb.mi/array.f | 20 -------------------- > gdb/testsuite/gdb.mi/array.f90 | 21 +++++++++++++++++++++ > gdb/testsuite/gdb.mi/mi-var-child-f.exp | 4 ++-- > 3 files changed, 23 insertions(+), 22 deletions(-) delete mode 100644 gdb/testsuite/gdb.mi/array.f create mode 100644 gdb/testsuite/gdb.mi/array.f90 > > diff --git a/gdb/testsuite/gdb.mi/array.f b/gdb/testsuite/gdb.mi/array.f deleted file mode 100644 index 2d31ecae984..00000000000 > --- a/gdb/testsuite/gdb.mi/array.f > +++ /dev/null > @@ -1,20 +0,0 @@ > -c Copyright 2006-2021 Free Software Foundation, Inc. > - > -c This program is free software; you can redistribute it and/or modify -c it under the terms of the GNU General Public License as published by -c the Free Software Foundation; either version 3 of the License, or -c (at your option) any later version. > -c > -c This program is distributed in the hope that it will be useful, -c but WITHOUT ANY WARRANTY; without even the implied warranty of -c MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -c GNU General Public License for more details. > -c > -c You should have received a copy of the GNU General Public License -c along with this program. If not, see . > - > - INTEGER array(1:2,-1:1) > - DATA array/11,21,12,22,13,23/ > - CONTINUE > - STOP > - END > diff --git a/gdb/testsuite/gdb.mi/array.f90 b/gdb/testsuite/gdb.mi/array.f90 new file mode 100644 index 00000000000..b414b27e026 > --- /dev/null > +++ b/gdb/testsuite/gdb.mi/array.f90 > @@ -0,0 +1,21 @@ > +! Copyright 2006-2021 Free Software Foundation, Inc. > + > +! This program is free software; you can redistribute it and/or modify > +! it under the terms of the GNU General Public License as published by > +! the Free Software Foundation; either version 3 of the License, or ! > +(at your option) any later version. > +! > +! This program is distributed in the hope that it will be useful, ! but > +WITHOUT ANY WARRANTY; without even the implied warranty of ! > +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! GNU > +General Public License for more details. > +! > +! You should have received a copy of the GNU General Public License ! > +along with this program. If not, see . > + > +program prog_array > + INTEGER array (1:2,-1:1) > + DATA array/11,21,12,22,13,23/ > + CONTINUE > + STOP > +end program prog_array > diff --git a/gdb/testsuite/gdb.mi/mi-var-child-f.exp b/gdb/testsuite/gdb.mi/mi-var-child-f.exp > index 272505a4d69..f35c0cdd6d3 100644 > --- a/gdb/testsuite/gdb.mi/mi-var-child-f.exp > +++ b/gdb/testsuite/gdb.mi/mi-var-child-f.exp > @@ -26,7 +26,7 @@ if [mi_gdb_start] { > continue > } > > -standard_testfile array.f > +standard_testfile array.f90 > > if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ > executable {debug f90}] != ""} { > @@ -36,7 +36,7 @@ if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ mi_gdb_reinitialize_dir $srcdir/$subdir mi_gdb_load ${binfile} > > -mi_runto [fortran_main] > +mi_runto prog_array > > mi_create_varobj "array" "array" "create local variable array" > > -- > 2.25.4 > > Intel Deutschland GmbH > Registered Address: Am Campeon 10, 85579 Neubiberg, Germany > Tel: +49 89 99 8853-0, www.intel.de > Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva > Chairperson of the Supervisory Board: Nicole Lau > Registered Office: Munich > Commercial Register: Amtsgericht Muenchen HRB 186928