[gdb/testsuite] Fix clean_restart <absolute filename> in gdb.trace

Fix clean_restart <absolute filename> in the test-cases in gdb.trace.

Tested on x86_64-linux, with target boards unix, native-gdbserver and
native-extended-gdbserver.

diff --git a/gdb/testsuite/gdb.trace/ax.exp b/gdb/testsuite/gdb.trace/ax.exp
index 3380cdff8311f99867a65fb7c858e8eb08e10106..cc40853dd8718845112c0643c1eb1c30526960ee 100644 (file)
--- a/gdb/testsuite/gdb.trace/ax.exp
+++ b/gdb/testsuite/gdb.trace/ax.exp
@@ -30,7 +30,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     return -1
 }
 
-clean_restart $binfile
+clean_restart $testfile
 runto_main
 
 gdb_test "maint agent 12" ".*const8 12.*pop.*end.*"

diff --git a/gdb/testsuite/gdb.trace/basic-libipa.exp b/gdb/testsuite/gdb.trace/basic-libipa.exp
index e7612ac3c15e74e90dfac14f638102684e336582..27be96b87a73fa6c143dbe95fe3a4673c57f457d 100644 (file)
--- a/gdb/testsuite/gdb.trace/basic-libipa.exp
+++ b/gdb/testsuite/gdb.trace/basic-libipa.exp
@@ -42,7 +42,7 @@ save_vars { env(ASAN_OPTIONS) } {
     # LD_PRELOAD.
     append_environment_default ASAN_OPTIONS verify_asan_link_order 0
 
-    clean_restart $binfile
+    clean_restart $testfile
 }
 
 if {![runto_main]} {

diff --git a/gdb/testsuite/gdb.trace/entry-values.exp b/gdb/testsuite/gdb.trace/entry-values.exp
index f6bcf66c5551829bff09e477e2c0752675340711..161496a53078ebed55b67844f6677cc079e773b0 100644 (file)
--- a/gdb/testsuite/gdb.trace/entry-values.exp
+++ b/gdb/testsuite/gdb.trace/entry-values.exp
@@ -29,7 +29,7 @@ if  {[gdb_compile [list ${binfile}1.o] \
     return -1
 }
 
-clean_restart ${binfile}1
+clean_restart ${testfile}1
 
 set returned_from_foo ""
 
@@ -193,7 +193,7 @@ gdb_test_sequence "bt" "bt, 2" {
 
 # Restart GDB and trace.
 
-clean_restart $binfile
+clean_restart $testfile
 
 load_lib "trace-support.exp"
 

diff --git a/gdb/testsuite/gdb.trace/ftrace-lock.exp b/gdb/testsuite/gdb.trace/ftrace-lock.exp
index 36a7566a91eb1bd5df618b586ab131418c7bcd31..8c9d4aaca8ee750f6712c3710f7ab553d207489e 100644 (file)
--- a/gdb/testsuite/gdb.trace/ftrace-lock.exp
+++ b/gdb/testsuite/gdb.trace/ftrace-lock.exp
@@ -32,7 +32,7 @@ set options [list debug pthreads [gdb_target_symbol_prefix_flags] \
             additional_flags=-DNUM_THREADS=$NUM_THREADS]
 
 with_test_prefix "runtime trace support check" {
-    if { [prepare_for_testing "prepare for testing" ${binfile}-check \
+    if { [prepare_for_testing "prepare for testing" ${testfile}-check \
              $srcfile $options] } {
        return
     }
@@ -55,7 +55,7 @@ set remote_libipa [gdb_load_shlib $libipa]
 lappend options shlib=$libipa
 
 if { [prepare_for_testing "prepare for testing with libipa" \
-         $binfile $srcfile $options] } {
+         $testfile $srcfile $options] } {
     return
 }
 

diff --git a/gdb/testsuite/gdb.trace/packetlen.exp b/gdb/testsuite/gdb.trace/packetlen.exp
index cf9fcc4a68ca8a400c6be3628629b72ed37e5031..52a34b9cf322babac512e5b3ce61b6ae85effb85 100644 (file)
--- a/gdb/testsuite/gdb.trace/packetlen.exp
+++ b/gdb/testsuite/gdb.trace/packetlen.exp
@@ -25,7 +25,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     return -1
 }
 
-clean_restart $binfile
+clean_restart $testfile
 gdb_test "tstop"       ".*" ""
 gdb_test "tfind none"  ".*" ""
 runto_main

diff --git a/gdb/testsuite/gdb.trace/passc-dyn.exp b/gdb/testsuite/gdb.trace/passc-dyn.exp
index 0a67df1bbc8a278bdec31aad53591272a8dbac4e..b4ec45a6ce42a828d394873cdbe7ea98e92f5054 100644 (file)
--- a/gdb/testsuite/gdb.trace/passc-dyn.exp
+++ b/gdb/testsuite/gdb.trace/passc-dyn.exp
@@ -25,7 +25,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     return -1
 }
 
-clean_restart $binfile
+clean_restart $testfile
 runto_main
 
 if {![gdb_target_supports_trace]} {

diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp
index 45857a16a84754145fc6aaa2c2350bd31cd49074..f2a04f7e63dcaea35156dc47c1cae71b08d0c820 100644 (file)
--- a/gdb/testsuite/gdb.trace/report.exp
+++ b/gdb/testsuite/gdb.trace/report.exp
@@ -24,7 +24,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     untested "failed to compile"
     return -1
 }
-clean_restart $binfile
+clean_restart $testfile
 runto_main
 
 if {![gdb_target_supports_trace]} {

diff --git a/gdb/testsuite/gdb.trace/tfile.exp b/gdb/testsuite/gdb.trace/tfile.exp
index 020f4d4ce595ae5e1444694344cdccd2d79af63a..4d156f7bec978f72a268451606ad5297945ac011 100644 (file)
--- a/gdb/testsuite/gdb.trace/tfile.exp
+++ b/gdb/testsuite/gdb.trace/tfile.exp
@@ -61,7 +61,7 @@ if {!$purely_local} {
     remote_download host [remote_upload target tfile-error.tf] tfile-error.tf
 }
 
-clean_restart $binfile
+clean_restart $testfile
 
 # Program has presumably exited, now target a trace file it created.
 
@@ -121,7 +121,7 @@ gdb_test "info registers" "The program has no registers now\." \
 
 # Now start afresh, using only a trace file.
 
-clean_restart $binfile
+clean_restart $testfile
 
 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 ae732066c281613f26728194b600556c9bd6a237..92386e410b115266c0213f2f027a5ee3744ee997 100644 (file)
--- a/gdb/testsuite/gdb.trace/tfind.exp
+++ b/gdb/testsuite/gdb.trace/tfind.exp
@@ -27,7 +27,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" "$binfile" \
     return -1
 }
 
-clean_restart $binfile
+clean_restart $testfile
 
 # 6.2 test help tstart
 gdb_test "help tstart" \

diff --git a/gdb/testsuite/gdb.trace/trace-mt.exp b/gdb/testsuite/gdb.trace/trace-mt.exp
index 0c6e4e520073ab3d33198ba45fa9c5dfd862c6cc..092dc6d9578d4378442395d4a2051a77e78221a2 100644 (file)
--- a/gdb/testsuite/gdb.trace/trace-mt.exp
+++ b/gdb/testsuite/gdb.trace/trace-mt.exp
@@ -22,7 +22,7 @@ set additional_flags [gdb_target_symbol_prefix_flags]
 require gdb_trace_common_supports_arch
 
 with_test_prefix "runtime trace support check" {
-    if { [prepare_for_testing "prepare for testing" ${binfile} $srcfile \
+    if { [prepare_for_testing "prepare for testing" $testfile $srcfile \
              [list debug pthreads $additional_flags]] } {
        return
     }
@@ -37,13 +37,13 @@ with_test_prefix "runtime trace support check" {
     }
 }
 
-proc step_over_tracepoint { binfile trace_type } \
+proc step_over_tracepoint { testfile trace_type } \
 {with_test_prefix "step over $trace_type" \
 {
     global hex
 
     # Start with a fresh gdb.
-    clean_restart $binfile
+    clean_restart $testfile
 
     # Make sure inferior is running in all-stop mode.
     gdb_test_no_output "set non-stop 0"
@@ -63,13 +63,13 @@ proc step_over_tracepoint { binfile trace_type } \
 
 # Set breakpoint and tracepoint at the same address.
 
-proc break_trace_same_addr { binfile trace_type option } \
+proc break_trace_same_addr { testfile trace_type option } \
 {with_test_prefix "$trace_type $option" \
 {
     global hex
 
     # Start with a fresh gdb.
-    clean_restart $binfile
+    clean_restart $testfile
     if ![runto_main] {
        return -1
     }
@@ -96,10 +96,10 @@ proc break_trace_same_addr { binfile trace_type option } \
 }}
 
 foreach break_always_inserted { "on" "off" } {
-    break_trace_same_addr $binfile "trace" ${break_always_inserted}
+    break_trace_same_addr $testfile "trace" ${break_always_inserted}
 }
 
-step_over_tracepoint $binfile "trace"
+step_over_tracepoint $testfile "trace"
 
 require allow_shlib_tests
 
@@ -108,8 +108,8 @@ set libipa [get_in_proc_agent]
 set remote_libipa [gdb_load_shlib $libipa]
 
 # Compile test case again with IPA.
-set binfile_ipa ${binfile}-ipa
-if { [prepare_for_testing "prepare for testing" $binfile_ipa $srcfile \
+set testfile_ipa $testfile-ipa
+if { [prepare_for_testing "prepare for testing" $testfile_ipa $srcfile \
          [list debug pthreads $additional_flags shlib=$libipa]] } {
     return
 }
@@ -122,8 +122,8 @@ if { [gdb_test "info sharedlibrary" ".*${remote_libipa}.*" "IPA loaded"] != 0 }
     untested "could not find IPA lib loaded"
 } else {
     foreach break_always_inserted { "on" "off" } {
-       break_trace_same_addr $binfile_ipa "ftrace" ${break_always_inserted}
+       break_trace_same_addr $testfile_ipa "ftrace" ${break_always_inserted}
     }
 
-    step_over_tracepoint $binfile_ipa "ftrace"
+    step_over_tracepoint $testfile_ipa "ftrace"
 }

diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp
index 96c7c35b71a0d723b99d8c8dd39aaa8ac6a64e4d..837633d083bd3d69dcf993f6392fce640337c1b7 100644 (file)
--- a/gdb/testsuite/gdb.trace/tsv.exp
+++ b/gdb/testsuite/gdb.trace/tsv.exp
@@ -23,7 +23,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     return -1
 }
 
-clean_restart $binfile
+clean_restart $testfile
 
 # PR gdb/21352: Command tsave does not support -r argument
 gdb_test "tsave -r" "Argument required \\\(file in which to save trace data\\\)\." \
@@ -193,7 +193,7 @@ gdb_test_multiple "target ctf ${tracefile}.ctf" "" {
 }
 
 # Restart.
-clean_restart ${binfile}
+clean_restart $testfile
 
 if {![runto_main]} {
     return

diff --git a/gdb/testsuite/gdb.trace/while-dyn.exp b/gdb/testsuite/gdb.trace/while-dyn.exp
index 53a8e5449ec780d5eaceba0ce6ca82cc18e174e3..3940ff67c835360abd3b3e398784c3825989b110 100644 (file)
--- a/gdb/testsuite/gdb.trace/while-dyn.exp
+++ b/gdb/testsuite/gdb.trace/while-dyn.exp
@@ -26,7 +26,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
     return -1
 }
 
-clean_restart $binfile
+clean_restart $testfile
 runto_main
 
 if {![gdb_target_supports_trace]} {