Index: gdb/testsuite/gdb.trace/save-trace.exp |
diff --git a/gdb/testsuite/gdb.trace/save-trace.exp b/gdb/testsuite/gdb.trace/save-trace.exp |
index d0db3a694e368c68506f98d642af48abceb36fde..2a9061a089b938ad29d48481109495e746dc2eb5 100644 |
--- a/gdb/testsuite/gdb.trace/save-trace.exp |
+++ b/gdb/testsuite/gdb.trace/save-trace.exp |
@@ -17,17 +17,11 @@ |
load_lib "trace-support.exp"; |
-if $tracelevel then { |
- strace $tracelevel |
-} |
- |
gdb_exit |
gdb_start |
-set testfile "actions" |
-set srcfile ${testfile}.c |
-set binfile $objdir/$subdir/save-trace |
+standard_testfile actions.c |
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \ |
executable {debug nowarnings}] != "" } { |
untested save-trace.exp |
@@ -140,20 +134,21 @@ remote_file host delete savetrace.tr |
# 10.3 repeat with a path to the file |
-set escapedfilename [string_to_regexp $objdir/savetrace.tr] |
-remote_file host delete $objdir/savetrace.tr |
-gdb_test "save-tracepoints $objdir/savetrace.tr" \ |
+set trace_file_name [standard_output_file savetrace.tr] |
+set escapedfilename [string_to_regexp $trace_file_name] |
+remote_file host delete $trace_file_name |
+gdb_test "save-tracepoints $trace_file_name" \ |
"Saved to file '${escapedfilename}'." \ |
"10.3: save tracepoint definitions, full path" |
gdb_delete_tracepoints |
gdb_test_no_output "set default-collect" "10.3: clear default-collect" |
gdb_test "info tracepoints" "No tracepoints." "10.3: delete tracepoints" |
-gdb_test "source $objdir/savetrace.tr" \ |
+gdb_test "source $trace_file_name" \ |
"Tracepoint \[0-9\]+ at .*" \ |
"10.4: read saved tracepoints, full path" |
gdb_verify_tracepoints "10.3: verify recovered tracepoints, full path"; |
-remote_file host delete $objdir/savetrace.tr |
+remote_file host delete $trace_file_name |
# 10.5 invalid filename |
# [deferred -- not sure what a good invalid filename would be] |