* gdb.trace/ax.exp: Use standard_testfile.
* gdb.trace/backtrace.exp: Use standard_testfile.
* gdb.trace/change-loc.exp: Use standard_testfile.
* gdb.trace/circ.exp: Use standard_testfile, prepare_for_testing.
* gdb.trace/collection.exp: Use standard_testfile,
prepare_for_testing.
* gdb.trace/deltrace.exp: Use standard_testfile.
* gdb.trace/disconnected-tracing.exp: Use standard_testfile.
* gdb.trace/ftrace.exp: Use standard_testfile.
* gdb.trace/infotrace.exp: Use standard_testfile.
* gdb.trace/packetlen.exp: Use standard_testfile.
* gdb.trace/passc-dyn.exp: Use standard_testfile.
* gdb.trace/passcount.exp: Use standard_testfile.
* gdb.trace/pending.exp: Use standard_testfile.
* gdb.trace/report.exp: Use standard_testfile.
* gdb.trace/save-trace.exp: Use standard_testfile.
* gdb.trace/stap-trace.exp: Use standard_testfile.
* gdb.trace/status-stop.exp: Use standard_testfile.
* gdb.trace/strace.exp: Use standard_testfile.
* gdb.trace/tfile.exp: Use standard_testfile.
* gdb.trace/tfind.exp: Use standard_testfile.
* gdb.trace/trace-break.exp: Use standard_testfile.
* gdb.trace/trace-mt.exp: Use standard_testfile.
* gdb.trace/tracecmd.exp: Use standard_testfile.
* gdb.trace/tspeed.exp: Use standard_testfile.
* gdb.trace/tstatus.exp: Use standard_testfile.
* gdb.trace/tsv.exp: Use standard_testfile.
* gdb.trace/unavailable.exp: Use standard_testfile,
prepare_for_testing.
* gdb.trace/while-dyn.exp: Use standard_testfile.
* gdb.trace/while-stepping.exp: Use standard_testfile.
+2012-06-26 Tom Tromey <tromey@redhat.com>
+
+ * gdb.trace/actions.exp: Use standard_testfile.
+ * gdb.trace/ax.exp: Use standard_testfile.
+ * gdb.trace/backtrace.exp: Use standard_testfile.
+ * gdb.trace/change-loc.exp: Use standard_testfile.
+ * gdb.trace/circ.exp: Use standard_testfile, prepare_for_testing.
+ * gdb.trace/collection.exp: Use standard_testfile,
+ prepare_for_testing.
+ * gdb.trace/deltrace.exp: Use standard_testfile.
+ * gdb.trace/disconnected-tracing.exp: Use standard_testfile.
+ * gdb.trace/ftrace.exp: Use standard_testfile.
+ * gdb.trace/infotrace.exp: Use standard_testfile.
+ * gdb.trace/packetlen.exp: Use standard_testfile.
+ * gdb.trace/passc-dyn.exp: Use standard_testfile.
+ * gdb.trace/passcount.exp: Use standard_testfile.
+ * gdb.trace/pending.exp: Use standard_testfile.
+ * gdb.trace/report.exp: Use standard_testfile.
+ * gdb.trace/save-trace.exp: Use standard_testfile.
+ * gdb.trace/stap-trace.exp: Use standard_testfile.
+ * gdb.trace/status-stop.exp: Use standard_testfile.
+ * gdb.trace/strace.exp: Use standard_testfile.
+ * gdb.trace/tfile.exp: Use standard_testfile.
+ * gdb.trace/tfind.exp: Use standard_testfile.
+ * gdb.trace/trace-break.exp: Use standard_testfile.
+ * gdb.trace/trace-mt.exp: Use standard_testfile.
+ * gdb.trace/tracecmd.exp: Use standard_testfile.
+ * gdb.trace/tspeed.exp: Use standard_testfile.
+ * gdb.trace/tstatus.exp: Use standard_testfile.
+ * gdb.trace/tsv.exp: Use standard_testfile.
+ * gdb.trace/unavailable.exp: Use standard_testfile,
+ prepare_for_testing.
+ * gdb.trace/while-dyn.exp: Use standard_testfile.
+ * gdb.trace/while-stepping.exp: Use standard_testfile.
+
2012-06-26 Tom Tromey <tromey@redhat.com>
* gdb.reverse/break-precsave.exp: Use standard_testfile.
gdb_exit
gdb_start
-set testfile "actions"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/actions
+standard_testfile
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
executable {debug nowarnings}] != "" } {
untested actions.exp
gdb_exit
gdb_start
-set testfile "actions"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/ax
+standard_testfile actions.c
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
executable {debug nowarnings}] != "" } {
untested ax.exp
gdb_exit
gdb_start
-set testfile "actions"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/backtrace
+standard_testfile actions.c
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
executable {debug nowarnings}] != "" } {
untested backtrace.exp
return 0
}
-set testfile "change-loc"
+standard_testfile
set libfile1 "change-loc-1"
set libfile2 "change-loc-2"
-set srcfile $testfile.c
set executable $testfile
set libsrc1 $srcdir/$subdir/$libfile1.c
set libsrc2 $srcdir/$subdir/$libfile2.c
-set binfile $objdir/$subdir/$testfile
-set lib_sl1 $objdir/$subdir/$libfile1.sl
-set lib_sl2 $objdir/$subdir/$libfile2.sl
+set lib_sl1 [standard_output_file $libfile1.sl]
+set lib_sl2 [standard_output_file $libfile2.sl]
set lib_opts debug
load_lib "trace-support.exp"
-set testfile "circ"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/$testfile
+standard_testfile
-if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
- executable {debug nowarnings}] != "" } {
- untested circ.exp
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug nowarnings}]} {
return -1
}
return 0;
}
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
gdb_test_no_output "set circular-trace-buffer on" \
"set circular-trace-buffer on"
load_lib "trace-support.exp"
-set testfile "collection"
-set srcfile ${testfile}.c
+standard_testfile
set executable $testfile
-set binfile $objdir/$subdir/$executable
-if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
- executable {debug nowarnings}] != "" } {
- untested collection.exp
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug nowarnings}]} {
return -1
}
}
-clean_restart $executable
runto_main
if { ![gdb_target_supports_trace] } then {
gdb_exit
gdb_start
-set testfile "actions"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/deltrace
+standard_testfile actions.c
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
executable {debug nowarnings}] != "" } {
untested deltrace.exp
load_lib "trace-support.exp";
-set testfile "disconnected-tracing"
-set executable $testfile
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/$testfile
+standard_testfile
+set executabel $testfile
set expfile $testfile.exp
set gdbserver_reconnect_p 1
load_lib "trace-support.exp";
-set testfile "ftrace"
+standard_testfile
set executable $testfile
-set srcfile $testfile.c
-set binfile $objdir/$subdir/$testfile
set expfile $testfile.exp
# Some targets have leading underscores on assembly symbols.
gdb_exit
gdb_start
-set testfile "actions"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/infotrace
+standard_testfile actions.c
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
executable {debug nowarnings}] != "" } {
untested infotrace.exp
gdb_exit
gdb_start
-set testfile "actions"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/packetlen
+standard_testfile actions.c
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
executable {debug nowarnings}] != "" } {
untested packetlen.exp
gdb_exit
gdb_start
-set testfile "actions"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/passc-dyn
+standard_testfile actions.c
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
executable {debug nowarnings}] != "" } {
untested passc-dyn.exp
gdb_exit
gdb_start
-set testfile "actions"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/passcount
+standard_testfile actions.c
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
executable {debug nowarnings}] != "" } {
untested passcount.exp
return 0
}
-set testfile "pending"
+standard_testfile
set libfile1 "pendshr1"
set libfile2 "pendshr2"
set executable $testfile
-set srcfile $testfile.c
set libsrc1 $srcdir/$subdir/$libfile1.c
set libsrc2 $srcdir/$subdir/$libfile2.c
-set binfile $objdir/$subdir/$testfile
-set lib_sl1 $objdir/$subdir/$libfile1.sl
-set lib_sl2 $objdir/$subdir/$libfile2.sl
+set lib_sl1 [standard_output_file $libfile1.sl]
+set lib_sl2 [standard_output_file $libfile2.sl]
set lib_opts [gdb_target_symbol_prefix_flags]
gdb_exit
gdb_start
-set testfile "actions"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/report
+standard_testfile actions.c
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
executable {debug nowarnings}] != "" } {
untested report.exp
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
# 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]
load_lib "trace-support.exp"
-set testfile "stap-trace"
-set srcfile ${testfile}.c
+standard_testfile
set executable ""
-set binfile_dir $objdir/$subdir
set ws "\[\r\n\t \]+"
set cr "\[\r\n\]+"
proc compile_stap_bin {exec_name {arg ""}} {
global srcfile
- global binfile_dir
global srcdir
global subdir
global executable
set executable ${exec_name}
if { [gdb_compile "$srcdir/$subdir/$srcfile" \
- "$binfile_dir/$exec_name" \
- executable [concat $arg debug nowarnings]] != "" } {
+ [standard_output_file $exec_name] \
+ executable [concat $arg debug nowarnings]] != "" } {
untested "Could not compile ${srcfile}"
return 0
}
load_lib "trace-support.exp";
-set testfile "status-stop"
+standard_testfile
set executable $testfile
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/$testfile
set expfile $testfile.exp
return 0
}
-set testfile "strace"
-set srcfile $testfile.c
-set binfile $objdir/$subdir/$testfile
+standard_testfile
set executable $testfile
set libipa [get_in_proc_agent]
gdb_exit
gdb_start
-set testfile "tfile"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/$testfile
+standard_testfile
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
executable {debug nowarnings}] != "" } {
untested ${testfile}.exp
gdb_exit
gdb_start
-set testfile "actions"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/tfind
+standard_testfile actions.c
if { [gdb_compile "$srcdir/$subdir/$srcfile" "$binfile" \
executable {debug nowarnings}] != "" } {
load_lib "trace-support.exp";
-set testfile "trace-break"
+standard_testfile
set executable $testfile
-set srcfile $testfile.c
-set binfile $objdir/$subdir/$testfile
set expfile $testfile.exp
# Some targets have leading underscores on assembly symbols.
load_lib "trace-support.exp";
-set testfile "trace-mt"
+standard_testfile
set executable $testfile
-set srcfile $testfile.c
-set binfile $objdir/$subdir/$testfile
set expfile $testfile.exp
# Some targets have leading underscores on assembly symbols.
gdb_exit
gdb_start
-set testfile "actions"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/tracecmd
+standard_testfile actions.c
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
executable {debug nowarnings}] != "" } {
untested tracecmd.exp
load_lib "trace-support.exp"
-set testfile "tspeed"
-set srcfile ${testfile}.c
+standard_testfile
set executable $testfile
-set binfile $objdir/$subdir/$executable
set ipalib [get_in_proc_agent]
load_lib "trace-support.exp"
-set testfile "actions"
+standard_testfile actions.c
set executable $testfile
-set srcfile $testfile.c
-set binfile $objdir/$subdir/$testfile
set expfile tstatus.exp
if [prepare_for_testing $expfile $executable $srcfile \
gdb_exit
gdb_start
-set testfile "actions"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/tsv
+standard_testfile actions.c
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
executable {debug nowarnings}] != "" } {
untested tsv.exp
load_lib "trace-support.exp"
-set testfile "unavailable"
-set srcfile ${testfile}.cc
+standard_testfile unavailable.cc
set executable $testfile
-set binfile $objdir/$subdir/$executable
-if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
- executable {debug nowarnings c++}] != "" } {
- untested unavailable.exp
+if {[prepare_for_testing $testfile.exp $testfile $srcfile \
+ {debug nowarnings c++}]} {
return -1
}
gdb_collect_locals_test statlocal_test_func "static locals"
}
-clean_restart $executable
runto_main
if { ![gdb_target_supports_trace] } then {
gdb_exit
gdb_start
-set testfile "actions"
-set srcfile $testfile.c
-set executable while-dyn
-set binfile $objdir/$subdir/$executable
+standard_testfile actions.c
+set executable $testfile
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
executable {debug nowarnings}] != "" } {
untested while-dyn.exp
gdb_exit
gdb_start
-set testfile "actions"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/while-stepping
+standard_testfile actions.c
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $binfile \
executable {debug nowarnings}] != "" } {
untested while-stepping.exp