From a0cd494af0c6a3eff4d753d87e883d2375786bd1 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 7 Jun 2023 14:53:00 +0100 Subject: [PATCH] gdb.threads/schedlock.exp: Expected SIGTRAP too (WIP) The 'Windows all-stop, interrupt with "stopped" instead of SIGTRAP' patch should make this unnecessary. Change-Id: I06925ae317784e6babd57a8d1904945bb01d2b9d --- gdb/testsuite/gdb.threads/schedlock.exp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.threads/schedlock.exp b/gdb/testsuite/gdb.threads/schedlock.exp index 4e2b835057f..a8148741033 100644 --- a/gdb/testsuite/gdb.threads/schedlock.exp +++ b/gdb/testsuite/gdb.threads/schedlock.exp @@ -70,6 +70,10 @@ proc stop_process { description } { { pass $description } + -re "Thread .* received signal SIGTRAP.*$gdb_prompt $" + { + pass $description + } timeout { fail "$description (timeout)" @@ -94,7 +98,7 @@ proc get_current_thread { description } { # Make sure we're stopped in the loop, in one of the non-main threads. proc goto_loop { msg } { - gdb_breakpoint [concat [gdb_get_line_number "schedlock.exp: main loop"] " if arg != 0"] + gdb_breakpoint [concat "$::srcfile:" [gdb_get_line_number "schedlock.exp: main loop"] " if arg != 0"] set test "return to loop" if {$msg != ""} { -- 2.47.2