* FYI: fix up gdb.trace
@ 2012-06-26 18:11 Tom Tromey
2012-06-27 4:19 ` Yao Qi
0 siblings, 1 reply; 4+ messages in thread
From: Tom Tromey @ 2012-06-26 18:11 UTC (permalink / raw)
To: gdb-patches
I'm checking this in.
This applies the standard_* cleanup to gdb.trace.
One issue I noticed in gdb.trace is that save-trace.exp saves a file in
".". This appears to be intentional; I did not change in the interests
of test stability, but this is generally a bad practice, as it can
introduce hard-to-find parallelism bugs.
Once the audit is done I'm going to run the test suite with write
permissions to "." disabled, to see what pops up...
Regtested on x86-64 Fedora 16.
Tom
2012-06-26 Tom Tromey <tromey@redhat.com>
* gdb.reverse/break-precsave.exp: Use standard_testfile.
* gdb.reverse/break-reverse.exp: Use standard_testfile.
* gdb.reverse/consecutive-precsave.exp: Use standard_testfile.
* gdb.reverse/consecutive-reverse.exp: Use standard_testfile.
* gdb.reverse/finish-precsave.exp: Use standard_testfile.
* gdb.reverse/finish-reverse-bkpt.exp: Use standard_testfile.
* gdb.reverse/finish-reverse.exp: Use standard_testfile.
* gdb.reverse/i386-precsave.exp: Use standard_testfile,
prepare_for_testing.
* gdb.reverse/i386-reverse.exp: Use standard_testfile,
prepare_for_testing.
* gdb.reverse/i386-sse-reverse.exp: Use standard_testfile,
prepare_for_testing.
* gdb.reverse/i387-env-reverse.exp: Use standard_testfile,
prepare_for_testing.
* gdb.reverse/i387-stack-reverse.exp: Use standard_testfile,
prepare_for_testing
* gdb.reverse/machinestate-precsave.exp: Use standard_testfile.
* gdb.reverse/machinestate.exp: Use standard_testfile.
* gdb.reverse/next-reverse-bkpt-over-sr.exp: Use standard_testfile.
* gdb.reverse/sigall-precsave.exp: Use standard_testfile,
build_executable.
* gdb.reverse/sigall-reverse.exp: Use standard_testfile,
build_executable.
* gdb.reverse/solib-precsave.exp: Use standard_testfile,
standard_output_file.
* gdb.reverse/solib-reverse.exp: Use standard_testfile,
standard_output_file.
* gdb.reverse/step-precsave.exp: Use standard_testfile.
* gdb.reverse/step-reverse.exp: Use standard_testfile.
* gdb.reverse/until-precsave.exp: Use standard_testfile.
* gdb.reverse/until-reverse.exp: Use standard_testfile.
* gdb.reverse/watch-precsave.exp: Use standard_testfile.
* gdb.reverse/watch-reverse.exp: Use standard_testfile.
Index: gdb.reverse/break-precsave.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/break-precsave.exp,v
retrieving revision 1.6
diff -u -r1.6 break-precsave.exp
--- gdb.reverse/break-precsave.exp 4 Jan 2012 08:27:49 -0000 1.6
+++ gdb.reverse/break-precsave.exp 26 Jun 2012 17:53:35 -0000
@@ -21,8 +21,7 @@
return
}
-set testfile "break-reverse"
-set srcfile ${testfile}.c
+standard_testfile break-reverse.c
if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
return -1
Index: gdb.reverse/break-reverse.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/break-reverse.exp,v
retrieving revision 1.6
diff -u -r1.6 break-reverse.exp
--- gdb.reverse/break-reverse.exp 4 Jan 2012 08:27:49 -0000 1.6
+++ gdb.reverse/break-reverse.exp 26 Jun 2012 17:53:35 -0000
@@ -20,8 +20,7 @@
return
}
-set testfile "break-reverse"
-set srcfile ${testfile}.c
+standard_testfile
if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
return -1
Index: gdb.reverse/consecutive-precsave.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/consecutive-precsave.exp,v
retrieving revision 1.8
diff -u -r1.8 consecutive-precsave.exp
--- gdb.reverse/consecutive-precsave.exp 4 Jan 2012 08:27:49 -0000 1.8
+++ gdb.reverse/consecutive-precsave.exp 26 Jun 2012 17:53:35 -0000
@@ -21,8 +21,7 @@
return
}
-set testfile "consecutive-reverse"
-set srcfile ${testfile}.c
+standard_testfile consecutive-reverse.c
if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
return -1
Index: gdb.reverse/consecutive-reverse.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/consecutive-reverse.exp,v
retrieving revision 1.8
diff -u -r1.8 consecutive-reverse.exp
--- gdb.reverse/consecutive-reverse.exp 4 Jan 2012 08:27:49 -0000 1.8
+++ gdb.reverse/consecutive-reverse.exp 26 Jun 2012 17:53:35 -0000
@@ -20,8 +20,7 @@
return
}
-set testfile "consecutive-reverse"
-set srcfile ${testfile}.c
+standard_testfile
if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
return -1
Index: gdb.reverse/finish-precsave.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/finish-precsave.exp,v
retrieving revision 1.6
diff -u -r1.6 finish-precsave.exp
--- gdb.reverse/finish-precsave.exp 4 Jan 2012 08:27:53 -0000 1.6
+++ gdb.reverse/finish-precsave.exp 26 Jun 2012 17:53:35 -0000
@@ -20,8 +20,7 @@
return
}
-set testfile "finish-reverse"
-set srcfile ${testfile}.c
+standard_testfile finish-reverse.c
if { [prepare_for_testing $testfile.exp "$testfile" $srcfile] } {
return -1
Index: gdb.reverse/finish-reverse-bkpt.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp,v
retrieving revision 1.3
diff -u -r1.3 finish-reverse-bkpt.exp
--- gdb.reverse/finish-reverse-bkpt.exp 4 Jan 2012 08:27:53 -0000 1.3
+++ gdb.reverse/finish-reverse-bkpt.exp 26 Jun 2012 17:53:35 -0000
@@ -23,8 +23,7 @@
return
}
-set testfile "finish-reverse-bkpt"
-set srcfile finish-reverse.c
+standard_testfile finish-reverse.c
if { [prepare_for_testing $testfile.exp "$testfile" $srcfile] } {
return -1
Index: gdb.reverse/finish-reverse.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/finish-reverse.exp,v
retrieving revision 1.8
diff -u -r1.8 finish-reverse.exp
--- gdb.reverse/finish-reverse.exp 4 Jan 2012 08:27:53 -0000 1.8
+++ gdb.reverse/finish-reverse.exp 26 Jun 2012 17:53:35 -0000
@@ -20,8 +20,7 @@
return
}
-set testfile "finish-reverse"
-set srcfile ${testfile}.c
+standard_testfile
if { [prepare_for_testing $testfile.exp "$testfile" $srcfile] } {
return -1
Index: gdb.reverse/i386-precsave.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/i386-precsave.exp,v
retrieving revision 1.10
diff -u -r1.10 i386-precsave.exp
--- gdb.reverse/i386-precsave.exp 16 Jan 2012 16:21:52 -0000 1.10
+++ gdb.reverse/i386-precsave.exp 26 Jun 2012 17:53:35 -0000
@@ -30,27 +30,19 @@
return
}
-set testfile "i386-precsave"
-set srcfile i386-reverse.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile i386-reverse.c
# some targets have leading underscores on assembly symbols.
set additional_flags [gdb_target_symbol_prefix_flags]
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } {
- untested ${testfile}.exp
+if {[prepare_for_testing $testfile.exp $testfile $srcfile \
+ [list debug $additional_flags]]} {
return -1
}
set end_of_main [gdb_get_line_number " end of main "]
set end_of_inc_dec_tests [gdb_get_line_number " end inc_dec_tests "]
-# Get things started.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
runto main
if [supports_process_record] {
Index: gdb.reverse/i386-reverse.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/i386-reverse.exp,v
retrieving revision 1.9
diff -u -r1.9 i386-reverse.exp
--- gdb.reverse/i386-reverse.exp 16 Jan 2012 16:21:52 -0000 1.9
+++ gdb.reverse/i386-reverse.exp 26 Jun 2012 17:53:35 -0000
@@ -29,27 +29,19 @@
return
}
-set testfile "i386-reverse"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
# some targets have leading underscores on assembly symbols.
set additional_flags [gdb_target_symbol_prefix_flags]
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } {
- untested i386-reverse
+if {[prepare_for_testing $testfile.exp $testfile $srcfile \
+ [list debug $additional_flags]]} {
return -1
}
set end_of_main [gdb_get_line_number " end of main "]
set end_of_inc_dec_tests [gdb_get_line_number " end inc_dec_tests "]
-# Get things started.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
runto main
if [supports_process_record] {
Index: gdb.reverse/i386-sse-reverse.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp,v
retrieving revision 1.12
diff -u -r1.12 i386-sse-reverse.exp
--- gdb.reverse/i386-sse-reverse.exp 29 Feb 2012 14:55:46 -0000 1.12
+++ gdb.reverse/i386-sse-reverse.exp 26 Jun 2012 17:53:35 -0000
@@ -29,15 +29,13 @@
return
}
-set testfile "i386-sse-reverse"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
# some targets have leading underscores on assembly symbols.
set additional_flags [gdb_target_symbol_prefix_flags]
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } {
- untested i386-sse-reverse
+if {[prepare_for_testing $testfile.exp $testfile $srcfile \
+ [list debug $additional_flags]]} {
return -1
}
@@ -46,12 +44,6 @@
set end_ssse3_test [gdb_get_line_number " end ssse3_test "]
set end_sse4_test [gdb_get_line_number " end sse4_test "]
-# Get things started.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
runto main
if [supports_process_record] {
Index: gdb.reverse/i387-env-reverse.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/i387-env-reverse.exp,v
retrieving revision 1.10
diff -u -r1.10 i387-env-reverse.exp
--- gdb.reverse/i387-env-reverse.exp 16 Jan 2012 16:21:52 -0000 1.10
+++ gdb.reverse/i387-env-reverse.exp 26 Jun 2012 17:53:35 -0000
@@ -21,24 +21,16 @@
return
}
-set testfile "i387-env-reverse"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
# some targets have leading underscores on assembly symbols.
set additional_flags [gdb_target_symbol_prefix_flags]
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } {
- untested ${testfile}.exp
+if {[prepare_for_testing $testfile.exp $testfile $srcfile \
+ [list debug $additional_flags]]} {
return -1
}
-# Get things started.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
runto main
# Record to end of main
Index: gdb.reverse/i387-stack-reverse.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp,v
retrieving revision 1.9
diff -u -r1.9 i387-stack-reverse.exp
--- gdb.reverse/i387-stack-reverse.exp 16 Jan 2012 16:21:52 -0000 1.9
+++ gdb.reverse/i387-stack-reverse.exp 26 Jun 2012 17:53:35 -0000
@@ -21,24 +21,16 @@
return
}
-set testfile "i387-stack-reverse"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
# some targets have leading underscores on assembly symbols.
set additional_flags [gdb_target_symbol_prefix_flags]
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } {
- untested ${testfile}.exp
+if {[prepare_for_testing $testfile.exp $testfile $srcfile \
+ [list debug $additional_flags]]} {
return -1
}
-# Get things started.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
runto main
# Record to end of main
Index: gdb.reverse/machinestate-precsave.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/machinestate-precsave.exp,v
retrieving revision 1.6
diff -u -r1.6 machinestate-precsave.exp
--- gdb.reverse/machinestate-precsave.exp 4 Jan 2012 08:27:54 -0000 1.6
+++ gdb.reverse/machinestate-precsave.exp 26 Jun 2012 17:53:35 -0000
@@ -40,11 +40,10 @@
return
}
-set testfile "machinestate"
-set srcfile ${testfile}.c
-set srcfile1 ms1.c
+standard_testfile machinestate.c ms1.c
-if { [prepare_for_testing $testfile.exp $testfile {machinestate.c ms1.c} ] } {
+if { [prepare_for_testing $testfile.exp $testfile \
+ [list $srcfile $srcfile2]] } {
return -1
}
Index: gdb.reverse/machinestate.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/machinestate.exp,v
retrieving revision 1.6
diff -u -r1.6 machinestate.exp
--- gdb.reverse/machinestate.exp 4 Jan 2012 08:27:54 -0000 1.6
+++ gdb.reverse/machinestate.exp 26 Jun 2012 17:53:35 -0000
@@ -39,11 +39,10 @@
return
}
-set testfile "machinestate"
-set srcfile ${testfile}.c
-set srcfile1 ms1.c
+standard_testfile .c ms1.c
-if { [prepare_for_testing $testfile.exp $testfile {machinestate.c ms1.c} ] } {
+if { [prepare_for_testing $testfile.exp $testfile \
+ [list $srcfile $srcfile2]] } {
return -1
}
Index: gdb.reverse/next-reverse-bkpt-over-sr.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp,v
retrieving revision 1.3
diff -u -r1.3 next-reverse-bkpt-over-sr.exp
--- gdb.reverse/next-reverse-bkpt-over-sr.exp 4 Jan 2012 08:27:54 -0000 1.3
+++ gdb.reverse/next-reverse-bkpt-over-sr.exp 26 Jun 2012 17:53:35 -0000
@@ -27,8 +27,7 @@
return
}
-set testfile "next-reverse-bkpt-over-sr"
-set srcfile step-reverse.c
+standard_testfile step-reverse.c
if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
return -1
Index: gdb.reverse/sigall-precsave.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/sigall-precsave.exp,v
retrieving revision 1.9
diff -u -r1.9 sigall-precsave.exp
--- gdb.reverse/sigall-precsave.exp 16 Jan 2012 16:21:52 -0000 1.9
+++ gdb.reverse/sigall-precsave.exp 26 Jun 2012 17:53:35 -0000
@@ -27,12 +27,10 @@
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
-set testfile sigall-precsave
-set srcfile sigall-reverse.c
-set binfile ${objdir}/${subdir}/${testfile}
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
- untested ${testfile}.exp
- return -1
+standard_testfile sigall-reverse.c
+
+if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
+ return -1
}
# Make the first signal SIGABRT because it is always supported.
Index: gdb.reverse/sigall-reverse.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/sigall-reverse.exp,v
retrieving revision 1.11
diff -u -r1.11 sigall-reverse.exp
--- gdb.reverse/sigall-reverse.exp 16 Jan 2012 16:21:52 -0000 1.11
+++ gdb.reverse/sigall-reverse.exp 26 Jun 2012 17:53:35 -0000
@@ -27,12 +27,10 @@
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
-set testfile sigall-reverse
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
- untested ${testfile}.exp
- return -1
+standard_testfile
+
+if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
+ return -1
}
# Make the first signal SIGABRT because it is always supported.
Index: gdb.reverse/solib-precsave.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/solib-precsave.exp,v
retrieving revision 1.9
diff -u -r1.9 solib-precsave.exp
--- gdb.reverse/solib-precsave.exp 21 Jun 2012 20:46:24 -0000 1.9
+++ gdb.reverse/solib-precsave.exp 26 Jun 2012 17:53:35 -0000
@@ -21,12 +21,10 @@
return
}
-set testfile "solib-reverse"
-set srcfile ${testfile}.c
+standard_testfile solib-reverse.c
set libfile "shr2"
set libsrc ${libfile}.c
-set library ${objdir}/${subdir}/${libfile}.sl
-set binfile ${objdir}/${subdir}/${testfile}
+set library [standard_output_file ${libfile}.sl]
if [get_compiler_info] {
return -1
Index: gdb.reverse/solib-reverse.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/solib-reverse.exp,v
retrieving revision 1.8
diff -u -r1.8 solib-reverse.exp
--- gdb.reverse/solib-reverse.exp 21 Jun 2012 20:46:24 -0000 1.8
+++ gdb.reverse/solib-reverse.exp 26 Jun 2012 17:53:35 -0000
@@ -20,12 +20,10 @@
return
}
-set testfile "solib-reverse"
-set srcfile ${testfile}.c
+standard_testfile
set libfile "shr2"
set libsrc ${libfile}.c
-set library ${objdir}/${subdir}/${libfile}.sl
-set binfile ${objdir}/${subdir}/${testfile}
+set library [standard_output_file ${libfile}.sl]
if [get_compiler_info] {
return -1
Index: gdb.reverse/step-precsave.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/step-precsave.exp,v
retrieving revision 1.6
diff -u -r1.6 step-precsave.exp
--- gdb.reverse/step-precsave.exp 4 Jan 2012 08:27:54 -0000 1.6
+++ gdb.reverse/step-precsave.exp 26 Jun 2012 17:53:35 -0000
@@ -25,8 +25,7 @@
return
}
-set testfile "step-reverse"
-set srcfile ${testfile}.c
+standard_testfile step-reverse.c
if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
return -1
Index: gdb.reverse/step-reverse.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/step-reverse.exp,v
retrieving revision 1.8
diff -u -r1.8 step-reverse.exp
--- gdb.reverse/step-reverse.exp 4 Jan 2012 08:27:54 -0000 1.8
+++ gdb.reverse/step-reverse.exp 26 Jun 2012 17:53:35 -0000
@@ -24,8 +24,7 @@
return
}
-set testfile "step-reverse"
-set srcfile ${testfile}.c
+standard_testfile
if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
return -1
Index: gdb.reverse/until-precsave.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/until-precsave.exp,v
retrieving revision 1.8
diff -u -r1.8 until-precsave.exp
--- gdb.reverse/until-precsave.exp 2 Feb 2012 18:10:07 -0000 1.8
+++ gdb.reverse/until-precsave.exp 26 Jun 2012 17:53:35 -0000
@@ -21,17 +21,16 @@
return
}
-set testfile "until-reverse"
-set srcfile ${testfile}.c
-set srcfile1 ur1.c
+standard_testfile until-reverse.c ur1.c
-if { [prepare_for_testing $testfile.exp $testfile {until-reverse.c ur1.c} ] } {
+if { [prepare_for_testing $testfile.exp $testfile \
+ [list $srcfile $srcfile2]] } {
return -1
}
set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
set bp_location7 [gdb_get_line_number "set breakpoint 7 here"]
-set bp_location9 [gdb_get_line_number "set breakpoint 9 here" "$srcfile1"]
+set bp_location9 [gdb_get_line_number "set breakpoint 9 here" "$srcfile2"]
set bp_location19 [gdb_get_line_number "set breakpoint 19 here"]
set bp_location20 [gdb_get_line_number "set breakpoint 20 here"]
set bp_location21 [gdb_get_line_number "set breakpoint 21 here"]
@@ -95,7 +94,7 @@
# Advance to a function called by main (marker2)
#
gdb_test "advance marker2" \
- "marker2 .a=43.*$srcfile1:$bp_location9.*" \
+ "marker2 .a=43.*$srcfile2:$bp_location9.*" \
"advance to marker2"
# Now issue an until with another function, not called by the current
@@ -126,7 +125,7 @@
#
gdb_test "advance marker2" \
- "marker2 .a=43.*$srcfile1:$bp_location9.*" \
+ "marker2 .a=43.*$srcfile2:$bp_location9.*" \
"reverse-advance to marker2"
# Finish out to main scope (backward)
Index: gdb.reverse/until-reverse.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/until-reverse.exp,v
retrieving revision 1.7
diff -u -r1.7 until-reverse.exp
--- gdb.reverse/until-reverse.exp 4 Jan 2012 08:27:54 -0000 1.7
+++ gdb.reverse/until-reverse.exp 26 Jun 2012 17:53:35 -0000
@@ -20,17 +20,16 @@
return
}
-set testfile "until-reverse"
-set srcfile ${testfile}.c
-set srcfile1 ur1.c
+standard_testfile .c ur1.c
-if { [prepare_for_testing $testfile.exp $testfile {until-reverse.c ur1.c} ] } {
+if { [prepare_for_testing $testfile.exp $testfile \
+ [list $srcfile $srcfile2]] } {
return -1
}
set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
set bp_location7 [gdb_get_line_number "set breakpoint 7 here"]
-set bp_location9 [gdb_get_line_number "set breakpoint 9 here" "$srcfile1"]
+set bp_location9 [gdb_get_line_number "set breakpoint 9 here" "$srcfile2"]
set bp_location19 [gdb_get_line_number "set breakpoint 19 here"]
set bp_location20 [gdb_get_line_number "set breakpoint 20 here"]
set bp_location21 [gdb_get_line_number "set breakpoint 21 here"]
@@ -71,7 +70,7 @@
# Advance to a function called by main (marker2)
#
gdb_test "advance marker2" \
- "marker2 .a=43.*$srcfile1:$bp_location9.*" \
+ "marker2 .a=43.*$srcfile2:$bp_location9.*" \
"advance to marker2"
# Now issue an until with another function, not called by the current
@@ -102,7 +101,7 @@
#
gdb_test "advance marker2" \
- "marker2 .a=43.*$srcfile1:$bp_location9.*" \
+ "marker2 .a=43.*$srcfile2:$bp_location9.*" \
"reverse-advance to marker2"
# Finish out to main scope (backward)
Index: gdb.reverse/watch-precsave.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/watch-precsave.exp,v
retrieving revision 1.9
diff -u -r1.9 watch-precsave.exp
--- gdb.reverse/watch-precsave.exp 4 Jan 2012 08:27:54 -0000 1.9
+++ gdb.reverse/watch-precsave.exp 26 Jun 2012 17:53:35 -0000
@@ -22,9 +22,7 @@
return
}
-set testfile "watch-reverse"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile watch-reverse.c
if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
return -1
Index: gdb.reverse/watch-reverse.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.reverse/watch-reverse.exp,v
retrieving revision 1.9
diff -u -r1.9 watch-reverse.exp
--- gdb.reverse/watch-reverse.exp 4 Jan 2012 08:27:54 -0000 1.9
+++ gdb.reverse/watch-reverse.exp 26 Jun 2012 17:53:35 -0000
@@ -22,9 +22,7 @@
return
}
-set testfile "watch-reverse"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
if { [prepare_for_testing $testfile.exp $testfile $srcfile] } {
return -1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: FYI: fix up gdb.trace
2012-06-26 18:11 FYI: fix up gdb.trace Tom Tromey
@ 2012-06-27 4:19 ` Yao Qi
2012-06-27 13:08 ` Tom Tromey
0 siblings, 1 reply; 4+ messages in thread
From: Yao Qi @ 2012-06-27 4:19 UTC (permalink / raw)
To: gdb-patches; +Cc: Tom Tromey
On Tuesday, June 26, 2012 12:11:24 PM Tom Tromey wrote:
> Regtested on x86-64 Fedora 16.
>
> Tom
>
> 2012-06-26 Tom Tromey <tromey@redhat.com>
>
> * gdb.reverse/break-precsave.exp: Use standard_testfile.
> * gdb.reverse/break-reverse.exp: Use standard_testfile.
Tom,
looks you posted the patch for gdb.reverse here, rather than patch for
gdb.trace.
--
Yao (齐尧)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: FYI: fix up gdb.trace
2012-06-27 4:19 ` Yao Qi
@ 2012-06-27 13:08 ` Tom Tromey
2012-07-13 8:16 ` [commit] testsuite: [Re: FYI: fix up gdb.trace] Jan Kratochvil
0 siblings, 1 reply; 4+ messages in thread
From: Tom Tromey @ 2012-06-27 13:08 UTC (permalink / raw)
To: Yao Qi; +Cc: gdb-patches
>>>>> "Yao" == Yao Qi <yao@codesourcery.com> writes:
Yao> looks you posted the patch for gdb.reverse here, rather than patch for
Yao> gdb.trace.
Oops, I'm sorry about that.
I've appended the real patch.
Tom
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.
diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp
index 18c778a..4400dbc 100644
--- a/gdb/testsuite/gdb.trace/actions.exp
+++ b/gdb/testsuite/gdb.trace/actions.exp
@@ -21,9 +21,7 @@ load_lib "trace-support.exp";
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
diff --git a/gdb/testsuite/gdb.trace/ax.exp b/gdb/testsuite/gdb.trace/ax.exp
index aa25f6c..9940a5e 100644
--- a/gdb/testsuite/gdb.trace/ax.exp
+++ b/gdb/testsuite/gdb.trace/ax.exp
@@ -23,9 +23,7 @@ load_lib "trace-support.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
diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trace/backtrace.exp
index 7d97893..5093266 100644
--- a/gdb/testsuite/gdb.trace/backtrace.exp
+++ b/gdb/testsuite/gdb.trace/backtrace.exp
@@ -21,9 +21,7 @@ load_lib "trace-support.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
diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp
index c881ae7..0064b6f 100644
--- a/gdb/testsuite/gdb.trace/change-loc.exp
+++ b/gdb/testsuite/gdb.trace/change-loc.exp
@@ -18,16 +18,14 @@ if {[skip_shlib_tests]} {
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
diff --git a/gdb/testsuite/gdb.trace/circ.exp b/gdb/testsuite/gdb.trace/circ.exp
index 67b4389..8300082 100644
--- a/gdb/testsuite/gdb.trace/circ.exp
+++ b/gdb/testsuite/gdb.trace/circ.exp
@@ -16,13 +16,9 @@
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
}
@@ -200,13 +196,6 @@ proc gdb_trace_circular_tests { } {
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"
diff --git a/gdb/testsuite/gdb.trace/collection.exp b/gdb/testsuite/gdb.trace/collection.exp
index 9beb9af..25544b5 100644
--- a/gdb/testsuite/gdb.trace/collection.exp
+++ b/gdb/testsuite/gdb.trace/collection.exp
@@ -16,14 +16,10 @@
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
}
@@ -776,7 +772,6 @@ proc gdb_trace_collection_test {} {
}
-clean_restart $executable
runto_main
if { ![gdb_target_supports_trace] } then {
diff --git a/gdb/testsuite/gdb.trace/deltrace.exp b/gdb/testsuite/gdb.trace/deltrace.exp
index 6baf1d2..2423de2 100644
--- a/gdb/testsuite/gdb.trace/deltrace.exp
+++ b/gdb/testsuite/gdb.trace/deltrace.exp
@@ -21,9 +21,7 @@ load_lib "trace-support.exp";
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
diff --git a/gdb/testsuite/gdb.trace/disconnected-tracing.exp b/gdb/testsuite/gdb.trace/disconnected-tracing.exp
index 9c35b76..64ce274 100644
--- a/gdb/testsuite/gdb.trace/disconnected-tracing.exp
+++ b/gdb/testsuite/gdb.trace/disconnected-tracing.exp
@@ -17,10 +17,8 @@
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
diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp
index 634d77b..56cd2fa 100644
--- a/gdb/testsuite/gdb.trace/ftrace.exp
+++ b/gdb/testsuite/gdb.trace/ftrace.exp
@@ -14,10 +14,8 @@
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.
diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trace/infotrace.exp
index 5a99d16..bdc3830 100644
--- a/gdb/testsuite/gdb.trace/infotrace.exp
+++ b/gdb/testsuite/gdb.trace/infotrace.exp
@@ -21,9 +21,7 @@ load_lib "trace-support.exp";
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
diff --git a/gdb/testsuite/gdb.trace/packetlen.exp b/gdb/testsuite/gdb.trace/packetlen.exp
index 4ce13e6..81f3d7d 100644
--- a/gdb/testsuite/gdb.trace/packetlen.exp
+++ b/gdb/testsuite/gdb.trace/packetlen.exp
@@ -21,9 +21,7 @@ load_lib "trace-support.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
diff --git a/gdb/testsuite/gdb.trace/passc-dyn.exp b/gdb/testsuite/gdb.trace/passc-dyn.exp
index 718a4da..0e6465b 100644
--- a/gdb/testsuite/gdb.trace/passc-dyn.exp
+++ b/gdb/testsuite/gdb.trace/passc-dyn.exp
@@ -20,9 +20,7 @@ load_lib "trace-support.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
diff --git a/gdb/testsuite/gdb.trace/passcount.exp b/gdb/testsuite/gdb.trace/passcount.exp
index a56c846..42f767a 100644
--- a/gdb/testsuite/gdb.trace/passcount.exp
+++ b/gdb/testsuite/gdb.trace/passcount.exp
@@ -20,9 +20,7 @@ load_lib "trace-support.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
diff --git a/gdb/testsuite/gdb.trace/pending.exp b/gdb/testsuite/gdb.trace/pending.exp
index 018ded2..750c031 100644
--- a/gdb/testsuite/gdb.trace/pending.exp
+++ b/gdb/testsuite/gdb.trace/pending.exp
@@ -18,16 +18,14 @@ if {[skip_shlib_tests]} {
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]
diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp
index 7c08a41..7153f07 100644
--- a/gdb/testsuite/gdb.trace/report.exp
+++ b/gdb/testsuite/gdb.trace/report.exp
@@ -21,9 +21,7 @@ load_lib "trace-support.exp";
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
diff --git a/gdb/testsuite/gdb.trace/save-trace.exp b/gdb/testsuite/gdb.trace/save-trace.exp
index e5cada7..2a9061a 100644
--- a/gdb/testsuite/gdb.trace/save-trace.exp
+++ b/gdb/testsuite/gdb.trace/save-trace.exp
@@ -21,9 +21,7 @@ load_lib "trace-support.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
@@ -136,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]
diff --git a/gdb/testsuite/gdb.trace/stap-trace.exp b/gdb/testsuite/gdb.trace/stap-trace.exp
index abc5af4..39db64b 100644
--- a/gdb/testsuite/gdb.trace/stap-trace.exp
+++ b/gdb/testsuite/gdb.trace/stap-trace.exp
@@ -15,10 +15,8 @@
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\]+"
@@ -31,7 +29,6 @@ if { ![istarget "x86_64-*"] && ![istarget "i?86-*"] } {
proc compile_stap_bin {exec_name {arg ""}} {
global srcfile
- global binfile_dir
global srcdir
global subdir
global executable
@@ -43,8 +40,8 @@ proc compile_stap_bin {exec_name {arg ""}} {
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
}
diff --git a/gdb/testsuite/gdb.trace/status-stop.exp b/gdb/testsuite/gdb.trace/status-stop.exp
index 9c2320e..61afdd5 100644
--- a/gdb/testsuite/gdb.trace/status-stop.exp
+++ b/gdb/testsuite/gdb.trace/status-stop.exp
@@ -14,10 +14,8 @@
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
diff --git a/gdb/testsuite/gdb.trace/strace.exp b/gdb/testsuite/gdb.trace/strace.exp
index b79fd9c..d9e90b6 100644
--- a/gdb/testsuite/gdb.trace/strace.exp
+++ b/gdb/testsuite/gdb.trace/strace.exp
@@ -18,9 +18,7 @@ if {[skip_shlib_tests]} {
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]
diff --git a/gdb/testsuite/gdb.trace/tfile.exp b/gdb/testsuite/gdb.trace/tfile.exp
index 391dfbb..a2c5c1d 100644
--- a/gdb/testsuite/gdb.trace/tfile.exp
+++ b/gdb/testsuite/gdb.trace/tfile.exp
@@ -30,9 +30,7 @@ if [target_info exists gdb,nofileio] {
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
diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tfind.exp
index d025f39..cce742e 100644
--- a/gdb/testsuite/gdb.trace/tfind.exp
+++ b/gdb/testsuite/gdb.trace/tfind.exp
@@ -21,9 +21,7 @@ load_lib "trace-support.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}] != "" } {
diff --git a/gdb/testsuite/gdb.trace/trace-break.exp b/gdb/testsuite/gdb.trace/trace-break.exp
index 2d19511..d75e2bc 100644
--- a/gdb/testsuite/gdb.trace/trace-break.exp
+++ b/gdb/testsuite/gdb.trace/trace-break.exp
@@ -14,10 +14,8 @@
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.
diff --git a/gdb/testsuite/gdb.trace/trace-mt.exp b/gdb/testsuite/gdb.trace/trace-mt.exp
index d6b619c..58990ac 100644
--- a/gdb/testsuite/gdb.trace/trace-mt.exp
+++ b/gdb/testsuite/gdb.trace/trace-mt.exp
@@ -14,10 +14,8 @@
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.
diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp
index 1581166..b4fc3e2 100644
--- a/gdb/testsuite/gdb.trace/tracecmd.exp
+++ b/gdb/testsuite/gdb.trace/tracecmd.exp
@@ -20,9 +20,7 @@ load_lib "trace-support.exp";
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
diff --git a/gdb/testsuite/gdb.trace/tspeed.exp b/gdb/testsuite/gdb.trace/tspeed.exp
index 5f7f36d..653b119 100644
--- a/gdb/testsuite/gdb.trace/tspeed.exp
+++ b/gdb/testsuite/gdb.trace/tspeed.exp
@@ -15,10 +15,8 @@
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]
diff --git a/gdb/testsuite/gdb.trace/tstatus.exp b/gdb/testsuite/gdb.trace/tstatus.exp
index 5c4055b..fdeb0dd 100644
--- a/gdb/testsuite/gdb.trace/tstatus.exp
+++ b/gdb/testsuite/gdb.trace/tstatus.exp
@@ -14,10 +14,8 @@
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 \
diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp
index b8af4d6..ce95835 100644
--- a/gdb/testsuite/gdb.trace/tsv.exp
+++ b/gdb/testsuite/gdb.trace/tsv.exp
@@ -18,9 +18,7 @@ load_lib "trace-support.exp";
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
diff --git a/gdb/testsuite/gdb.trace/unavailable.exp b/gdb/testsuite/gdb.trace/unavailable.exp
index 60bb41b..1fb75eb 100644
--- a/gdb/testsuite/gdb.trace/unavailable.exp
+++ b/gdb/testsuite/gdb.trace/unavailable.exp
@@ -15,14 +15,11 @@
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
}
@@ -588,7 +585,6 @@ proc gdb_trace_collection_test {} {
gdb_collect_locals_test statlocal_test_func "static locals"
}
-clean_restart $executable
runto_main
if { ![gdb_target_supports_trace] } then {
diff --git a/gdb/testsuite/gdb.trace/while-dyn.exp b/gdb/testsuite/gdb.trace/while-dyn.exp
index 3e8aa2d..7281a81 100644
--- a/gdb/testsuite/gdb.trace/while-dyn.exp
+++ b/gdb/testsuite/gdb.trace/while-dyn.exp
@@ -21,10 +21,8 @@ load_lib "trace-support.exp"
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
diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb.trace/while-stepping.exp
index 0e53815..5d8e066 100644
--- a/gdb/testsuite/gdb.trace/while-stepping.exp
+++ b/gdb/testsuite/gdb.trace/while-stepping.exp
@@ -21,9 +21,7 @@ load_lib "trace-support.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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [commit] testsuite: [Re: FYI: fix up gdb.trace]
2012-06-27 13:08 ` Tom Tromey
@ 2012-07-13 8:16 ` Jan Kratochvil
0 siblings, 0 replies; 4+ messages in thread
From: Jan Kratochvil @ 2012-07-13 8:16 UTC (permalink / raw)
To: Tom Tromey; +Cc: Yao Qi, gdb-patches
On Wed, 27 Jun 2012 15:07:32 +0200, Tom Tromey wrote:
> --- a/gdb/testsuite/gdb.trace/disconnected-tracing.exp
> +++ b/gdb/testsuite/gdb.trace/disconnected-tracing.exp
> @@ -17,10 +17,8 @@
[...]
> -set executable $testfile
[...]
> +set executabel $testfile
--- 20120708Build-gdbcvs-gdbserver-rawhide/fedora-rawhide-x86_64/out/gdb-m32.sum 2012-07-08 04:23:03.754352876 +0200
+++ 20120713Build-gdbcvs-gdbserver-rawhide/fedora-rawhide-x86_64/out/gdb-m32.sum 2012-07-13 05:58:08.936540923 +0200
#gdb.trace/disconnected-tracing.exp
Running gdb/testsuite/gdb.trace/disconnected-tracing.exp ...
-PASS: gdb.trace/disconnected-tracing.exp: set confirm off
[...]
+ERROR: tcl error sourcing gdb/testsuite/gdb.trace/disconnected-tracing.exp.
+ERROR: can't read "executable": no such variable
[...]
Checked in.
Thanks,
Jan
http://sourceware.org/ml/gdb-cvs/2012-07/msg00092.html
--- src/gdb/testsuite/ChangeLog 2012/07/12 16:39:42 1.3290
+++ src/gdb/testsuite/ChangeLog 2012/07/13 08:14:36 1.3291
@@ -1,3 +1,8 @@
+2012-07-13 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ Fix gdbserver run regression.
+ * gdb.trace/disconnected-tracing.exp (executabel): Fix typo.
+
2012-07-12 Tom Tromey <tromey@redhat.com>
* lib/gdb.exp (standard_testfile): Don't declare objdir.
--- src/gdb/testsuite/gdb.trace/disconnected-tracing.exp 2012/06/26 18:25:19 1.2
+++ src/gdb/testsuite/gdb.trace/disconnected-tracing.exp 2012/07/13 08:14:37 1.3
@@ -18,7 +18,7 @@
load_lib "trace-support.exp";
standard_testfile
-set executabel $testfile
+set executable $testfile
set expfile $testfile.exp
set gdbserver_reconnect_p 1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-07-13 8:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-26 18:11 FYI: fix up gdb.trace Tom Tromey
2012-06-27 4:19 ` Yao Qi
2012-06-27 13:08 ` Tom Tromey
2012-07-13 8:16 ` [commit] testsuite: [Re: FYI: fix up gdb.trace] Jan Kratochvil
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox