Use clean_restart in gdb.trace

Change gdb.trace to use clean_restart more consistently.

diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp
index cf7efbbd4fde8a840f128fe69a2b670263d7489c..ffc3250577f182954f197188f1b3250c63a70b42 100644 (file)
--- a/gdb/testsuite/gdb.trace/actions.exp
+++ b/gdb/testsuite/gdb.trace/actions.exp
@@ -17,10 +17,6 @@
 
 load_lib "trace-support.exp"
 
-
-gdb_exit
-gdb_start
-
 standard_testfile
 require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
@@ -28,11 +24,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     untested "failed to compile"
     return -1
 }
-gdb_reinitialize_dir $srcdir/$subdir
-
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
 
+clean_restart
 gdb_file_cmd $binfile
 
 # define relative source line numbers:
@@ -325,9 +318,7 @@ gdb_test "tsave -ctf ${tracefile}.ctf" \
     "save ctf trace file"
 
 # Restart GDB and read the trace data in tfile target.
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
+clean_restart
 gdb_file_cmd $binfile
 gdb_test "target tfile ${tracefile}.tf" ".*" \
     "change to tfile target"
@@ -345,9 +336,7 @@ gdb_test_multiple "target ctf" "" {
 }
 
 if { $gdb_can_read_ctf_data } {
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
+    clean_restart
     gdb_file_cmd $binfile
     gdb_test "target ctf ${tracefile}.ctf" ".*" \
        "change to ctf target"

diff --git a/gdb/testsuite/gdb.trace/ax.exp b/gdb/testsuite/gdb.trace/ax.exp
index 9dee743c8ddb103ea141a9caba38380afe6eb0a3..9cc61d09182761a25e917c358714932b464ccc6c 100644 (file)
--- a/gdb/testsuite/gdb.trace/ax.exp
+++ b/gdb/testsuite/gdb.trace/ax.exp
@@ -20,9 +20,6 @@
 
 load_lib "trace-support.exp"
 
-
-gdb_exit
-gdb_start
 standard_testfile actions.c
 
 require gdb_trace_common_supports_arch
@@ -33,9 +30,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     return -1
 }
 
-gdb_load $binfile
+clean_restart $binfile
 runto_main
-gdb_reinitialize_dir $srcdir/$subdir
 
 gdb_test "maint agent 12" ".*const8 12.*pop.*end.*"
 

diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp
index 4c4f54d89bece2e830d9f4a37a195deb3b748c5a..b77e283c0b4a1fe43c08db2c8d038905afcff4fa 100644 (file)
--- a/gdb/testsuite/gdb.trace/change-loc.exp
+++ b/gdb/testsuite/gdb.trace/change-loc.exp
@@ -175,9 +175,7 @@ proc tracepoint_change_loc_2 { trace_type } {
        global binfile
        global gdb_prompt
 
-       gdb_exit
-       gdb_start
-       gdb_reinitialize_dir $srcdir/$subdir
+       clean_restart
 
        gdb_test_multiple "${trace_type} set_tracepoint" "set pending tracepoint" {
            -re ".*Make \(|fast \)tracepoint pending.*y or \\\[n\\\]. $" {

diff --git a/gdb/testsuite/gdb.trace/deltrace.exp b/gdb/testsuite/gdb.trace/deltrace.exp
index cfcb81e8c91baec4e5d0c139d3e515f536af98e2..a849d96f432a752b33181b6b0284fb2547c35b3d 100644 (file)
--- a/gdb/testsuite/gdb.trace/deltrace.exp
+++ b/gdb/testsuite/gdb.trace/deltrace.exp
@@ -17,10 +17,6 @@
 
 load_lib "trace-support.exp"
 
-
-gdb_exit
-gdb_start
-
 standard_testfile actions.c
 
 require gdb_trace_common_supports_arch
@@ -30,11 +26,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     untested "failed to compile"
     return -1
 }
-gdb_reinitialize_dir $srcdir/$subdir
-
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
 
+clean_restart
 gdb_file_cmd $binfile
 
 # define relative source line numbers:

diff --git a/gdb/testsuite/gdb.trace/entry-values.exp b/gdb/testsuite/gdb.trace/entry-values.exp
index d7e5a89f2816da2d228003e4e22ca52d3fc5cbf5..9fbad50e3bd3d78e006c93ba723557e986344868 100644 (file)
--- a/gdb/testsuite/gdb.trace/entry-values.exp
+++ b/gdb/testsuite/gdb.trace/entry-values.exp
@@ -29,14 +29,7 @@ if  {[gdb_compile [list ${binfile}1.o] \
     return -1
 }
 
-# Start GDB and load executable file, compute the offset of the
-# instruction in bar returned from foo.  It is needed in the Dwarf
-# Assembler.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}1
+clean_restart ${binfile}1
 
 set returned_from_foo ""
 
@@ -83,8 +76,6 @@ if { [string equal $returned_from_foo ""] } {
     return -1
 }
 
-gdb_exit
-
 # Make some DWARF for the test.
 set asm_file [standard_output_file $srcfile2]
 Dwarf::assemble $asm_file {

diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trace/infotrace.exp
index 1252b30c0f5876dc236b152277367fe503eb7caa..83660bed7a5c494b0ccbc2c9a6d0335b62955b51 100644 (file)
--- a/gdb/testsuite/gdb.trace/infotrace.exp
+++ b/gdb/testsuite/gdb.trace/infotrace.exp
@@ -18,9 +18,6 @@
 load_lib "trace-support.exp"
 
 
-gdb_exit
-gdb_start
-
 standard_testfile actions.c
 
 require gdb_trace_common_supports_arch
@@ -30,11 +27,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     untested "failed to compile"
     return -1
 }
-gdb_reinitialize_dir $srcdir/$subdir
-
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
 
+clean_restart
 gdb_file_cmd $binfile
 
 #

diff --git a/gdb/testsuite/gdb.trace/packetlen.exp b/gdb/testsuite/gdb.trace/packetlen.exp
index 31686bcb3bb0f773a7c6f8b5fd8b48028fa9f65f..df4badc35bd5e5bdfe4548a9a43fd5a0c68f89cd 100644 (file)
--- a/gdb/testsuite/gdb.trace/packetlen.exp
+++ b/gdb/testsuite/gdb.trace/packetlen.exp
@@ -17,10 +17,6 @@
 
 load_lib "trace-support.exp"
 
-
-gdb_exit
-gdb_start
-
 standard_testfile actions.c
 require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
@@ -28,11 +24,11 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     untested "failed to compile"
     return -1
 }
-gdb_load $binfile
+
+clean_restart $binfile
 gdb_test "tstop"       ".*" ""
 gdb_test "tfind none"  ".*" ""
 runto_main
-gdb_reinitialize_dir $srcdir/$subdir
 
 if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"

diff --git a/gdb/testsuite/gdb.trace/passc-dyn.exp b/gdb/testsuite/gdb.trace/passc-dyn.exp
index c005c79053b1d39a3abd7ccecb1afd7e719a61e3..26a2cac4dd91f15580aa53225763427a0f09d9a5 100644 (file)
--- a/gdb/testsuite/gdb.trace/passc-dyn.exp
+++ b/gdb/testsuite/gdb.trace/passc-dyn.exp
@@ -17,9 +17,6 @@
 
 load_lib "trace-support.exp"
 
-
-gdb_exit
-gdb_start
 standard_testfile actions.c
 require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
@@ -27,9 +24,9 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     untested "failed to compile"
     return -1
 }
-gdb_load $binfile
+
+clean_restart $binfile
 runto_main
-gdb_reinitialize_dir $srcdir/$subdir
 
 if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"

diff --git a/gdb/testsuite/gdb.trace/passcount.exp b/gdb/testsuite/gdb.trace/passcount.exp
index 3f7114960837816bafd7621267568b38dedde400..f2b70c3f3ade58ec9d2654604a8408ab8f6f0881 100644 (file)
--- a/gdb/testsuite/gdb.trace/passcount.exp
+++ b/gdb/testsuite/gdb.trace/passcount.exp
@@ -17,9 +17,6 @@
 
 load_lib "trace-support.exp"
 
-
-gdb_exit
-gdb_start
 standard_testfile actions.c
 require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
@@ -27,11 +24,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     untested "failed to compile"
     return -1
 }
