[testsuite/gdb.ada] simplify some testcases by using clean_restart.

gdb/testsuite/ChangeLog:

        * gdb.ada/array_bounds.exp, gdb.ada/array_return.exp,
        gdb.ada/array_subscript_addr.exp, gdb.ada/arrayidx.exp,
        gdb.ada/arrayparam.exp, gdb.ada/arrayptr.exp,
        gdb.ada/atomic_enum.exp, gdb.ada/call_pn.exp,
        gdb.ada/catch_ex.exp, gdb.ada/char_param.exp,
        gdb.ada/complete.exp, gdb.ada/exprs.exp, gdb.ada/fixed_cmp.exp,
        gdb.ada/fixed_points.exp, gdb.ada/formatted_ref.exp,
        gdb.ada/frame_args.exp, gdb.ada/fun_addr.exp,
        gdb.ada/fun_in_declare.exp, gdb.ada/funcall_param.exp,
        gdb.ada/homonym.exp, gdb.ada/int_deref.exp,
        gdb.ada/interface.exp, gdb.ada/lang_switch.exp,
        gdb.ada/mod_from_name.exp, gdb.ada/nested.exp,
        gdb.ada/null_array.exp, gdb.ada/null_record.exp,
        gdb.ada/packed_array.exp, gdb.ada/packed_tagged.exp,
        gdb.ada/print_chars.exp, gdb.ada/print_pc.exp,
        gdb.ada/ptype_field.exp, gdb.ada/ptype_tagged_param.exp,
        gdb.ada/rec_return.exp, gdb.ada/ref_param.exp,
        gdb.ada/ref_tick_size.exp, gdb.ada/start.exp,
        gdb.ada/str_ref_cmp.exp, gdb.ada/sym_print_name.exp,
        gdb.ada/taft_type.exp, gdb.ada/tagged.exp, gdb.ada/tasks.exp,
        gdb.ada/tick_last_segv.exp, gdb.ada/type_coercion.exp,
        gdb.ada/uninitialized_vars.exp,
        gdb.ada/variant_record_packed_array.exp, gdb.ada/watch_arg.exp:
        Simplify by using clean_restart.

gdb/testsuite/ChangeLog

@@ -1,3 +1,30 @@
+2011-01-06  Joel Brobecker  <brobecker@adacore.com>
+
+        * gdb.ada/array_bounds.exp, gdb.ada/array_return.exp,
+        gdb.ada/array_subscript_addr.exp, gdb.ada/arrayidx.exp,
+        gdb.ada/arrayparam.exp, gdb.ada/arrayptr.exp,
+        gdb.ada/atomic_enum.exp, gdb.ada/call_pn.exp,
+        gdb.ada/catch_ex.exp, gdb.ada/char_param.exp,
+        gdb.ada/complete.exp, gdb.ada/exprs.exp, gdb.ada/fixed_cmp.exp,
+        gdb.ada/fixed_points.exp, gdb.ada/formatted_ref.exp,
+        gdb.ada/frame_args.exp, gdb.ada/fun_addr.exp,
+        gdb.ada/fun_in_declare.exp, gdb.ada/funcall_param.exp,
+        gdb.ada/homonym.exp, gdb.ada/int_deref.exp,
+        gdb.ada/interface.exp, gdb.ada/lang_switch.exp,
+        gdb.ada/mod_from_name.exp, gdb.ada/nested.exp,
+        gdb.ada/null_array.exp, gdb.ada/null_record.exp,
+        gdb.ada/packed_array.exp, gdb.ada/packed_tagged.exp,
+        gdb.ada/print_chars.exp, gdb.ada/print_pc.exp,
+        gdb.ada/ptype_field.exp, gdb.ada/ptype_tagged_param.exp,
+        gdb.ada/rec_return.exp, gdb.ada/ref_param.exp,
+        gdb.ada/ref_tick_size.exp, gdb.ada/start.exp,
+        gdb.ada/str_ref_cmp.exp, gdb.ada/sym_print_name.exp,
+        gdb.ada/taft_type.exp, gdb.ada/tagged.exp, gdb.ada/tasks.exp,
+        gdb.ada/tick_last_segv.exp, gdb.ada/type_coercion.exp,
+        gdb.ada/uninitialized_vars.exp,
+        gdb.ada/variant_record_packed_array.exp, gdb.ada/watch_arg.exp:
+        Simplify by using clean_restart.
+
 2011-01-06  Joel Brobecker  <brobecker@adacore.com>
 
 	Add marker to be used as anchor for inserting breakpoints.

gdb/testsuite/gdb.ada/array_bounds.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/bar.adb]
 if ![runto "bar.adb:$bp_location" ] then {

gdb/testsuite/gdb.ada/array_return.exp

@@ -32,10 +32,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 # Start the inferior
 

gdb/testsuite/gdb.ada/array_subscript_addr.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/p.adb]
 runto "p.adb:$bp_location"

gdb/testsuite/gdb.ada/arrayidx.exp

@@ -31,10 +31,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/p.adb]
 runto "p.adb:$bp_location"

gdb/testsuite/gdb.ada/arrayparam.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"

