* gdb.c++/derivation.exp, gdb.c++/overload.exp,

gdb.c++/userdef.cc: Place comments on the lines to which the
marker function might return.
* gdb.c++/derivation.exp, gdb.c++/overload.exp,
gdb.c++/userdef.exp: Look for those comments to check that we've
returned to the right place, instead of checking line numbers.
This commit is contained in:
Jim Blandy 2003-04-11 19:57:33 +00:00
parent 6913c89ac7
commit 93201743fe
7 changed files with 18 additions and 9 deletions

View File

@ -1,3 +1,12 @@
2003-04-11 Jim Blandy <jimb@redhat.com>
* gdb.c++/derivation.exp, gdb.c++/overload.exp,
gdb.c++/userdef.cc: Place comments on the lines to which the
marker function might return.
* gdb.c++/derivation.exp, gdb.c++/overload.exp,
gdb.c++/userdef.exp: Look for those comments to check that we've
returned to the right place, instead of checking line numbers.
2003-04-11 Elena Zannoni <ezannoni@redhat.com>
* gdb.threads/pthreads.exp (test_startup): When setting a breakpoint

View File

@ -214,9 +214,9 @@ int main(void)
#endif
marker1();
marker1(); // marker1-returns-here
a_instance.a = 20;
a_instance.a = 20; // marker1-returns-here
a_instance.aa = 21;
b_instance.b = 22;
b_instance.bb = 23;

View File

@ -310,7 +310,7 @@ gdb_test_multiple "frame" "re-selected 'main' frame after inferior call" {
-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\].*" \
gdb_test "finish" ".*main.*at .*derivation.cc:.*// marker1-returns-here.*" \
"finish call to marker1"
}
-re "#1 ($hex in )?main.*$gdb_prompt $" {

View File

@ -80,8 +80,8 @@ int main ()
// Verify that intToChar should work:
intToChar(1);
marker1();
return 0;
marker1(); // marker1-returns-here
return 0; // marker1-returns-here
}
foo::foo (int i) { ifoo = i; ccpfoo = NULL; }

View File

@ -129,7 +129,7 @@ gdb_test_multiple "frame" "re-selected 'main' frame after inferior call" {
-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\].*" \
gdb_test "finish" ".*main.*at .*overload.cc:.*// marker1-returns-here.*" \
"finish call to marker1"
}
-re "#1 ($hex in )?main.*$gdb_prompt $" {

View File

@ -273,8 +273,8 @@ int main (void)
A1 three(0,0);
int val;
marker1();
cout << one;
marker1(); // marker1-returns-here
cout << one; // marker1-returns-here
cout << two;
three = one + two;
cout << "+ " << three;

View File

@ -75,7 +75,7 @@ gdb_test_multiple "frame" "re-selected 'main' frame after inferior call" {
-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\].*" \
gdb_test "finish" ".*main.*at .*userdef.cc:.*// marker1-returns-here.*" \
"finish call to marker1"
}
-re "#1 ($hex in )?main.*$gdb_prompt $" {