-gdb_reinitialize_dir $srcdir/$subdir
-
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
 
+clean_restart
 gdb_file_cmd $binfile
 
 # define relative source line numbers:

diff --git a/gdb/testsuite/gdb.trace/pending.exp b/gdb/testsuite/gdb.trace/pending.exp
index 76d286528202b436d0539a47a2ff5a0224ee5ce2..da355bcdaeef2b248261ff73c1e5bfca0489d07f 100644 (file)
--- a/gdb/testsuite/gdb.trace/pending.exp
+++ b/gdb/testsuite/gdb.trace/pending.exp
@@ -66,9 +66,7 @@ proc pending_tracepoint_resolved { trace_type } {
        global lib_sl1
 
        # Start with a fresh gdb.
-       gdb_exit
-       gdb_start
-       gdb_reinitialize_dir $srcdir/$subdir
+       clean_restart
 
        gdb_test_multiple "$trace_type set_point1" "set pending tracepoint" {
            -re ".*Make \(fast |\)tracepoint pending.*y or \\\[n\\\]. $" {

diff --git a/gdb/testsuite/gdb.trace/read-memory.exp b/gdb/testsuite/gdb.trace/read-memory.exp
index 9d82939ca747dc4f28640798886a961394f3afc0..f3a8d09d5f9a660434acae0ed8091d1c2e5d6734 100644 (file)
--- a/gdb/testsuite/gdb.trace/read-memory.exp
+++ b/gdb/testsuite/gdb.trace/read-memory.exp
@@ -127,9 +127,7 @@ proc teset_from_exec { target } {
     global tracefile
 
     # Restart GDB and read the trace data in ${target} target.
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
+    clean_restart
     gdb_file_cmd $binfile
 
     gdb_test "target ${target} ${tracefile}.${target}" ".*" \

diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp
index 33bccaa1a6aaf023fc00bddcee01b18b9d941fd9..14db2511d40cc392061d2dfd89dfac5168fbb07c 100644 (file)
--- a/gdb/testsuite/gdb.trace/report.exp
+++ b/gdb/testsuite/gdb.trace/report.exp
@@ -17,10 +17,6 @@
 
 load_lib "trace-support.exp"
 
-
-gdb_exit
-gdb_start
-
 standard_testfile actions.c
 require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
@@ -28,9 +24,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     untested "failed to compile"
     return -1
 }
-gdb_load $binfile
+clean_restart $binfile
 runto_main
-gdb_reinitialize_dir $srcdir/$subdir
 
 if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"

diff --git a/gdb/testsuite/gdb.trace/save-trace.exp b/gdb/testsuite/gdb.trace/save-trace.exp
index 71a094a25dcfc4eabb42f096430e116bb1dcad1b..501e171b1869e4135a6e674a26b5c0e6058ad058 100644 (file)
--- a/gdb/testsuite/gdb.trace/save-trace.exp
+++ b/gdb/testsuite/gdb.trace/save-trace.exp
@@ -18,9 +18,6 @@
 load_lib "trace-support.exp"
 
 
-gdb_exit
-gdb_start
-
 standard_testfile actions.c
 require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
@@ -28,11 +25,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     untested "failed to compile"
     return -1
 }
-gdb_reinitialize_dir $srcdir/$subdir
-
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
 
+clean_restart
 gdb_file_cmd $binfile
 
 # define relative source line numbers:

diff --git a/gdb/testsuite/gdb.trace/tfile.exp b/gdb/testsuite/gdb.trace/tfile.exp
index 68e951b1c83bae54ba884b1f6e6f968efad56192..c62f7e3e9e4032511cf0bcd18bc56c9b71f33cf9 100644 (file)
--- a/gdb/testsuite/gdb.trace/tfile.exp
+++ b/gdb/testsuite/gdb.trace/tfile.exp
@@ -121,10 +121,7 @@ gdb_test "info registers" "The program has no registers now\." \
 
 # Now start afresh, using only a trace file.
 
-gdb_exit
-gdb_start
-
-gdb_load $binfile
+clean_restart $binfile
 
 gdb_test "target tfile $tfile_error" "Created tracepoint.*" \
     "target tfile [file tail $tfile_error]"

diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tfind.exp
index 4579e85ed8678932d86452bf1520b7c515ac0f6d..2dbc42bb6313f793bdcedd24126ca2e6d939da1f 100644 (file)
--- a/gdb/testsuite/gdb.trace/tfind.exp
+++ b/gdb/testsuite/gdb.trace/tfind.exp
@@ -17,10 +17,6 @@
 
 load_lib "trace-support.exp"
 
-
-gdb_exit
-gdb_start
-
 standard_testfile actions.c
 
 require gdb_trace_common_supports_arch
@@ -30,7 +26,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" "$binfile" \
     untested "failed to compile"
     return -1
 }
-gdb_load $binfile
+
+clean_restart $binfile
 
 # 6.2 test help tstart
 gdb_test "help tstart" \
@@ -60,7 +57,6 @@ gdb_test "help tfind trace" "Select a trace frame by tracepoint number.*" \
        "8.38: help tfind tracepoint"
 
 runto_main
-gdb_reinitialize_dir $srcdir/$subdir
 
 if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"

diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp
index 7ce6f59e2c97fd2d4341d548f0020eef7024d8de..3fed8dad2ec61ad3bbc31d1060aa5609476a09a5 100644 (file)
--- a/gdb/testsuite/gdb.trace/tracecmd.exp
+++ b/gdb/testsuite/gdb.trace/tracecmd.exp
@@ -17,9 +17,6 @@
 
 load_lib "trace-support.exp"
 
-
-gdb_exit
-gdb_start
 standard_testfile actions.c
 require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
@@ -27,11 +24,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     untested "failed to compile"
     return -1
 }
