Use clean_restart in gdb.guile

Change gdb.guile to use clean_restart more consistently.

diff --git a/gdb/testsuite/gdb.guile/guile.exp b/gdb/testsuite/gdb.guile/guile.exp
index 7c7dd3a3826b5fb1e52c1232ed9118fccd12cc9f..4db2f7cd309c5261d93a0d376a9027125e39a5e3 100644 (file)
--- a/gdb/testsuite/gdb.guile/guile.exp
+++ b/gdb/testsuite/gdb.guile/guile.exp
@@ -18,10 +18,7 @@
 
 load_lib gdb-guile.exp
 
-# Start with a fresh gdb.
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
+clean_restart
 
 # Do this instead of the skip_guile_check.
 # We want to do some tests when Guile is not present.

diff --git a/gdb/testsuite/gdb.guile/scm-gsmob.exp b/gdb/testsuite/gdb.guile/scm-gsmob.exp
index a7c95c01c1161a0384e45b2815e317e3497e34d9..726c97cbb92822a255badcf92223efac085399e2 100644 (file)
--- a/gdb/testsuite/gdb.guile/scm-gsmob.exp
+++ b/gdb/testsuite/gdb.guile/scm-gsmob.exp
@@ -20,11 +20,7 @@ load_lib gdb-guile.exp
 
 require allow_guile_tests
 
-# Start with a fresh gdb.
-gdb_exit
-gdb_start
-
-gdb_reinitialize_dir $srcdir/$subdir
+clean_restart
 
 gdb_install_guile_utils
 gdb_install_guile_module

diff --git a/gdb/testsuite/gdb.guile/scm-objfile-script.exp b/gdb/testsuite/gdb.guile/scm-objfile-script.exp
index 5b480d1ea55e3c0755af620b933e41d2c9d65f92..6a935d7926c0d4e8ca430c15b1917bccefc68aaa 100644 (file)
--- a/gdb/testsuite/gdb.guile/scm-objfile-script.exp
+++ b/gdb/testsuite/gdb.guile/scm-objfile-script.exp
@@ -26,10 +26,6 @@ if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
     return
 }
 
-# Start with a fresh gdb.
-gdb_exit
-gdb_start
-
 # Make the -gdb.scm script available to gdb, it is automagically loaded by gdb.
 # Care is taken to put it in the same directory as the binary so that
 # gdb will find it.
@@ -37,7 +33,7 @@ set remote_guile_file [remote_download host \
                           ${srcdir}/${subdir}/${testfile}-gdb.in \
                           [standard_output_file ${testfile}-gdb.scm]]
 
-gdb_reinitialize_dir $srcdir/$subdir
+clean_restart
 gdb_test_no_output "set auto-load safe-path ${remote_guile_file}" \
     "set auto-load safe-path"
 gdb_load ${binfile}

diff --git a/gdb/testsuite/gdb.guile/scm-parameter.exp b/gdb/testsuite/gdb.guile/scm-parameter.exp
index 9ee50d152cde01aff06ce871d1b12ceb9b1c05e1..2e9d9ed9a5d42f4a270b8ecfcbc91832ab23c89f 100644 (file)
--- a/gdb/testsuite/gdb.guile/scm-parameter.exp
+++ b/gdb/testsuite/gdb.guile/scm-parameter.exp
@@ -20,10 +20,7 @@ load_lib gdb-guile.exp
 
 require allow_guile_tests
 
-# Start with a fresh gdb.
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
+clean_restart
 
 gdb_install_guile_utils
 gdb_install_guile_module

diff --git a/gdb/testsuite/gdb.guile/scm-pretty-print.exp b/gdb/testsuite/gdb.guile/scm-pretty-print.exp
index 3c20edf5061928f487e1c76385f853b3eef5307c..41c840b6898475b2e86ba44ff3b723ea2ba5fcc1 100644 (file)
--- a/gdb/testsuite/gdb.guile/scm-pretty-print.exp
+++ b/gdb/testsuite/gdb.guile/scm-pretty-print.exp
@@ -22,10 +22,6 @@ require allow_guile_tests
 
 standard_testfile
 
-# Start with a fresh gdb.
-gdb_exit
-gdb_start
-
 proc run_lang_tests {exefile lang} {
     with_test_prefix "lang=$lang" {
        global srcdir subdir srcfile testfile hex
@@ -37,10 +33,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 ![gdb_guile_runto_main] {
            return
@@ -121,11 +114,7 @@ run_lang_tests "${binfile}-cxx" "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 ![gdb_guile_runto_main] {
     return

diff --git a/gdb/testsuite/gdb.guile/scm-progspace.exp b/gdb/testsuite/gdb.guile/scm-progspace.exp
index c12a81e8ed17c92aca97e60ce94bbbd861fb2904..0007f3742d75c84ca06ec109f07b1e15765e5077 100644 (file)
--- a/gdb/testsuite/gdb.guile/scm-progspace.exp
+++ b/gdb/testsuite/gdb.guile/scm-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_install_guile_utils
 gdb_install_guile_module

diff --git a/gdb/testsuite/gdb.guile/scm-section-script.exp b/gdb/testsuite/gdb.guile/scm-section-script.exp
index 9e52939aae38906402b8d2741671738b7dac76a5..ae0e484c3b744d5c75796a6ab43c19ae278b5aec 100644 (file)
--- a/gdb/testsuite/gdb.guile/scm-section-script.exp
+++ b/gdb/testsuite/gdb.guile/scm-section-script.exp
@@ -46,11 +46,7 @@ if {[build_executable $testfile.exp $testfile $srcfile \
     return
 }
 
-# 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 guile-scripts" "$test_name" {
 
 # Try again with a working safe-path.
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
+clean_restart
 
 gdb_test_no_output "set auto-load safe-path ${remote_guile_file}:${binfile}" \
     "set auto-load safe-path"

diff --git a/gdb/testsuite/gdb.guile/scm-symbol.exp b/gdb/testsuite/gdb.guile/scm-symbol.exp
index fa2cf77828466251a84124252bfbe42f08faf3ed..5680a7f176ac470d877d76bc98a1c2351ff2999d 100644 (file)
--- a/gdb/testsuite/gdb.guile/scm-symbol.exp
+++ b/gdb/testsuite/gdb.guile/scm-symbol.exp
@@ -141,11 +141,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}-cxx" executable "
     return -1
 }
 
-# Start with a fresh gdb.
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}-cxx
+clean_restart ${binfile}-cxx
 
 if ![gdb_guile_runto_main] {
     return

diff --git a/gdb/testsuite/gdb.guile/scm-type.exp b/gdb/testsuite/gdb.guile/scm-type.exp
index 45139cba0d5316de36017f8b7f1d76e7ad1be0d0..a5eec3aee376326be98ec4fed76779d621160483 100644 (file)
--- a/gdb/testsuite/gdb.guile/scm-type.exp
+++ b/gdb/testsuite/gdb.guile/scm-type.exp
@@ -38,10 +38,7 @@ proc build_inferior {exefile lang} {
 proc restart_gdb {exefile} {
     global srcdir subdir
 
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load ${exefile}
+    clean_restart $exefile
 
     if { ![allow_guile_tests] } {
        return 0