diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/advance-until-multiple-locations.exp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 6335ece..af44440 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2020-08-28 Pedro Alves <pedro@palves.net> + + * gdb.base/advance-until-multiple-locations.exp + (advance_overload, until_overload): Adjust to match the + frame/function header instead of the source line text. + 2020-08-28 Tom de Vries <tdevries@suse.de> * gdb.base/label-without-address.c: New test. diff --git a/gdb/testsuite/gdb.base/advance-until-multiple-locations.exp b/gdb/testsuite/gdb.base/advance-until-multiple-locations.exp index a6a1de6..0f919b4 100644 --- a/gdb/testsuite/gdb.base/advance-until-multiple-locations.exp +++ b/gdb/testsuite/gdb.base/advance-until-multiple-locations.exp @@ -104,7 +104,7 @@ proc_with_prefix advance_overload {} { # Need to issue the advance twice, because advance also stops upon # exit from the current stack frame. gdb_test "advance ovld_func" \ - "ovld_func \\(0\\);.*" \ + "test \\(\\) at .*" \ "second advance stops at caller" gdb_test "advance ovld_func" \ @@ -129,7 +129,7 @@ proc_with_prefix until_overload {} { # ovld_func is a different frame, so it shouldn't cause a stop. # Instead, the program should stop at the caller frame. gdb_test "until ovld_func" \ - "main .* at .*return test \\(\\);.*" + "main \\(\\) at .*" } foreach_with_prefix cmd {"until" "advance"} { |