PR breakpoints/7143 - Watchpoint does not trigger when first set

[thirdparty/binutils-gdb.git] / gdb / testsuite / gdb.base / watchpoint.exp

diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index 80d75cbe996e701d0ddd4f0aaaf74aad0a357ce7..1123824e0e5d2ec7e4ccfe893632145475b8c717 100644 (file)
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/gdb/testsuite/gdb.base/watchpoint.exp
@@ -550,21 +550,16 @@ proc test_complex_watchpoint {} {
 proc test_watchpoint_and_breakpoint {} {
     global gdb_prompt
 
-    # This is a test for PR gdb/38, which involves setting a
+    # This is a test for PR breakpoints/7143, which involves setting a
     # watchpoint right after you've reached a breakpoint.
 
     if [runto func3] then {
        gdb_breakpoint [gdb_get_line_number "second x assignment"]
        gdb_continue_to_breakpoint "second x assignment"
        gdb_test "watch x" ".*atchpoint \[0-9\]+: x"
-       gdb_test_multiple "next" "next after watch x" {
-           -re ".*atchpoint \[0-9\]+: x\r\n\r\nOld value = 0\r\nNew value = 1\r\n.*$gdb_prompt $" {
-               pass "next after watch x"
-           }
-           -re "\[0-9\]+\[\t \]+y = 1;\r\n$gdb_prompt $" {
-               kfail "gdb/38" "next after watch x"
-           }
-       }
+       gdb_test "next" \
+           ".*atchpoint \[0-9\]+: x\r\n\r\nOld value = 0\r\nNew value = 1\r\n.*" \
+           "next after watch x"
 
        gdb_test_no_output "delete \$bpnum" "delete watch x"
     }