From patchwork Thu Apr 18 10:25:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 88658 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CB93E3858C53 for ; Thu, 18 Apr 2024 10:25:48 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 49FBE3858D37 for ; Thu, 18 Apr 2024 10:25:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 49FBE3858D37 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 49FBE3858D37 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713435928; cv=none; b=BgENrO+Ys+if1sYJhawDyryrMNZ9fLXUR/5AwT4SdesU9/OCNnU0KQi/WvJuOfPpuiVvn8mg8gti+WLGzGaRBFamHB8AB4XBIp3j3GWh1JAjd4tetp8U57cE6VJ8dKnVDmqAKV4r3lSGyJs3K8PCp5wbcJDgHtBrNK42oBo/+MA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713435928; c=relaxed/simple; bh=EOHHCfA0kVTSL2VqiFVZaDXZkKjbfdhXgpXqGnO/vTM=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=gApgbkIPPMMrBT7J3bbB8UYsnKKDB+RDrQZ9WpFYVX+loCvj5mWqVSyVtLMi2T0lqdey4MlxFqG/49f/fuBsj+dELRZL0c83jvMegMzfM2GpfpcPJXHXMjju2Xqmr4sGULm/4UlxH7bfX+XUaTQdH+JERlMBT5lKAOAFxxP2Z8c= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (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 smtp-out2.suse.de (Postfix) with ESMTPS id 492005C88D for ; Thu, 18 Apr 2024 10:25:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1713435925; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=qv7gmn4/Q4Fzs/t4R1WjjourgBj1mPqD7RYITU+/548=; b=JpZAkq4YnsMdVI8c4oUbd/9fvWswUeZhynDdXsSjT/OPUIUWy9IavbyhZIri3Hnpk0sBAc i0myjK/VFJ4LPB84ZnBIiYV0Wo6rwUO69E1eTLY1M2HsRVzGmQUOCDkxSje7yxVA18Bxyt RQSDZnOSjsFwa5Shep7NrgZ9bsUEJfE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1713435925; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=qv7gmn4/Q4Fzs/t4R1WjjourgBj1mPqD7RYITU+/548=; b=OZz/al14NVgB59fRjaA8yAyGN0LHfhRtuCf47CSIdqxVkkvC25LmSoFL7Mc/FCGQRONzgU yl5UlfsDkYAuWRDg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=nejw8XNm; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=OdghOuHj DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1713435924; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=qv7gmn4/Q4Fzs/t4R1WjjourgBj1mPqD7RYITU+/548=; b=nejw8XNmmT52/5fxxNKGvTORwHSVemoU07wUW+H6K5x/wdMyizolqLrAc1uXHSMSY1p8/g Wxzyg78BtfHb9cSUrs//nCKYC8JjczNb+QM8NirHqX1v7TrKetKOOPAqXDQ98FaqBGxTkK kK2p4WYx4vMbD265LAEXpQLtO6OZnpk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1713435924; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=qv7gmn4/Q4Fzs/t4R1WjjourgBj1mPqD7RYITU+/548=; b=OdghOuHjPbndM2uBzPRGEyr31BD9ON0KXY0AriwKbNCg6+QnQ/Y4CWpa//EP+uO0WQQPBp GEfY+Fa+9GOGQzAg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (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 imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 339FE13687 for ; Thu, 18 Apr 2024 10:25:24 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 4f1bCxT1IGbuTQAAD6G6ig (envelope-from ) for ; Thu, 18 Apr 2024 10:25:24 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/testsuite] Use find_gnatmake instead of gdb_find_gnatmake Date: Thu, 18 Apr 2024 12:25:44 +0200 Message-Id: <20240418102544.17877-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-4.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; DWL_DNSWL_LOW(-1.00)[suse.de:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; MIME_TRACE(0.00)[0:+]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCPT_COUNT_ONE(0.00)[1]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_TWO(0.00)[2]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; TO_DN_NONE(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim, imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns] X-Rspamd-Action: no action X-Rspamd-Queue-Id: 492005C88D X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Score: -4.01 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP 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.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org On SLE-11, with an older dejagnu version, I ran into: ... Running gdb.ada/mi_prot.exp ... UNRESOLVED: gdb.ada/mi_prot.exp: \ testcase aborted due to invalid command name: gdb_find_gnatmake ERROR: tcl error sourcing gdb.ada/mi_prot.exp. ERROR: invalid command name "gdb_find_gnatmake" while executing "::gdb_tcl_unknown gdb_find_gnatmake" ("uplevel" body line 1) invoked from within "uplevel 1 ::gdb_tcl_unknown $args" (procedure "::unknown" line 5) invoked from within "gdb_find_gnatmake" (procedure "gnatmake_version_at_least" line 2) invoked from within ... Proc gdb_find_gnatmake is actually a backup for find_gnatmake: ... if {[info procs find_gnatmake] == ""} { rename gdb_find_gnatmake find_gnatmake ... so gnatmake_version_at_least should use find_gnatmake instead. For a recent dejagnu with find_gnatmake, gdb_find_gnatmake is kept, and we don't run into this error. For an older dejagnu without find_gnatmake, gdb_find_gnatmake is renamed to find_gnatmake, and we do run into the error. It's confusing that we're using the gdb_ prefix for gdb_find_gnatmake, it seems something legitimate to use. Maybe we should use future_ or gdb_future_ prefix instead to make this more clear, but I've left that alone for now. Fix this by: - triggering the same error with a recent dejagnu by removing gdb_find_gnatmake unless used (and likewise for other procs in future.exp), and - using find_gnatmake in gnatmake_version_at_least. Tested on x86_64-linux. PR testsuite/31647 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31647 --- gdb/testsuite/lib/ada.exp | 2 +- gdb/testsuite/lib/future.exp | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) base-commit: ebf18671351d94185823d364b75369abc1baba31 diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp index 558e73f3232..1bc0dc1d438 100644 --- a/gdb/testsuite/lib/ada.exp +++ b/gdb/testsuite/lib/ada.exp @@ -151,7 +151,7 @@ proc find_ada_tool {tool} { # Return 1 if gnatmake is at least version $MAJOR.x.x proc gnatmake_version_at_least { major } { - set gnatmake [gdb_find_gnatmake] + set gnatmake [find_gnatmake] set gnatmake [lindex [split $gnatmake] 0] if {[catch {exec $gnatmake --version} output]} { return 0 diff --git a/gdb/testsuite/lib/future.exp b/gdb/testsuite/lib/future.exp index 3512fadf2ed..62913cb0855 100644 --- a/gdb/testsuite/lib/future.exp +++ b/gdb/testsuite/lib/future.exp @@ -694,12 +694,16 @@ if {[info procs find_gnatmake] == ""} { rename gdb_find_gnatmake find_gnatmake set use_gdb_compile(ada) 1 gdb_note [join [list $note_prefix "Ada" $note_suffix] ""] +} else { + rename gdb_find_gnatmake "" } if {[info procs find_gfortran] == ""} { rename gdb_find_gfortran find_gfortran set use_gdb_compile(fortran) 1 gdb_note [join [list $note_prefix "Fortran" $note_suffix] ""] +} else { + rename gdb_find_gfortran "" } if {[info procs find_go_linker] == ""} { @@ -707,24 +711,33 @@ if {[info procs find_go_linker] == ""} { rename gdb_find_go_linker find_go_linker set use_gdb_compile(go) 1 gdb_note [join [list $note_prefix "Go" $note_suffix] ""] +} else { + rename gdb_find_go "" + rename gdb_find_go_linker "" } if {[info procs find_gdc] == ""} { rename gdb_find_gdc find_gdc set use_gdb_compile(d) 1 gdb_note [join [list $note_prefix "D" $note_suffix] ""] +} else { + rename gdb_find_gdc "" } if {[info procs find_rustc] == ""} { rename gdb_find_rustc find_rustc set use_gdb_compile(rust) 1 gdb_note [join [list $note_prefix "Rust" $note_suffix] ""] +} else { + rename gdb_find_rustc "" } if {[info procs find_hipcc] == ""} { rename gdb_find_hipcc find_hipcc set use_gdb_compile(hip) 1 gdb_note [join [list $note_prefix "HIP" $note_suffix] ""] +} else { + rename gdb_find_hipcc "" } # If dejagnu's default_target_compile is missing support for any language, @@ -732,6 +745,8 @@ if {[info procs find_hipcc] == ""} { if { [array size use_gdb_compile] != 0 } { catch {rename default_target_compile dejagnu_default_target_compile} rename gdb_default_target_compile default_target_compile +} else { + rename gdb_default_target_compile "" }