From 21b61fe24223da81fcc35d2dfd3893f01285e2a5 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 18 Oct 2022 15:32:46 +0200 Subject: [PATCH] [gdb/testsuite] Fix gdb.server/no-thread-db.exp with local-remote-host.exp With test-case gdb.server/no-thread-db.exp and host board local-remote-host.exp with a tentative fix for PR29697 I run into: ... (gdb) print foo^M Cannot find thread-local storage for Thread 29613.29613, executable file \ $HOME/no-thread-db:^M Remote target failed to process qGetTLSAddr request^M (gdb) FAIL: gdb.server/no-thread-db.exp: print foo ... The regexp in the test-case expects the full $binfile pathname, but we have instead $HOME/no-thread-db. Fix this by making the regexp less strict. Tested on x86_64-linux. --- gdb/testsuite/gdb.server/no-thread-db.exp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.server/no-thread-db.exp b/gdb/testsuite/gdb.server/no-thread-db.exp index db61c61ccbc..16c1a0d9ca1 100644 --- a/gdb/testsuite/gdb.server/no-thread-db.exp +++ b/gdb/testsuite/gdb.server/no-thread-db.exp @@ -59,5 +59,6 @@ gdb_breakpoint ${srcfile}:[gdb_get_line_number "after tls assignment"] gdb_continue_to_breakpoint "after tls assignment" # Printing a tls variable should fail gracefully without a libthread_db. +set re_exec "\[^\r\n\]*[file tail $binfile]" gdb_test "print foo" \ - "Cannot find thread-local storage for Thread \[^,\]+, executable file ${binfile}:\[\r\n\]+Remote target failed to process qGetTLSAddr request" + "Cannot find thread-local storage for Thread \[^,\]+, executable file $re_exec:\[\r\n\]+Remote target failed to process qGetTLSAddr request" -- 2.30.2