gdb/testsuite: fix regexp in gdb.rocm/watchpoint-at-end-of-shader.exp

The following tests fail:

  FAIL: gdb.rocm/watchpoint-at-end-of-shader.exp: precise_memory=on: continue
  FAIL: gdb.rocm/watchpoint-at-end-of-shader.exp: precise_memory=off: continue

The reason is a difference in outputs seen in upstream and downstream
branches.  Fix the regexps to avoid the failures.

Approved-by: Lancelot Six <lancelot.six@amd.com> (amdgpu)

diff --git a/gdb/testsuite/gdb.rocm/watchpoint-at-end-of-shader.exp b/gdb/testsuite/gdb.rocm/watchpoint-at-end-of-shader.exp
index ff233c8b26a669f1cc85f5852dfdcc94856817da..ea88c1269b72d11c0d0caf3accb09b4d9478f2f3 100644 (file)
--- a/gdb/testsuite/gdb.rocm/watchpoint-at-end-of-shader.exp
+++ b/gdb/testsuite/gdb.rocm/watchpoint-at-end-of-shader.exp
@@ -71,9 +71,9 @@ proc do_test {precise_memory has_xfail} {
            setup_xfail "*-*-*"
        }
        gdb_test "continue" \
-           [multi_line "Switching to thread $::decimal, lane 0.*" \
+           [multi_line "Switching to \[^\r\n\]+(?=\r\n)" \
                "" \
-               "Thread $::decimal \".*\" hit Hardware watchpoint $::decimal: -location \\*v" \
+               "Thread $::decimal \[^\r\n\]*hit Hardware watchpoint $::decimal: -location \\*v" \
                "" \
                "Old value = 64" \
                "New value = 8" \