From patchwork Wed Jan 25 22:46:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 63721 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 DA0033894C11 for ; Wed, 25 Jan 2023 22:49:42 +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 DC8123857835 for ; Wed, 25 Jan 2023 22:46:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DC8123857835 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 43AB310047C37 for ; Wed, 25 Jan 2023 22:46:42 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id KoXSpVcljvm7MKoXSp6wGw; Wed, 25 Jan 2023 22:46:42 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=T4lJ89GQ c=1 sm=1 tr=0 ts=63d1b152 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=IFzOK5KbUOSsJMbGq3IA: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=iJBX9sF3lELXpNHdpf2JUQEee3d9pSmUENjFDtGs8ww=; b=FR8m8QP4vEhkcU2W+9PD5+M6UA bNtvLq79uqis3x4oytyDA271LUQ02dlMzK28eUTn2tC1EuO98hveOqrIA9dQYalf7Wg6KC5m732lr 1Oqdhfzd9q+k0mebFDkUNq5LF; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:52354 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 1pKoXR-000gnE-V5; Wed, 25 Jan 2023 15:46:42 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 26/27] Use clean_restart in gdb.python Date: Wed, 25 Jan 2023 15:46:13 -0700 Message-Id: <20230125224614.1006886-27-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: 1pKoXR-000gnE-V5 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:52354 X-Source-Auth: tom+tromey.com X-Email-Count: 36 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3027.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" Change gdb.python to use clean_restart more consistently. --- gdb/testsuite/gdb.python/py-format-string.exp | 5 +---- gdb/testsuite/gdb.python/py-function.exp | 6 +----- gdb/testsuite/gdb.python/py-lookup-type.exp | 4 +--- gdb/testsuite/gdb.python/py-prettyprint.exp | 11 ++--------- gdb/testsuite/gdb.python/py-progspace.exp | 6 +----- gdb/testsuite/gdb.python/py-section-script.exp | 10 ++-------- gdb/testsuite/gdb.python/py-template.exp | 6 +----- gdb/testsuite/gdb.python/py-type.exp | 7 +------ gdb/testsuite/gdb.python/python.exp | 5 +---- 9 files changed, 11 insertions(+), 49 deletions(-) diff --git a/gdb/testsuite/gdb.python/py-format-string.exp b/gdb/testsuite/gdb.python/py-format-string.exp index f343ce31a46..1d50f59dee3 100644 --- a/gdb/testsuite/gdb.python/py-format-string.exp +++ b/gdb/testsuite/gdb.python/py-format-string.exp @@ -47,10 +47,7 @@ proc build_inferior {exefile lang} { proc prepare_gdb {exefile} { global srcdir subdir srcfile testfile hex - gdb_exit - gdb_start - gdb_reinitialize_dir $srcdir/$subdir - gdb_load ${exefile} + clean_restart $exefile if {![runto_main]} { return diff --git a/gdb/testsuite/gdb.python/py-function.exp b/gdb/testsuite/gdb.python/py-function.exp index 25b83a797aa..3a6e30259fd 100644 --- a/gdb/testsuite/gdb.python/py-function.exp +++ b/gdb/testsuite/gdb.python/py-function.exp @@ -20,11 +20,7 @@ load_lib gdb-python.exp require allow_python_tests -# Start with a fresh gdb. - -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir +clean_restart gdb_test_multiline "input convenience function" \ "python" "" \ diff --git a/gdb/testsuite/gdb.python/py-lookup-type.exp b/gdb/testsuite/gdb.python/py-lookup-type.exp index c914ea1068b..63f603cc009 100644 --- a/gdb/testsuite/gdb.python/py-lookup-type.exp +++ b/gdb/testsuite/gdb.python/py-lookup-type.exp @@ -25,9 +25,7 @@ require allow_python_tests # created by each language since GDB. So, we must start GDB without # loading any symbol in. -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir +clean_restart proc test_lookup_type { lang type_name } { gdb_test_no_output "set language ${lang}" diff --git a/gdb/testsuite/gdb.python/py-prettyprint.exp b/gdb/testsuite/gdb.python/py-prettyprint.exp index 674a4edd0d2..b7661ff14ed 100644 --- a/gdb/testsuite/gdb.python/py-prettyprint.exp +++ b/gdb/testsuite/gdb.python/py-prettyprint.exp @@ -36,10 +36,7 @@ proc run_lang_tests {exefile lang} { set nl "\[\r\n\]+" # Start with a fresh gdb. - gdb_exit - gdb_start - gdb_reinitialize_dir $srcdir/$subdir - gdb_load ${exefile} + clean_restart $exefile if {![runto_main]} { return @@ -190,11 +187,7 @@ with_test_prefix c++ { # Run various other tests. -# Start with a fresh gdb. -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir -gdb_load ${binfile} +clean_restart $binfile if {![runto_main]} { return diff --git a/gdb/testsuite/gdb.python/py-progspace.exp b/gdb/testsuite/gdb.python/py-progspace.exp index c7be9489601..638b27927c6 100644 --- a/gdb/testsuite/gdb.python/py-progspace.exp +++ b/gdb/testsuite/gdb.python/py-progspace.exp @@ -26,11 +26,7 @@ if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} { return -1 } -# Start with a fresh gdb. - -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir +clean_restart gdb_test "python print (gdb.current_progspace().filename)" "None" \ "current progspace filename (None)" diff --git a/gdb/testsuite/gdb.python/py-section-script.exp b/gdb/testsuite/gdb.python/py-section-script.exp index 24d207416af..fec7b007317 100644 --- a/gdb/testsuite/gdb.python/py-section-script.exp +++ b/gdb/testsuite/gdb.python/py-section-script.exp @@ -46,11 +46,7 @@ if {[build_executable $testfile.exp $testfile $srcfile \ return -1 } -# Start with a fresh gdb. -gdb_exit -gdb_start - -gdb_reinitialize_dir $srcdir/$subdir +clean_restart # Try first with a restrictive safe-path. @@ -71,9 +67,7 @@ gdb_test_multiple "info auto-load python-scripts" "$test_name" { # Try again with a working safe-path. -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir +clean_restart # Get the name of the binfile on the host; on a remote host this means # stripping off any directory prefix. diff --git a/gdb/testsuite/gdb.python/py-template.exp b/gdb/testsuite/gdb.python/py-template.exp index a89a813578d..9bc392dcb8d 100644 --- a/gdb/testsuite/gdb.python/py-template.exp +++ b/gdb/testsuite/gdb.python/py-template.exp @@ -25,11 +25,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \ return -1 } -# Start with a fresh gdb. - -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir +clean_restart proc test_template_arg {exefile type} { global testfile srcdir subdir srcfile diff --git a/gdb/testsuite/gdb.python/py-type.exp b/gdb/testsuite/gdb.python/py-type.exp index e7837d7405f..c245d41a1ac 100644 --- a/gdb/testsuite/gdb.python/py-type.exp +++ b/gdb/testsuite/gdb.python/py-type.exp @@ -34,12 +34,7 @@ proc build_inferior {exefile lang} { # Restart GDB. proc restart_gdb {exefile} { - global srcdir subdir srcfile testfile hex - - gdb_exit - gdb_start - gdb_reinitialize_dir $srcdir/$subdir - gdb_load ${exefile} + clean_restart $exefile if {![runto_main]} { return diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp index b8a4718ef6c..8fe119fead1 100644 --- a/gdb/testsuite/gdb.python/python.exp +++ b/gdb/testsuite/gdb.python/python.exp @@ -25,10 +25,7 @@ if {[build_executable $testfile.exp $testfile \ return -1 } -# Start with a fresh gdb. -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir +clean_restart set remote_source2_py [gdb_remote_download host \ ${srcdir}/${subdir}/source2.py]