From patchwork Wed Jan 25 22:46:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 63710 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 815F7389941A for ; Wed, 25 Jan 2023 22:48:09 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from alt-proxy28.mail.unifiedlayer.com (alt-proxy28.mail.unifiedlayer.com [74.220.216.123]) by sourceware.org (Postfix) with ESMTPS id 9F7E53858431 for ; Wed, 25 Jan 2023 22:46:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9F7E53858431 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 cmgw13.mail.unifiedlayer.com (unknown [10.0.90.128]) by progateway1.mail.pro1.eigbox.com (Postfix) with ESMTP id B163510040622 for ; Wed, 25 Jan 2023 22:46:36 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id KoXMpqna4NX2aKoXMpdcRn; Wed, 25 Jan 2023 22:46:36 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=NMAQR22g c=1 sm=1 tr=0 ts=63d1b14c a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=RvmDmJFTN0MA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=1F7fvuDgqvn8bY_BmeYA: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=2f3QqeEdYrjCYzYjHX0fxA4ZWwsMWuFWWCren2kwXM4=; b=tjeb/IO8KygpcW/6Fy4jIq+IqR ESGfr0s/iGkS3ymxXYZnCfCHeV0hCrvLlAdspynrMHgNN89lnyLxU4wXJapeGzzfyjswh+fLwnOC6 W7GyHWHOaJnSnWX8Fvt+ruqkw; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:53060 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 1pKoXM-000gfc-57; Wed, 25 Jan 2023 15:46:36 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 18/27] Use clean_restart in gdb.dwarf2 Date: Wed, 25 Jan 2023 15:46:05 -0700 Message-Id: <20230125224614.1006886-19-tom@tromey.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230125224614.1006886-1-tom@tromey.com> References: <20230125224614.1006886-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: 97.122.76.186 X-Source-L: No X-Exim-ID: 1pKoXM-000gfc-57 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:53060 X-Source-Auth: tom+tromey.com X-Email-Count: 28 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3027.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_NUMSUBJECT, 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" Change gdb.dwarf2 to use clean_restart more consistently. --- gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp | 4 +--- gdb/testsuite/gdb.dwarf2/dw2-error.exp | 4 +--- gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp | 4 +--- gdb/testsuite/gdb.dwarf2/dwp-symlink.exp | 4 +--- gdb/testsuite/gdb.dwarf2/dwzbuildid.exp | 4 +--- gdb/testsuite/gdb.dwarf2/dwznolink.exp | 5 +---- gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp | 4 +--- 7 files changed, 7 insertions(+), 22 deletions(-) diff --git a/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp b/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp index b24500b8301..88d3d79cad8 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp @@ -28,9 +28,7 @@ if {[gdb_compile [file join $srcdir $subdir $srcfile] $binfile \ return -1 } -gdb_exit -gdb_start -gdb_reinitialize_dir [file join $srcdir $subdir] +clean_restart # Be sure to set cp-abi before $binfile gets loaded gdb_test "set cp-abi gnu-v3" diff --git a/gdb/testsuite/gdb.dwarf2/dw2-error.exp b/gdb/testsuite/gdb.dwarf2/dw2-error.exp index 0980f43078f..83a5b875323 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-error.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-error.exp @@ -31,9 +31,7 @@ if {[build_executable $testfile.exp $testfile $srcfile {nodebug quiet}]} { return -1 } -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir +clean_restart gdb_test_no_output "set breakpoint pending off" diff --git a/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp b/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp index a3b9dd075e1..52dfae3d7d7 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp @@ -23,9 +23,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {}] != "" return -1 } -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir +clean_restart # From gdb_file_cmd: if [is_remote host] { diff --git a/gdb/testsuite/gdb.dwarf2/dwp-symlink.exp b/gdb/testsuite/gdb.dwarf2/dwp-symlink.exp index e9bedd53cc3..d893fd3252c 100644 --- a/gdb/testsuite/gdb.dwarf2/dwp-symlink.exp +++ b/gdb/testsuite/gdb.dwarf2/dwp-symlink.exp @@ -75,9 +75,7 @@ gdb_test "ptype main" {type = int \(int, char \*\*\)} "binary symlink, dwp at sy # a relative path for the program. # This is clean_restart, but specifying a relative path to the binary. -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir +clean_restart gdb_test "cd [file dirname [standard_output_file ${thelink}]]" \ "Working directory .*" gdb_load "./${thelink}" diff --git a/gdb/testsuite/gdb.dwarf2/dwzbuildid.exp b/gdb/testsuite/gdb.dwarf2/dwzbuildid.exp index 1b9ba8da092..ba9db41ba61 100644 --- a/gdb/testsuite/gdb.dwarf2/dwzbuildid.exp +++ b/gdb/testsuite/gdb.dwarf2/dwzbuildid.exp @@ -146,9 +146,7 @@ if {[gdb_compile [list ${binfile}1.o ${binfile}6.o] ${binfile}-fallback \ foreach testname {ok mismatch fallback} { with_test_prefix $testname { - gdb_exit - gdb_start - gdb_reinitialize_dir $srcdir/$subdir + clean_restart gdb_test_no_output "set debug-file-directory $debugdir" \ "set debug-file-directory" diff --git a/gdb/testsuite/gdb.dwarf2/dwznolink.exp b/gdb/testsuite/gdb.dwarf2/dwznolink.exp index d0bfa6b57f7..19ed2c3c8cb 100644 --- a/gdb/testsuite/gdb.dwarf2/dwznolink.exp +++ b/gdb/testsuite/gdb.dwarf2/dwznolink.exp @@ -47,10 +47,7 @@ if {[build_executable $testfile.exp $testfile \ return -1 } -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir - +clean_restart gdb_test "file -readnow $binfile" \ "could not read '.gnu_debugaltlink' section" \ "file $testfile" diff --git a/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp b/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp index 9afad943d1c..0003dfa6bc6 100644 --- a/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp +++ b/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp @@ -26,9 +26,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" ${binfile} object {debug}] != return -1 } -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir +clean_restart # Be sure to set cp-abi before ${binfile} gets loaded gdb_test "set cp-abi gnu-v3"