import gdb-2000-02-04 snapshot

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / step-test.exp

diff --git a/gdb/testsuite/gdb.base/step-test.exp b/gdb/testsuite/gdb.base/step-test.exp
index c0acf812cd451313c8d3ebf63b2f1297e8a78561..47d4572e91aeefc279f5e979d7909de018111a7c 100644 (file)
--- a/gdb/testsuite/gdb.base/step-test.exp
+++ b/gdb/testsuite/gdb.base/step-test.exp
@@ -142,13 +142,17 @@ test_i "stepi to next line" "stepi" \
 test_i "stepi into function" "stepi" \
        ".*${decimal}.*callee.*STEPI" \
        ".*callee \\(\\) at .*step-test\\.c" 
-test_i "stepi to function first line" "stepi" \
-       ".*int callee\\(\\) .*\\{" \
-       ".*myglob.*" 
+
+# Continue to step until we reach the function's body.  This makes it
+# more likely that we've actually completed the prologue, so "finish"
+# will work.
+test_i "stepi into function's first source line" "stepi" \
+       ".*${decimal}.*int callee" \
+       ".*${decimal}.*myglob.*; return 0;"
+
 # Have to be careful here, if the finish does not work, 
 # then we may run to the end of the program, which
 # will cause erroneous failures in the rest of the tests
-
 send_gdb "finish\n"
 gdb_expect {
   -re ".*(Program received|Program exited).*$gdb_prompt $" {