* 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.

7 files changed, 18 insertions, 9 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3843177ef47..0bd7b355898 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -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
diff --git a/gdb/testsuite/gdb.c++/derivation.cc b/gdb/testsuite/gdb.c++/derivation.cc
index 99efa7605a4..f6d42e7d1de 100644
--- a/gdb/testsuite/gdb.c++/derivation.cc
+++ b/gdb/testsuite/gdb.c++/derivation.cc
@@ -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;
diff --git a/gdb/testsuite/gdb.c++/derivation.exp b/gdb/testsuite/gdb.c++/derivation.exp
index 10e3844b0ad..38a46a2beaa 100644
--- a/gdb/testsuite/gdb.c++/derivation.exp
+++ b/gdb/testsuite/gdb.c++/derivation.exp
@@ -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 $" {
diff --git a/gdb/testsuite/gdb.c++/overload.cc b/gdb/testsuite/gdb.c++/overload.cc
index 2f467154bdb..56afc96884e 100644
--- a/gdb/testsuite/gdb.c++/overload.cc
+++ b/gdb/testsuite/gdb.c++/overload.cc
@@ -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; }
diff --git a/gdb/testsuite/gdb.c++/overload.exp b/gdb/testsuite/gdb.c++/overload.exp
index be60250aead..3e14678e4c2 100644
--- a/gdb/testsuite/gdb.c++/overload.exp
+++ b/gdb/testsuite/gdb.c++/overload.exp
@@ -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 $" {
diff --git a/gdb/testsuite/gdb.c++/userdef.cc b/gdb/testsuite/gdb.c++/userdef.cc
index 95a40552718..0bb88a2d166 100644
--- a/gdb/testsuite/gdb.c++/userdef.cc
+++ b/gdb/testsuite/gdb.c++/userdef.cc
@@ -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;
diff --git a/gdb/testsuite/gdb.c++/userdef.exp b/gdb/testsuite/gdb.c++/userdef.exp
index 9a8fb02f162..4575249ce5a 100644
--- a/gdb/testsuite/gdb.c++/userdef.exp
+++ b/gdb/testsuite/gdb.c++/userdef.exp
@@ -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 $" {