diff options
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/skip.exp | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 3f24364..cecd384 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2020-01-09 Andrew Burgess <andrew.burgess@embecosm.com> + + * gdb.base/skip.exp: Fix race condition in test. + 2020-01-06 Andrew Burgess <andrew.burgess@embecosm.com> * gdb.base/backtrace.c: New file. diff --git a/gdb/testsuite/gdb.base/skip.exp b/gdb/testsuite/gdb.base/skip.exp index d7dd3ce..513c9fc 100644 --- a/gdb/testsuite/gdb.base/skip.exp +++ b/gdb/testsuite/gdb.base/skip.exp @@ -144,7 +144,8 @@ with_test_prefix "step after disabling 3" { gdb_test "step" ".*" "step 2"; # Return from bar() # With gcc 9.2.0 we jump once back to main before entering foo here. # If that happens try to step a second time. - gdb_test "step" "foo \\(\\) at.*" "step 3" "main \\(\\) at .*" "step" + gdb_test "step" "foo \\(\\) at.*" "step 3" \ + "main \\(\\) at .*\r\n$gdb_prompt " "step" gdb_test "step" ".*" "step 4"; # Return from foo() gdb_test "step" "main \\(\\) at.*" "step 5" } @@ -265,7 +266,8 @@ with_test_prefix "step using -fu for baz" { gdb_test "step" ".*" "step 2"; # Return from bar() # With gcc 9.2.0 we jump once back to main before entering foo here. # If that happens try to step a second time. - gdb_test "step" "foo \\(\\) at.*" "step 3" "main \\(\\) at.*" "step" + gdb_test "step" "foo \\(\\) at.*" "step 3" \ + "main \\(\\) at .*\r\n$gdb_prompt " "step" gdb_test "step" ".*" "step 4"; # Return from foo() gdb_test "step" "main \\(\\) at.*" "step 5" } @@ -282,7 +284,8 @@ with_test_prefix "step using -rfu for baz" { gdb_test "step" ".*" "step 2"; # Return from bar() # With gcc 9.2.0 we jump once back to main before entering foo here. # If that happens try to step a second time. - gdb_test "step" "foo \\(\\) at.*" "step 3" "main \\(\\) at.*" "step" + gdb_test "step" "foo \\(\\) at.*" "step 3" \ + "main \\(\\) at .*\r\n$gdb_prompt " "step" gdb_test "step" ".*" "step 4"; # Return from foo() gdb_test "step" "main \\(\\) at.*" "step 5" } |