gdb/testsuite/gdb.ada/arrayptr.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 if ![runto "foo.adb:$bp_location" ] then {

gdb/testsuite/gdb.ada/atomic_enum.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set test "ptype pck.data_flag"
 gdb_test_multiple "$test" $test {

gdb/testsuite/gdb.ada/call_pn.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 if ![runto "foo.adb:$bp_location" ] then {

gdb/testsuite/gdb.ada/catch_ex.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 # Some global variables used to simplify the maintenance of some of
 # the regular expressions below.

gdb/testsuite/gdb.ada/char_param.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"

gdb/testsuite/gdb.ada/complete.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"

gdb/testsuite/gdb.ada/exprs.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/p.adb]
 runto "p.adb:$bp_location"

gdb/testsuite/gdb.ada/fixed_cmp.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/fixed.adb]
 runto "fixed.adb:$bp_location"

gdb/testsuite/gdb.ada/fixed_points.exp

@@ -31,10 +31,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "Set breakpoint here" ${testdir}/fixed_points.adb]
 runto "fixed_points.adb:$bp_location"

gdb/testsuite/gdb.ada/formatted_ref.exp

@@ -93,10 +93,7 @@ proc test_p_op1_equals_op2 {op1 op2} {
     gdb_test $test "\\$\[0-9\]+ = true"
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 runto defs.adb:[gdb_get_line_number "marker here" ${testdir}/defs.adb ]
 

gdb/testsuite/gdb.ada/frame_args.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set any_nb "\[0-9\]+"
 set any_addr "0x\[0-9a-zA-Z\]+"

gdb/testsuite/gdb.ada/fun_addr.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 # Verify that we are able to print the address of a function when
 # the inferior is *not* running (no frame).

gdb/testsuite/gdb.ada/fun_in_declare.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 if ![runto main] then {
   perror "Couldn't run ${testfile}"

gdb/testsuite/gdb.ada/funcall_param.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"

gdb/testsuite/gdb.ada/homonym.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "BREAK_1" ${testdir}/homonym.adb]
 runto "homonym.adb:$bp_location"

gdb/testsuite/gdb.ada/int_deref.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "Pck.Watch" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"

gdb/testsuite/gdb.ada/interface.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"

gdb/testsuite/gdb.ada/lang_switch.exp

@@ -33,10 +33,7 @@ if {[gdb_compile_ada "${adasrcfile}" "${binfile}" executable [list debug]] != ""
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.c]
 runto "foo.c:$bp_location"

gdb/testsuite/gdb.ada/mod_from_name.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/foo.adb]
 if ![runto "foo.adb:$bp_location" ] then {

gdb/testsuite/gdb.ada/nested.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set any_nb "\[0-9\]+"
 set any_addr "0x\[0-9a-zA-Z\]+"

gdb/testsuite/gdb.ada/null_array.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"

gdb/testsuite/gdb.ada/null_record.exp

@@ -31,10 +31,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/null_record.adb]
 runto "null_record.adb:$bp_location"

gdb/testsuite/gdb.ada/packed_array.exp

@@ -31,10 +31,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/pa.adb]
 runto "pa.adb:$bp_location"

gdb/testsuite/gdb.ada/packed_tagged.exp

@@ -40,10 +40,7 @@ proc multi_line { args } {
     return [join $args "\[\r\n\]*"]
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/comp_bug.adb]
 runto "comp_bug.adb:$bp_location"

gdb/testsuite/gdb.ada/print_chars.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"

gdb/testsuite/gdb.ada/print_pc.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/dummy.adb]
 runto "dummy.adb:$bp_location"

gdb/testsuite/gdb.ada/ptype_field.exp

@@ -40,10 +40,7 @@ proc multi_line { args } {
     return [join $args "\[\r\n\]*"]
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"

gdb/testsuite/gdb.ada/ptype_tagged_param.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 if ![runto "position_x" ] then {
   return -1

gdb/testsuite/gdb.ada/rec_return.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 if ![runto "foo.adb:$bp_location" ] then {

gdb/testsuite/gdb.ada/ref_param.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 if ![runto call_me] then {
   perror "Couldn't run ${testfile}"

gdb/testsuite/gdb.ada/ref_tick_size.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/p.adb]
 runto "p.adb:$bp_location"

gdb/testsuite/gdb.ada/start.exp

@@ -38,10 +38,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 # Verify that "start" lands inside the right procedure.
 if { [gdb_start_cmd] < 0 } {

gdb/testsuite/gdb.ada/str_ref_cmp.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"

gdb/testsuite/gdb.ada/sym_print_name.exp

@@ -40,10 +40,7 @@ proc multi_line { args } {
     return [join $args "\[\r\n\]*"]
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"

gdb/testsuite/gdb.ada/taft_type.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/p.adb]
 if ![runto "p.adb:$bp_location" ] then {

gdb/testsuite/gdb.ada/tagged.exp

@@ -40,10 +40,7 @@ proc multi_line { args } {
     return [join $args "\[\r\n\]*"]
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"

gdb/testsuite/gdb.ada/tasks.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP_HERE" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"

gdb/testsuite/gdb.ada/tick_last_segv.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 # Make sure that evaluating the 'First and 'Last attributes on
 # a "primitive type" (a predefined type for which GDB also creates

gdb/testsuite/gdb.ada/type_coercion.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/assign.adb]
 runto "assign.adb:$bp_location"

gdb/testsuite/gdb.ada/uninitialized_vars.exp

@@ -32,10 +32,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 # Start the program; we should land in the program main procedure, before
 # variable initialization.

gdb/testsuite/gdb.ada/variant_record_packed_array.exp

@@ -29,10 +29,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" }
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"

gdb/testsuite/gdb.ada/watch_arg.exp

@@ -31,10 +31,7 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "BREAK1" ${testdir}/watch.adb]
 runto "watch.adb:$bp_location"