This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
RFA: match source code, not line numbers
- From: Jim Blandy <jimb at redhat dot com>
- To: gdb-patches at sources dot redhat dot com
- Date: 10 Apr 2003 18:06:32 -0500
- Subject: RFA: match source code, not line numbers
This makes these tests more robust when the .cc files are edited.
2003-04-10 Jim Blandy <jimb at qa1a dot devel dot redhat dot com>
* gdb.c++/derivation.exp, gdb.c++/overload.exp,
gdb.c++/userdef.exp: Match against the program text, not line
numbers, to check that we've returned to the right place.
Index: gdb/testsuite/gdb.c++/derivation.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.c++/derivation.exp,v
retrieving revision 1.11
diff -c -r1.11 derivation.exp
*** gdb/testsuite/gdb.c++/derivation.exp 9 Apr 2003 23:21:14 -0000 1.11
--- gdb/testsuite/gdb.c++/derivation.exp 10 Apr 2003 23:01:08 -0000
***************
*** 310,316 ****
-re "#0 marker1.*$gdb_prompt $" {
setup_kfail "gdb/1155" s390-*-linux-gnu
fail "re-selected 'main' frame after inferior call"
! gdb_test "finish" ".*main.*at .*derivation.cc:21\[79\].*" \
"finish call to marker1"
}
-re "#1 ($hex in )?main.*$gdb_prompt $" {
--- 310,316 ----
-re "#0 marker1.*$gdb_prompt $" {
setup_kfail "gdb/1155" s390-*-linux-gnu
fail "re-selected 'main' frame after inferior call"
! gdb_test "finish" ".*main.*at .*derivation.cc:.*(marker1\\(\\);|a_instance\\.a = 20;).*" \
"finish call to marker1"
}
-re "#1 ($hex in )?main.*$gdb_prompt $" {
Index: gdb/testsuite/gdb.c++/overload.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.c++/overload.exp,v
retrieving revision 1.11
diff -c -r1.11 overload.exp
*** gdb/testsuite/gdb.c++/overload.exp 9 Apr 2003 23:21:14 -0000 1.11
--- gdb/testsuite/gdb.c++/overload.exp 10 Apr 2003 23:01:08 -0000
***************
*** 129,135 ****
-re "#0 marker1.*$gdb_prompt $" {
setup_kfail "gdb/1155" s390-*-linux-gnu
fail "re-selected 'main' frame after inferior call"
! gdb_test "finish" ".*main.*at .*overload.cc:7\[78\].*" \
"finish call to marker1"
}
-re "#1 ($hex in )?main.*$gdb_prompt $" {
--- 129,135 ----
-re "#0 marker1.*$gdb_prompt $" {
setup_kfail "gdb/1155" s390-*-linux-gnu
fail "re-selected 'main' frame after inferior call"
! gdb_test "finish" ".*main.*at .*overload.cc:.*(marker1\\(\\);|return 0;).*" \
"finish call to marker1"
}
-re "#1 ($hex in )?main.*$gdb_prompt $" {
Index: gdb/testsuite/gdb.c++/userdef.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.c++/userdef.exp,v
retrieving revision 1.7
diff -c -r1.7 userdef.exp
*** gdb/testsuite/gdb.c++/userdef.exp 9 Apr 2003 23:21:14 -0000 1.7
--- gdb/testsuite/gdb.c++/userdef.exp 10 Apr 2003 23:01:08 -0000
***************
*** 75,81 ****
-re "#0 marker1.*$gdb_prompt $" {
setup_kfail "gdb/1155" s390-*-linux-gnu
fail "re-selected 'main' frame after inferior call"
! gdb_test "finish" ".*main.*at .*userdef.cc:27\[67\].*" \
"finish call to marker1"
}
-re "#1 ($hex in )?main.*$gdb_prompt $" {
--- 75,81 ----
-re "#0 marker1.*$gdb_prompt $" {
setup_kfail "gdb/1155" s390-*-linux-gnu
fail "re-selected 'main' frame after inferior call"
! gdb_test "finish" ".*main.*at .*userdef.cc:.*(marker1\\(\\);|cout << one;).*" \
"finish call to marker1"
}
-re "#1 ($hex in )?main.*$gdb_prompt $" {