From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 55603386F0EA for ; Fri, 10 Jun 2022 07:10:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 55603386F0EA Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 9066E1F86B for ; Fri, 10 Jun 2022 07:10:55 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 7E0C2139ED for ; Fri, 10 Jun 2022 07:10:55 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id xAKlHX/uomKsLAAAMHmgww (envelope-from ) for ; Fri, 10 Jun 2022 07:10:55 +0000 Date: Fri, 10 Jun 2022 09:10:54 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH][gdb/testsuite] Skip gdb.fortran/namelist.exp for gfortran 4.8 Message-ID: <20220610071051.GA16173@delia.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, 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: 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: , X-List-Received-Date: Fri, 10 Jun 2022 07:10:57 -0000 Hi, The test-case gdb.fortran/namelist.exp uses a gfortran feature (emitting DW_TAG_namelist in the debug info) that has been supported since gfortran 4.9, see PR gcc/37132. Skip the test for gfortran 4.8 and earlier. Do this using gcc_major_version, and update it to be able to handle "gcc_major_version {gfortran-*} f90". Tested on x86_64-linux, with gfortran 4.8.5, 7.5.0, and 12.1.1. Any comments? Thanks, - Tom [gdb/testsuite] Skip gdb.fortran/namelist.exp for gfortran 4.8 --- gdb/testsuite/gdb.fortran/namelist.exp | 6 +++++- gdb/testsuite/lib/gdb.exp | 10 +++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/gdb.fortran/namelist.exp b/gdb/testsuite/gdb.fortran/namelist.exp index 3917f1b9adb..39cf0e17654 100644 --- a/gdb/testsuite/gdb.fortran/namelist.exp +++ b/gdb/testsuite/gdb.fortran/namelist.exp @@ -37,7 +37,11 @@ set int [fortran_int4] gdb_breakpoint [gdb_get_line_number "Display namelist"] gdb_continue_to_breakpoint "Display namelist" -if { [test_compiler_info {gfortran-*} f90] } { +# DW_TAG_namelist is supported starting gcc 4.9. +set supported [expr \ + [test_compiler_info {gfortran-*} f90] \ + && [gcc_major_version {gfortran-*} f90] >= 4.9] +if { $supported } { gdb_test "ptype nml" \ "type = Type nml\r\n *$int :: a\r\n *$int :: b\r\n *End Type nml" gdb_test "print nml" \ diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index e8214e65a8b..41e1d549510 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -4228,13 +4228,17 @@ proc test_compiler_info { {compiler ""} {language "c"} } { # Return the gcc major version, or -1. # For gcc 4.8.5, the major version is 4.8. # For gcc 7.5.0, the major version 7. +# The COMPILER and LANGUAGE arguments are as for test_compiler_info. -proc gcc_major_version { } { +proc gcc_major_version { {compiler "gcc-*"} {language "c"} } { global decimal - if { ![test_compiler_info "gcc-*"] } { + if { ![test_compiler_info $compiler $language] } { return -1 } - set res [regexp gcc-($decimal)-($decimal)- [test_compiler_info] \ + # Strip "gcc-*" to "gcc". + regsub -- {-.*} $compiler "" compiler + set res [regexp $compiler-($decimal)-($decimal)- \ + [test_compiler_info "" $language] \ dummy_var major minor] if { $res != 1 } { return -1