From patchwork Sat Apr 15 15:13:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 67784 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 48B473853545 for ; Sat, 15 Apr 2023 15:14:17 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from progateway7-pub.mail.pro1.eigbox.com (gproxy5-pub.mail.unifiedlayer.com [67.222.38.55]) by sourceware.org (Postfix) with ESMTPS id 4B062385773F for ; Sat, 15 Apr 2023 15:13:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4B062385773F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw15.mail.unifiedlayer.com (unknown [10.0.90.130]) by progateway7.mail.pro1.eigbox.com (Postfix) with ESMTP id D536E10048486 for ; Sat, 15 Apr 2023 15:13:43 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id nhaxpjbAORLHZnhaxpKbmH; Sat, 15 Apr 2023 15:13:43 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=IqHbzJzg c=1 sm=1 tr=0 ts=643abf27 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=dKHAf1wccvYA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=YUs3E4n6YAQTRT3zijQA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=ZPaKPXiBNuF1wIOiGIGkZxG+stiKKE6iV/E1bohKa7M=; b=ZWZ5v/cgafCc6Y26rTSCH/li93 ZChHjKJ5NMlzJ5xcO2CeOsehtbConh5gYb4hG8TVc7P7I3m8z7pt0QnfKpEzhfv6skFV6kuWxrB05 XWXkQyTUF+X3NbbTgT+iZ6blT; Received: from 71-211-191-82.hlrn.qwest.net ([71.211.191.82]:43720 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pnhax-0021Ms-Ia; Sat, 15 Apr 2023 09:13:43 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFC 1/5] Bug fix in prepare_for_testing Date: Sat, 15 Apr 2023 09:13:32 -0600 Message-Id: <20230415151336.4104455-2-tom@tromey.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230415151336.4104455-1-tom@tromey.com> References: <20230415151336.4104455-1-tom@tromey.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 71.211.191.82 X-Source-L: No X-Exim-ID: 1pnhax-0021Ms-Ia X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-191-82.hlrn.qwest.net (localhost.localdomain) [71.211.191.82]:43720 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3025.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, 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.29 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 Sender: "Gdb-patches" prepare_for_testing should return the result of clean_restart, but it currently does not. This patch fixes the oversight. --- gdb/testsuite/lib/gdb.exp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 9ea0334759d..a1808c699e9 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -7677,8 +7677,7 @@ proc prepare_for_testing_full {testname args} { } set executable [lindex $spec 0] } - clean_restart $executable - return 0 + return [clean_restart $executable] } # Prepares for testing, by calling build_executable, and then clean_restart. @@ -7688,9 +7687,7 @@ proc prepare_for_testing { testname executable {sources ""} {options {debug}}} { if {[build_executable $testname $executable $sources $options] == -1} { return -1 } - clean_restart $executable - - return 0 + return [clean_restart $executable] } # Retrieve the value of EXP in the inferior, represented in format From patchwork Sat Apr 15 15:13:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 67782 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 E9FDC385609B for ; Sat, 15 Apr 2023 15:14:00 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from outbound-ss-761.bluehost.com (outbound-ss-761.bluehost.com [74.220.211.250]) by sourceware.org (Postfix) with ESMTPS id F0CF2385842E for ; Sat, 15 Apr 2023 15:13:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F0CF2385842E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw10.mail.unifiedlayer.com (unknown [10.0.90.125]) by progateway8.mail.pro1.eigbox.com (Postfix) with ESMTP id 1467D10043B5D for ; Sat, 15 Apr 2023 15:13:44 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id nhaxp2OYoP6cJnhaxpz1KM; Sat, 15 Apr 2023 15:13:44 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=V8u4bcri c=1 sm=1 tr=0 ts=643abf28 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=dKHAf1wccvYA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=3Qhz7xS8dOisEvQthyUA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=avmNi53Umt6uDJdykK7uJPPYj400Q4zRbRV0pVdVDdQ=; b=JxgZ+8XCaiphbLqKLe4i8teUx7 ZgvfoUgpd0mZAHnCQToYBrFNZ6JkfDzhCSUH2BbG/Iy/kDbIYYPuvt5WK6RbNvVq1t33cFFiLaRhW 3iM7HTi7XDzV+1KR7zVuDQR7M; Received: from 71-211-191-82.hlrn.qwest.net ([71.211.191.82]:43720 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pnhax-0021Ms-OG; Sat, 15 Apr 2023 09:13:43 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFC 2/5] Introduce the "critical" testsuite command Date: Sat, 15 Apr 2023 09:13:33 -0600 Message-Id: <20230415151336.4104455-3-tom@tromey.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230415151336.4104455-1-tom@tromey.com> References: <20230415151336.4104455-1-tom@tromey.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 71.211.191.82 X-Source-L: No X-Exim-ID: 1pnhax-0021Ms-OG X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-191-82.hlrn.qwest.net (localhost.localdomain) [71.211.191.82]:43720 X-Source-Auth: tom+tromey.com X-Email-Count: 3 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3025.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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.29 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 Sender: "Gdb-patches" This patch introduces a new "critical" command for the test suite. Unlike require, "critical" can handle multiple arguments and a variety of return value conventions. It is implemented as a Tcl namespace ensemble for this reason. This version of the patch provides a few such subcommands. Currently these are all implemented via a helper proc, but there's no requirement that this always be true. --- gdb/testsuite/lib/gdb.exp | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index a1808c699e9..0ae40bceba2 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -9287,6 +9287,34 @@ proc require { args } { } } +# +# The "critical" command is used to invoke some code that must +# succeed. If the code in question fails, "unsupported" is logged and +# the command's caller will return. +# +# This is implemented as an ensemble namespace so that individual +# sub-commands can handle varying return values correctly. +# +namespace eval critical { + proc _make_wrapper {name bad_result} { + proc $name {args} [format { + set result [uplevel [list %s {*}$args]] + if {$result == %s} { + unsupported "error adding gdb index" + return -code return 0 + } + } $name $bad_result] + namespace export $name + } + + _make_wrapper ensure_gdb_index -1 + _make_wrapper prepare_for_testing_full -1 + _make_wrapper prepare_for_testing -1 + _make_wrapper runto 0 + + namespace ensemble create +} + # Wait up to ::TIMEOUT seconds for file PATH to exist on the target system. # Return 1 if it does exist, 0 otherwise. From patchwork Sat Apr 15 15:13:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 67783 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 05BFB3856DE2 for ; Sat, 15 Apr 2023 15:14:09 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from outbound-ss-820.bluehost.com (outbound-ss-820.bluehost.com [69.89.24.241]) by sourceware.org (Postfix) with ESMTPS id 047903858439 for ; Sat, 15 Apr 2023 15:13:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 047903858439 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw11.mail.unifiedlayer.com (unknown [10.0.90.126]) by progateway2.mail.pro1.eigbox.com (Postfix) with ESMTP id 4105E10047FA3 for ; Sat, 15 Apr 2023 15:13:44 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id nhayp3Ggib9i8nhaypAQgC; Sat, 15 Apr 2023 15:13:44 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=Wd7J12tX c=1 sm=1 tr=0 ts=643abf28 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=dKHAf1wccvYA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=iwCwxDv_wYLa6ffIqj8A:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=GD82DljCI9OHgnmc897vIPdr4H0PVf0P6u6Ba94lOo4=; b=FBkEKkFdeV7F3Ws+HAsibWEpFd /BffAx49EGdLdISq7FhIAzK7O5osc9Rmgcthlk44FcMcTiVzCAlDx/xVs0wUf1bIEGB/UZq46o9H5 gY0kdpQMv8nYAvfGnLFztz9DM; Received: from 71-211-191-82.hlrn.qwest.net ([71.211.191.82]:43720 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pnhax-0021Ms-UO; Sat, 15 Apr 2023 09:13:43 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFC 3/5] Use "critical ensure_gdb_index" in gdb.rust Date: Sat, 15 Apr 2023 09:13:34 -0600 Message-Id: <20230415151336.4104455-4-tom@tromey.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230415151336.4104455-1-tom@tromey.com> References: <20230415151336.4104455-1-tom@tromey.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 71.211.191.82 X-Source-L: No X-Exim-ID: 1pnhax-0021Ms-UO X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-191-82.hlrn.qwest.net (localhost.localdomain) [71.211.191.82]:43720 X-Source-Auth: tom+tromey.com X-Email-Count: 4 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3025.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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.29 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 Sender: "Gdb-patches" This converts gdb.rust to use "critical ensure_gdb_index" rather than "if". --- gdb/testsuite/gdb.base/with-mf.exp | 5 +---- gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp | 10 ++-------- gdb/testsuite/gdb.dwarf2/gdb-add-index.exp | 5 +---- gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp | 5 +---- gdb/testsuite/gdb.rust/dwindex.exp | 5 +---- 5 files changed, 6 insertions(+), 24 deletions(-) diff --git a/gdb/testsuite/gdb.base/with-mf.exp b/gdb/testsuite/gdb.base/with-mf.exp index f26d48e1026..5ae4234056f 100644 --- a/gdb/testsuite/gdb.base/with-mf.exp +++ b/gdb/testsuite/gdb.base/with-mf.exp @@ -24,10 +24,7 @@ if {[prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" \ return -1 } -if { [ensure_gdb_index $binfile] == -1 } { - untested "error adding gdb index" - return -1 -} +critical ensure_gdb_index $binfile clean_restart $binfile diff --git a/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp b/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp index d6f96ab9f5b..0654249e302 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp @@ -30,10 +30,7 @@ with_test_prefix non-symlink { return -1 } - if { [ensure_gdb_index $binfile] == -1 } { - untested "error adding gdb index" - return -1 - } + critical ensure_gdb_index $binfile } # Regenerate exec without index. @@ -48,10 +45,7 @@ if { ![file exists $symlink] } { file link -symbolic $symlink $binfile } -if { [ensure_gdb_index $symlink] == -1 } { - fail "Unable to call gdb-add-index with a symlink to a symfile" - return -1 -} +critical ensure_gdb_index $symlink # Ok, we have a copy of $binfile with an index. # Restart gdb and verify the index was used. diff --git a/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp b/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp index 4ecf4408c38..849680314da 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp @@ -25,10 +25,7 @@ if { [prepare_for_testing "failed to prepare" "${testfile}" \ return -1 } -if { [ensure_gdb_index $binfile] == -1 } { - untested "error adding gdb index" - return -1 -} +critical ensure_gdb_index $binfile # Ok, we have a copy of $binfile with an index. # Restart gdb and verify the index was used. diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp b/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp index dea3f3fe461..1227a66f643 100644 --- a/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp +++ b/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp @@ -72,10 +72,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} \ return -1 } -if { [ensure_gdb_index $binfile] == -1 } { - untested "error adding gdb index" - return -1 -} +critical ensure_gdb_index $binfile clean_restart ${binfile} diff --git a/gdb/testsuite/gdb.rust/dwindex.exp b/gdb/testsuite/gdb.rust/dwindex.exp index 1a82c2e92fe..0b7e3911ab1 100644 --- a/gdb/testsuite/gdb.rust/dwindex.exp +++ b/gdb/testsuite/gdb.rust/dwindex.exp @@ -25,10 +25,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { return -1 } -if {[ensure_gdb_index $binfile -dwarf-5] == -1} { - untested "error adding gdb index" - return -1 -} +critical ensure_gdb_index $binfile -dwarf-5 gdb_exit gdb_start From patchwork Sat Apr 15 15:13:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 67785 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 758003858439 for ; Sat, 15 Apr 2023 15:14:24 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from gproxy3-pub.mail.unifiedlayer.com (gproxy3-pub.mail.unifiedlayer.com [69.89.30.42]) by sourceware.org (Postfix) with ESMTPS id 31E8F385702D for ; Sat, 15 Apr 2023 15:13:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 31E8F385702D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw14.mail.unifiedlayer.com (unknown [10.0.90.129]) by progateway5.mail.pro1.eigbox.com (Postfix) with ESMTP id 72AA610047D94 for ; Sat, 15 Apr 2023 15:13:44 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id nhaypFOjelKplnhaypF1qi; Sat, 15 Apr 2023 15:13:44 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=Huezp2fS c=1 sm=1 tr=0 ts=643abf28 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=dKHAf1wccvYA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=rLpUA9Ld587iX6u2y7EA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=4wf7AS4zVwXOd6eGZBPIqhPk2W8IDCkt4kSOUzVsrBA=; b=BZXLLYAXqbV1PVEnBLw56n5tXX foGqDLgxhOstyPlpeIjtsYFsVF1ruD++QXMLkw6PImgSON0WhTrhHAqjL3hCSkP/ln2Nh3+0XFLjW SZkdsVIJZ0QDrDVK3QIpq5u3E; Received: from 71-211-191-82.hlrn.qwest.net ([71.211.191.82]:43720 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pnhay-0021Ms-4a; Sat, 15 Apr 2023 09:13:44 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFC 4/5] Use "critical prepare_for_testing" in gdb.rust Date: Sat, 15 Apr 2023 09:13:35 -0600 Message-Id: <20230415151336.4104455-5-tom@tromey.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230415151336.4104455-1-tom@tromey.com> References: <20230415151336.4104455-1-tom@tromey.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 71.211.191.82 X-Source-L: No X-Exim-ID: 1pnhay-0021Ms-4a X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-191-82.hlrn.qwest.net (localhost.localdomain) [71.211.191.82]:43720 X-Source-Auth: tom+tromey.com X-Email-Count: 5 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3025.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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.29 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 Sender: "Gdb-patches" This converts gdb.rust to use "critical prepare_for_testing" rather than "if". --- gdb/testsuite/gdb.rust/completion.exp | 5 ++--- gdb/testsuite/gdb.rust/dwindex.exp | 5 ++--- gdb/testsuite/gdb.rust/finish.exp | 5 ++--- gdb/testsuite/gdb.rust/fnfield.exp | 5 ++--- gdb/testsuite/gdb.rust/generics.exp | 5 ++--- gdb/testsuite/gdb.rust/main-crash.exp | 6 ++---- gdb/testsuite/gdb.rust/methods.exp | 5 ++--- gdb/testsuite/gdb.rust/modules.exp | 5 ++--- gdb/testsuite/gdb.rust/onetwoeight.exp | 5 ++--- gdb/testsuite/gdb.rust/pp.exp | 5 ++--- gdb/testsuite/gdb.rust/rawids.exp | 5 ++--- gdb/testsuite/gdb.rust/rust-start.exp | 5 ++--- gdb/testsuite/gdb.rust/rust-style.exp | 6 ++---- gdb/testsuite/gdb.rust/simple.exp | 5 ++--- gdb/testsuite/gdb.rust/traits.exp | 5 ++--- gdb/testsuite/gdb.rust/unicode.exp | 5 ++--- gdb/testsuite/gdb.rust/union.exp | 5 ++--- gdb/testsuite/gdb.rust/unsized.exp | 5 ++--- gdb/testsuite/gdb.rust/watch.exp | 5 ++--- 19 files changed, 38 insertions(+), 59 deletions(-) diff --git a/gdb/testsuite/gdb.rust/completion.exp b/gdb/testsuite/gdb.rust/completion.exp index 76c45fda7ba..91f8b230f4a 100644 --- a/gdb/testsuite/gdb.rust/completion.exp +++ b/gdb/testsuite/gdb.rust/completion.exp @@ -21,9 +21,8 @@ require allow_rust_tests require {can_compile rust} standard_testfile .rs -if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 -} +critical prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust} set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { diff --git a/gdb/testsuite/gdb.rust/dwindex.exp b/gdb/testsuite/gdb.rust/dwindex.exp index 0b7e3911ab1..e3fe49fbce1 100644 --- a/gdb/testsuite/gdb.rust/dwindex.exp +++ b/gdb/testsuite/gdb.rust/dwindex.exp @@ -21,9 +21,8 @@ require {can_compile rust} standard_testfile .rs -if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 -} +critical prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust} critical ensure_gdb_index $binfile -dwarf-5 diff --git a/gdb/testsuite/gdb.rust/finish.exp b/gdb/testsuite/gdb.rust/finish.exp index 373f8d72f5d..630b093b440 100644 --- a/gdb/testsuite/gdb.rust/finish.exp +++ b/gdb/testsuite/gdb.rust/finish.exp @@ -20,9 +20,8 @@ require allow_rust_tests require {can_compile rust} standard_testfile .rs -if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 -} +critical prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust} set line [gdb_get_line_number "BREAK"] if {![runto ${srcfile}:$line]} { diff --git a/gdb/testsuite/gdb.rust/fnfield.exp b/gdb/testsuite/gdb.rust/fnfield.exp index 48c6179d7d6..93b00f11b8a 100644 --- a/gdb/testsuite/gdb.rust/fnfield.exp +++ b/gdb/testsuite/gdb.rust/fnfield.exp @@ -20,9 +20,8 @@ require allow_rust_tests require {can_compile rust} standard_testfile .rs -if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 -} +critical prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust} set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { diff --git a/gdb/testsuite/gdb.rust/generics.exp b/gdb/testsuite/gdb.rust/generics.exp index 7afed993a2d..9eba8f5786e 100644 --- a/gdb/testsuite/gdb.rust/generics.exp +++ b/gdb/testsuite/gdb.rust/generics.exp @@ -20,9 +20,8 @@ require allow_rust_tests require {can_compile rust} standard_testfile .rs -if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 -} +critical prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust} set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { diff --git a/gdb/testsuite/gdb.rust/main-crash.exp b/gdb/testsuite/gdb.rust/main-crash.exp index caede88a1fa..450af9ed18c 100644 --- a/gdb/testsuite/gdb.rust/main-crash.exp +++ b/gdb/testsuite/gdb.rust/main-crash.exp @@ -20,10 +20,8 @@ require allow_rust_tests require {can_compile rust} standard_testfile main.rs -if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ - {debug rust}]} { - return -1 -} +critical prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust} set line [gdb_get_line_number "BREAK"] # The bug was that this would crash. diff --git a/gdb/testsuite/gdb.rust/methods.exp b/gdb/testsuite/gdb.rust/methods.exp index dd95429de7d..67792986fad 100644 --- a/gdb/testsuite/gdb.rust/methods.exp +++ b/gdb/testsuite/gdb.rust/methods.exp @@ -20,9 +20,8 @@ require allow_rust_tests require {can_compile rust} standard_testfile .rs -if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 -} +critical prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust} set line [gdb_get_line_number "set breakpoint 1 here"] if {![runto ${srcfile}:$line]} { diff --git a/gdb/testsuite/gdb.rust/modules.exp b/gdb/testsuite/gdb.rust/modules.exp index 076ef5c2dd4..ddb9a05c58f 100644 --- a/gdb/testsuite/gdb.rust/modules.exp +++ b/gdb/testsuite/gdb.rust/modules.exp @@ -20,9 +20,8 @@ require allow_rust_tests require {can_compile rust} standard_testfile .rs -if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 -} +critical prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust} set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { diff --git a/gdb/testsuite/gdb.rust/onetwoeight.exp b/gdb/testsuite/gdb.rust/onetwoeight.exp index ef56bcafda2..ad536d27900 100644 --- a/gdb/testsuite/gdb.rust/onetwoeight.exp +++ b/gdb/testsuite/gdb.rust/onetwoeight.exp @@ -26,9 +26,8 @@ if {[lindex $v 0] == 1 && [lindex $v 1] < 43} { } standard_testfile .rs -if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 -} +critical prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust} set line [gdb_get_line_number "BREAK"] if {![runto ${srcfile}:$line]} { diff --git a/gdb/testsuite/gdb.rust/pp.exp b/gdb/testsuite/gdb.rust/pp.exp index ef66717607b..0f8fee20fb9 100644 --- a/gdb/testsuite/gdb.rust/pp.exp +++ b/gdb/testsuite/gdb.rust/pp.exp @@ -21,9 +21,8 @@ require allow_rust_tests allow_python_tests require {can_compile rust} standard_testfile .rs -if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 -} +critical prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust} set remote_python_file [gdb_remote_download host \ ${srcdir}/${subdir}/${testfile}.py] diff --git a/gdb/testsuite/gdb.rust/rawids.exp b/gdb/testsuite/gdb.rust/rawids.exp index 55e1b7ffbdd..0c9ecaabe32 100644 --- a/gdb/testsuite/gdb.rust/rawids.exp +++ b/gdb/testsuite/gdb.rust/rawids.exp @@ -21,9 +21,8 @@ require {can_compile rust} require {rust_at_least 1.30} standard_testfile .rs -if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 -} +critical prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust} set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { diff --git a/gdb/testsuite/gdb.rust/rust-start.exp b/gdb/testsuite/gdb.rust/rust-start.exp index ca2608465dd..5ce7b9bb053 100644 --- a/gdb/testsuite/gdb.rust/rust-start.exp +++ b/gdb/testsuite/gdb.rust/rust-start.exp @@ -24,9 +24,8 @@ require {can_compile rust} require !use_gdb_stub standard_testfile simple.rs -if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 -} +critical prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust} # Verify that "start" lands inside the right procedure. if {[gdb_start_cmd] < 0} { diff --git a/gdb/testsuite/gdb.rust/rust-style.exp b/gdb/testsuite/gdb.rust/rust-style.exp index 0555ea4b8a4..71a484ae933 100644 --- a/gdb/testsuite/gdb.rust/rust-style.exp +++ b/gdb/testsuite/gdb.rust/rust-style.exp @@ -24,10 +24,8 @@ save_vars { env(TERM) } { setenv TERM ansi standard_testfile .rs - if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ - {debug rust}]} { - return -1 - } + critical prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust} set line [gdb_get_line_number "breakpoint"] if {![runto ${srcfile}:$line]} { diff --git a/gdb/testsuite/gdb.rust/simple.exp b/gdb/testsuite/gdb.rust/simple.exp index 08ebed3f103..dd73f50af81 100644 --- a/gdb/testsuite/gdb.rust/simple.exp +++ b/gdb/testsuite/gdb.rust/simple.exp @@ -20,9 +20,8 @@ require allow_rust_tests require {can_compile rust} standard_testfile .rs -if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 -} +critical prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust} set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { diff --git a/gdb/testsuite/gdb.rust/traits.exp b/gdb/testsuite/gdb.rust/traits.exp index e52749733d7..a614065a129 100644 --- a/gdb/testsuite/gdb.rust/traits.exp +++ b/gdb/testsuite/gdb.rust/traits.exp @@ -20,9 +20,8 @@ require allow_rust_tests require {can_compile rust} standard_testfile .rs -if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 -} +critical prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust} set readelf_program [gdb_find_readelf] set result [catch "exec $readelf_program --debug-dump=info $binfile" output] diff --git a/gdb/testsuite/gdb.rust/unicode.exp b/gdb/testsuite/gdb.rust/unicode.exp index 97b37af316a..8063d7ec1b9 100644 --- a/gdb/testsuite/gdb.rust/unicode.exp +++ b/gdb/testsuite/gdb.rust/unicode.exp @@ -26,9 +26,8 @@ require {rust_at_least 1.53} setenv LC_ALL C.UTF-8 standard_testfile .rs -if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 -} +critical prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust} set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { diff --git a/gdb/testsuite/gdb.rust/union.exp b/gdb/testsuite/gdb.rust/union.exp index 6074717d276..d4a12156f3e 100644 --- a/gdb/testsuite/gdb.rust/union.exp +++ b/gdb/testsuite/gdb.rust/union.exp @@ -20,9 +20,8 @@ require allow_rust_tests require {can_compile rust} standard_testfile .rs -if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 -} +critical prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust} set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { diff --git a/gdb/testsuite/gdb.rust/unsized.exp b/gdb/testsuite/gdb.rust/unsized.exp index f6d39dd6248..61c671dce6a 100644 --- a/gdb/testsuite/gdb.rust/unsized.exp +++ b/gdb/testsuite/gdb.rust/unsized.exp @@ -20,9 +20,8 @@ require allow_rust_tests require {can_compile rust} standard_testfile .rs -if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 -} +critical prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust} set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} { diff --git a/gdb/testsuite/gdb.rust/watch.exp b/gdb/testsuite/gdb.rust/watch.exp index ae359420aad..f9bf6ad2269 100644 --- a/gdb/testsuite/gdb.rust/watch.exp +++ b/gdb/testsuite/gdb.rust/watch.exp @@ -20,9 +20,8 @@ require allow_rust_tests require {can_compile rust} standard_testfile .rs -if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { - return -1 -} +critical prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug rust} set line [gdb_get_line_number "set breakpoint here"] if {![runto ${srcfile}:$line]} {