This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
FYI: fix up gdb.reverse
- From: Tom Tromey <tromey at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Tue, 26 Jun 2012 11:54:34 -0600
- Subject: FYI: fix up gdb.reverse
I'm checking this in.
This applies the standard_* cleanup to gdb.reverse
gdb.reverse is in pretty good shape, so the patch is pretty
straightforward.
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.
2012-06-26 Tom Tromey <tromey@redhat.com>
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