diff mbox series

[26/27] Use clean_restart in gdb.python

Message ID	20230125224614.1006886-27-tom@tromey.com
State	Committed
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DC8123857835 From: Tom Tromey <tom@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey <tom@tromey.com> 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> In-Reply-To: <20230125224614.1006886-1-tom@tromey.com> References: <20230125224614.1006886-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" <gdb-patches-bounces+patchwork=sourceware.org@sourceware.org>
Series	Many small testsuite cleanups \| [00/27] Many small testsuite cleanups [01/27] Use ordinary calling convention for clean_restart [02/27] Use clean_restart in gdb.dlang [03/27] Eliminate spurious returns from the test suite [04/27] Remove some dead code in gdb.fortran/info-types.exp [05/27] Minor "require" fixups [06/27] Remove unnecessary call to standard_testfile [07/27] Start gdb after building executable in mi-basics.exp [08/27] Use mi_clean_restart more [09/27] Use clean_restart in gdb.pascal [10/27] Use clean_restart in gdb.linespec [11/27] Use clean_restart in gdb.opencl [12/27] Use clean_restart in gdb.trace [13/27] Use clean_restart in gdb.objc [14/27] Use clean_restart in gdb.threads [15/27] Use clean_restart in gdb.guile [16/27] Use clean_restart in gdb.arch [17/27] Use clean_restart in gdb.reverse [18/27] Use clean_restart in gdb.dwarf2 [19/27] Use clean_restart in gdb.ada [20/27] Use clean_restart in gdb.fortran [21/27] Use clean_restart in gdb.stabs [22/27] Use clean_restart in gdb.go [23/27] Use clean_restart in gdb.perf [24/27] Use clean_restart in gdb.disasm [25/27] Use clean_restart in gdb.cp [26/27] Use clean_restart in gdb.python [27/27] Use clean_restart in gdb.base

Commit Message

Tom Tromey Jan. 25, 2023, 10:46 p.m. UTC

  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 mbox series

Patch

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]