diff options
| -rw-r--r-- | gdb/testsuite/gdb.base/so-impl-ld.exp | 13 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/solib1.c | 5 |
2 files changed, 5 insertions, 13 deletions
diff --git a/gdb/testsuite/gdb.base/so-impl-ld.exp b/gdb/testsuite/gdb.base/so-impl-ld.exp index 372b18f..3c5d107 100644 --- a/gdb/testsuite/gdb.base/so-impl-ld.exp +++ b/gdb/testsuite/gdb.base/so-impl-ld.exp @@ -56,21 +56,12 @@ gdb_test "step" "solib_main .arg=10000. at.*${libfile}.c:${decimal}.* HERE .*" \ # Verify that we can step within the shlib call. # -gdb_test "next" "${decimal}\[ \t\]*\}.* STEP .*" "step in solib call" +gdb_test "next" "${decimal}\[ \t\]*return ans;.* STEP .*" "step in solib call" # Verify that we can step out of the shlib call, and back out into # the caller. # -gdb_test_multiple "next" "step out of solib call" { - -re "0x\[0-9a-f\]*\[ \t\]*9\[ \t\]*.*$gdb_prompt $" { - gdb_test "next" \ - "main .. at.*so-impl-ld.c:22.*" \ - "step out of solib call" - } - -re "main .. at.*so-impl-ld.c:22.*$gdb_prompt $" { - pass "step out of solib call" - } -} +gdb_step_until ".*main .. at.*return 0;.*" "step out of solib call" gdb_exit return 0 diff --git a/gdb/testsuite/gdb.base/solib1.c b/gdb/testsuite/gdb.base/solib1.c index 16b7233..bf52bee 100644 --- a/gdb/testsuite/gdb.base/solib1.c +++ b/gdb/testsuite/gdb.base/solib1.c @@ -4,5 +4,6 @@ extern "C" int solib_main (int arg) { - return arg*arg; /* HERE */ -} /* STEP */ + int ans = arg*arg; /* HERE */ + return ans; /* STEP */ +} |