From 3ae2b57582b29fce26b00d38363533e761f946a5 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Wed, 25 Jan 2023 10:31:34 -0700
Subject: [PATCH] Use clean_restart in gdb.objc

Change gdb.objc to use clean_restart more consistently.
---
 gdb/testsuite/gdb.objc/basicclass.exp | 11 +----------
 gdb/testsuite/gdb.objc/nondebug.exp   | 13 +------------
 gdb/testsuite/gdb.objc/objcdecode.exp | 13 +------------
 gdb/testsuite/gdb.objc/print.exp      |  6 +-----
 4 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/gdb/testsuite/gdb.objc/basicclass.exp b/gdb/testsuite/gdb.objc/basicclass.exp
index c09d852f006..05432a18a39 100644
--- a/gdb/testsuite/gdb.objc/basicclass.exp
+++ b/gdb/testsuite/gdb.objc/basicclass.exp
@@ -70,18 +70,9 @@ proc deduce_language_of_main {} {
 }
 
 proc do_objc_tests {} {
-    global subdir
-    global srcdir
     global binfile
-    global gdb_prompt
-
-
-    # Start with a fresh gdb.
 
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load $binfile
+    clean_restart $binfile
 
     deduce_language_of_main
 }
diff --git a/gdb/testsuite/gdb.objc/nondebug.exp b/gdb/testsuite/gdb.objc/nondebug.exp
index d08c3d4b244..c1ab4f62d02 100644
--- a/gdb/testsuite/gdb.objc/nondebug.exp
+++ b/gdb/testsuite/gdb.objc/nondebug.exp
@@ -28,19 +28,8 @@ if {[gdb_compile_objc "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [
 }
 
 proc do_objc_tests {} {
-    global subdir
-    global srcdir
     global binfile
-    global gdb_prompt
-
-
-    # Start with a fresh gdb.
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load $binfile
-
+    clean_restart $binfile
 }
 
 do_objc_tests
diff --git a/gdb/testsuite/gdb.objc/objcdecode.exp b/gdb/testsuite/gdb.objc/objcdecode.exp
index 6a713ad3450..abed6709aef 100644
--- a/gdb/testsuite/gdb.objc/objcdecode.exp
+++ b/gdb/testsuite/gdb.objc/objcdecode.exp
@@ -28,19 +28,8 @@ if {[gdb_compile_objc "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [
 }
 
 proc do_objc_tests {} {
-    global subdir
-    global srcdir
     global binfile
-    global gdb_prompt
-
-
-    # Start with a fresh gdb.
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load $binfile
-
+    clean_restart $binfile
 }
 
 do_objc_tests
diff --git a/gdb/testsuite/gdb.objc/print.exp b/gdb/testsuite/gdb.objc/print.exp
index 8dc83780b50..c311853c1e8 100644
--- a/gdb/testsuite/gdb.objc/print.exp
+++ b/gdb/testsuite/gdb.objc/print.exp
@@ -57,11 +57,7 @@ proc test_float_rejected {} {
     test_print_reject "p 1.1ll"
 }
 
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
+clean_restart
 
 if [set_lang_objc] {
     test_float_accepted
-- 
2.30.2