diff mbox series

[14/27] Use clean_restart in gdb.threads

Message ID	20230125224614.1006886-15-tom@tromey.com
State	Committed
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 69BBD385840C From: Tom Tromey <tom@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey <tom@tromey.com> Subject: [PATCH 14/27] Use clean_restart in gdb.threads Date: Wed, 25 Jan 2023 15:46:01 -0700 Message-Id: <20230125224614.1006886-15-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.threads to use clean_restart more consistently.
---
 gdb/testsuite/gdb.threads/attach-stopped.exp      | 9 +--------
 gdb/testsuite/gdb.threads/fork-thread-pending.exp | 6 +-----
 gdb/testsuite/gdb.threads/schedlock.exp           | 6 +-----
 gdb/testsuite/gdb.threads/watchthreads.exp        | 6 +-----
 4 files changed, 4 insertions(+), 23 deletions(-)

diff mbox series

Patch

diff --git a/gdb/testsuite/gdb.threads/attach-stopped.exp b/gdb/testsuite/gdb.threads/attach-stopped.exp
index a3080c054af..acdfcb5d8c5 100644
--- a/gdb/testsuite/gdb.threads/attach-stopped.exp
+++ b/gdb/testsuite/gdb.threads/attach-stopped.exp
@@ -32,11 +32,8 @@  remote_exec build "rm -f ${binfile}"
 #log_user 1
 
 proc corefunc { threadtype } {
-    global srcfile
     global binfile
     global escapedbinfile
-    global srcdir
-    global subdir
     global gdb_prompt
 
     set test_spawn_id [spawn_wait_for_attach $binfile]
@@ -45,11 +42,7 @@  proc corefunc { threadtype } {
     # Stop the program 
     remote_exec build "kill -s STOP ${testpid}"
 
-    # Start with clean gdb
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load ${binfile}
+    clean_restart $binfile
 
     # Verify that we can attach to the stopped process.
        
diff --git a/gdb/testsuite/gdb.threads/fork-thread-pending.exp b/gdb/testsuite/gdb.threads/fork-thread-pending.exp
index db72fb2679b..3ab2d31402c 100644
--- a/gdb/testsuite/gdb.threads/fork-thread-pending.exp
+++ b/gdb/testsuite/gdb.threads/fork-thread-pending.exp
@@ -79,11 +79,7 @@  gdb_test_multiple "info threads" "$test" {
 
 # Start over, but this time, don't switch away from the fork event thread.
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-gdb_load ${binfile}
+clean_restart $binfile
 if {![runto_main]} {
    return 0
 }
diff --git a/gdb/testsuite/gdb.threads/schedlock.exp b/gdb/testsuite/gdb.threads/schedlock.exp
index fa095508fb9..08435015f14 100644
--- a/gdb/testsuite/gdb.threads/schedlock.exp
+++ b/gdb/testsuite/gdb.threads/schedlock.exp
@@ -146,11 +146,7 @@  proc step_ten_loops { cmd } {
     }
 }
 
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
+clean_restart
 
 # We'll need this when we send_gdb a ^C to GDB.  Need to do it before we
 # run the program and gdb starts saving and restoring tty states.
diff --git a/gdb/testsuite/gdb.threads/watchthreads.exp b/gdb/testsuite/gdb.threads/watchthreads.exp
index 1aa7957c867..e80c60b8167 100644
--- a/gdb/testsuite/gdb.threads/watchthreads.exp
+++ b/gdb/testsuite/gdb.threads/watchthreads.exp
@@ -31,11 +31,7 @@  if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
+clean_restart $binfile
 gdb_test_no_output "set can-use-hw-watchpoints 1" ""
 
 #