-gdb_reinitialize_dir $srcdir/$subdir
-
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
 
+clean_restart
 gdb_file_cmd $binfile
 
 # define relative source line numbers:

diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp
index ea7ad55143ae94bebedd2c3be15ec2efb1be1dc2..2319444fab19164b7f8191bf4fe00eb923d5a69f 100644 (file)
--- a/gdb/testsuite/gdb.trace/tsv.exp
+++ b/gdb/testsuite/gdb.trace/tsv.exp
@@ -15,9 +15,6 @@
 
 load_lib "trace-support.exp"
 
-
-gdb_exit
-gdb_start
 standard_testfile actions.c
 require gdb_trace_common_supports_arch
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
@@ -25,7 +22,8 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     untested "failed to compile"
     return -1
 }
-gdb_load $binfile
+
+clean_restart $binfile
 
 # PR gdb/21352: Command tsave does not support -r argument
 gdb_test "tsave -r" "Argument required \\\(file in which to save trace data\\\)\." \

diff --git a/gdb/testsuite/gdb.trace/unavailable.exp b/gdb/testsuite/gdb.trace/unavailable.exp
index 65fc56c338393f9e255c5098d6d92208d7801f07..dfb1067d1987c7c062197ac93d655cd85cd62e89 100644 (file)
--- a/gdb/testsuite/gdb.trace/unavailable.exp
+++ b/gdb/testsuite/gdb.trace/unavailable.exp
@@ -202,9 +202,7 @@ proc gdb_collect_args_test {} {
 
        foreach target_name ${trace_file_targets} {
            # Restart GDB and read the trace data in ${TARGET_NAME} target.
-           gdb_exit
-           gdb_start
-           gdb_reinitialize_dir $srcdir/$subdir
+           clean_restart
            gdb_file_cmd $binfile
            gdb_test "target ${target_name} ${tracefile}.args.${target_name}" ".*" \
                "change to ${target_name} target"
@@ -286,9 +284,7 @@ proc gdb_collect_locals_test { func msg } {
 
        foreach target_name ${trace_file_targets} {
            # Restart GDB and read the trace data in ${TARGET_NAME} target.
-           gdb_exit
-           gdb_start
-           gdb_reinitialize_dir $srcdir/$subdir
+           clean_restart
            gdb_file_cmd $binfile
            gdb_test "target ${target_name} ${tracefile}.locals.${target_name}" ".*" \
                "change to ${target_name} target"
@@ -369,9 +365,7 @@ proc gdb_unavailable_registers_test { } {
 
        foreach target_name ${trace_file_targets} {
            # Restart GDB and read the trace data in ${TARGET_NAME} target.
-           gdb_exit
-           gdb_start
-           gdb_reinitialize_dir $srcdir/$subdir
+           clean_restart
            gdb_file_cmd $binfile
            gdb_test "target ${target_name} ${tracefile}.registers.${target_name}" ".*" \
                "change to ${target_name} target"
@@ -433,9 +427,7 @@ proc gdb_unavailable_floats { } {
 
        foreach target_name ${trace_file_targets} {
            # Restart GDB and read the trace data in ${TARGET_NAME} target.
-           gdb_exit
-           gdb_start
-           gdb_reinitialize_dir $srcdir/$subdir
+           clean_restart
            gdb_file_cmd $binfile
            gdb_test "target ${target_name} ${tracefile}.floats.${target_name}" ".*" \
                "change to ${target_name} target"
@@ -701,9 +693,7 @@ proc gdb_collect_globals_test { } {
 
        foreach target_name ${trace_file_targets} {
            # Restart GDB and read the trace data in ${TARGET_NAME} target.
-           gdb_exit
-           gdb_start
-           gdb_reinitialize_dir $srcdir/$subdir
+           clean_restart
            gdb_file_cmd $binfile
            gdb_test "target ${target_name} ${tracefile}.globals.${target_name}" ".*" \
                "change to ${target_name} target"

diff --git a/gdb/testsuite/gdb.trace/while-dyn.exp b/gdb/testsuite/gdb.trace/while-dyn.exp
index 960a95926b7351dafafbe8a5f32ca4ec17e18850..797020e767409fba6a357db640823b80a6c28940 100644 (file)
--- a/gdb/testsuite/gdb.trace/while-dyn.exp
+++ b/gdb/testsuite/gdb.trace/while-dyn.exp
@@ -17,10 +17,6 @@
 
 load_lib "trace-support.exp"
 
-
-gdb_exit
-gdb_start
-
 standard_testfile actions.c
 set executable $testfile
 require gdb_trace_common_supports_arch
@@ -29,9 +25,9 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     untested "failed to compile"
     return -1
 }
-gdb_load $binfile
+
+clean_restart $binfile
 runto_main
-gdb_reinitialize_dir $srcdir/$subdir
 
 if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"

diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb.trace/while-stepping.exp
index 64c0c9ed84f669a7328bc0f5bcabc09c843dc62e..995b5a083a414b16f299a5b4e0cdfc8184182e12 100644 (file)
--- a/gdb/testsuite/gdb.trace/while-stepping.exp
+++ b/gdb/testsuite/gdb.trace/while-stepping.exp
@@ -17,10 +17,6 @@
 
 load_lib "trace-support.exp"
 
-
-gdb_exit
-gdb_start
-
 standard_testfile actions.c
 require gdb_trace_common_supports_arch
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $binfile \
@@ -28,11 +24,8 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $binfile \
     untested "failed to compile"
     return -1
 }
-gdb_reinitialize_dir $srcdir/$subdir
-
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
 
+clean_restart
 gdb_file_cmd $binfile
 
 #
@@ -151,9 +144,7 @@ gdb_test "tsave -ctf ${tracefile}.ctf" \
     "save ctf trace file"
 
 # Restart GDB and read the trace data in tfile target.
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
+clean_restart
 gdb_file_cmd $binfile
 gdb_test "target tfile ${tracefile}.tf" ".*" \
     "change to tfile target"
@@ -171,9 +162,7 @@ gdb_test_multiple "target ctf" "" {
 }
 
 if { $gdb_can_read_ctf_data } {
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
+    clean_restart
     gdb_file_cmd $binfile
     gdb_test "target ctf ${tracefile}.ctf" ".*" \
        "change to ctf target"