From patchwork Fri Feb 17 20:38:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Baldwin X-Patchwork-Id: 65198 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DCF0A382E6BA for ; Fri, 17 Feb 2023 20:38:56 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail.baldwin.cx (bigwig.baldwin.cx [66.216.25.90]) by sourceware.org (Postfix) with ESMTPS id 8C948385B53B for ; Fri, 17 Feb 2023 20:38:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8C948385B53B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=FreeBSD.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=FreeBSD.org Received: from gimli.baldwin.net (c-98-35-126-114.hsd1.ca.comcast.net [98.35.126.114]) by mail.baldwin.cx (Postfix) with ESMTPSA id E24491A84E1C for ; Fri, 17 Feb 2023 15:38:26 -0500 (EST) From: John Baldwin To: gdb-patches@sourceware.org Subject: [PATCH 5/5] gdb tests: Allow for "LWP" in thread IDs from info threads. Date: Fri, 17 Feb 2023 12:38:18 -0800 Message-Id: <20230217203818.11287-6-jhb@FreeBSD.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230217203818.11287-1-jhb@FreeBSD.org> References: <20230217203818.11287-1-jhb@FreeBSD.org> MIME-Version: 1.0 X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.4 (mail.baldwin.cx [0.0.0.0]); Fri, 17 Feb 2023 15:38:27 -0500 (EST) X-Virus-Scanned: clamav-milter 0.103.1 at mail.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_STATUS, KHOP_HELO_FCRDNS, SPF_HELO_PASS, SPF_SOFTFAIL, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Several tests assume that the first word after a thread ID in 'info threads' output is "Thread". However, several targets use "LWP" instead such as the FreeBSD and NetBSD native targets. The Linux native target also uses "LWP" if libthread_db is not being used. Some other tests in the tree don't require a specific word, and some targets may use other first words (e.g. OpenBSD uses "thread" and Ravenscar threads use "Ravenscar Thread"). --- .../gdb.multi/multi-target-thread-find.exp | 2 +- gdb/testsuite/gdb.python/py-thrhandle.exp | 2 +- .../gdb.server/stop-reply-no-thread-multi.exp | 8 ++++---- gdb/testsuite/gdb.threads/execl.exp | 6 +++--- gdb/testsuite/gdb.threads/fork-child-threads.exp | 2 +- .../gdb.threads/fork-thread-pending.exp | 16 ++++++++-------- .../gdb.threads/info-threads-cur-sal.exp | 8 ++++---- .../gdb.threads/interrupt-while-step-over.exp | 2 +- gdb/testsuite/gdb.threads/leader-exit.exp | 2 +- gdb/testsuite/gdb.threads/manythreads.exp | 2 +- .../gdb.threads/no-unwaited-for-left.exp | 4 ++-- gdb/testsuite/gdb.threads/non-ldr-exc-2.exp | 2 +- gdb/testsuite/gdb.threads/pthreads.exp | 8 ++++---- .../gdb.threads/signal-command-handle-nopass.exp | 2 +- .../signal-command-multiple-signals-pending.exp | 2 +- .../signal-delivered-right-thread.exp | 2 +- gdb/testsuite/gdb.threads/signal-sigtrap.exp | 4 ++-- gdb/testsuite/gdb.threads/staticthreads.exp | 2 +- gdb/testsuite/gdb.threads/thread-specific-bp.exp | 2 +- gdb/testsuite/gdb.threads/thread-specific.exp | 4 ++-- gdb/testsuite/gdb.threads/tls.exp | 12 ++++++------ gdb/testsuite/gdb.trace/report.exp | 2 +- gdb/testsuite/gdb.trace/strace.exp | 2 +- 23 files changed, 49 insertions(+), 49 deletions(-) diff --git a/gdb/testsuite/gdb.multi/multi-target-thread-find.exp b/gdb/testsuite/gdb.multi/multi-target-thread-find.exp index 820190224ba..1b937be7a2b 100644 --- a/gdb/testsuite/gdb.multi/multi-target-thread-find.exp +++ b/gdb/testsuite/gdb.multi/multi-target-thread-find.exp @@ -50,7 +50,7 @@ proc test_thread_find {} { } set any "\[^\r\n\]*" gdb_test_multiple "info threads" "collect thread id" { - -re ". ($decimal).$decimal (Thread ${any}) \"threadname_\[0-9\]+\" $any" { + -re ". ($decimal).$decimal ((Thread|LWP) ${any}) \"threadname_\[0-9\]+\" $any" { set thr_num $expect_out(1,string) set target_id($thr_num) $expect_out(2,string) exp_continue diff --git a/gdb/testsuite/gdb.python/py-thrhandle.exp b/gdb/testsuite/gdb.python/py-thrhandle.exp index e8004c77ad1..6c249d9f22d 100644 --- a/gdb/testsuite/gdb.python/py-thrhandle.exp +++ b/gdb/testsuite/gdb.python/py-thrhandle.exp @@ -63,7 +63,7 @@ gdb_test "continue" \ # reported in the "Id" column. gdb_test "info threads" \ - {.*[\r\n]+\* +([0-9]+) +Thread[^\r\n]* do_something \(n=\1\) at.*} + {.*[\r\n]+\* +([0-9]+) +(Thread|LWP)[^\r\n]* do_something \(n=\1\) at.*} # Check for expected results when passing a valid thread handle to # thread_from_handle(). diff --git a/gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp b/gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp index 20d45ba17da..01a67923027 100644 --- a/gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp +++ b/gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp @@ -78,13 +78,13 @@ proc run_test { target_non_stop disable_feature } { # There should be only one thread listed at this point. gdb_test_multiple "info threads" "" { - -re "2 Thread.*$gdb_prompt $" { + -re "2 (Thread|LWP).*$gdb_prompt $" { fail $gdb_test_name } -re "has terminated.*$gdb_prompt $" { fail $gdb_test_name } - -re "\\\* 1\[\t \]*Thread\[^\r\n\]*\r\n$gdb_prompt $" { + -re "\\\* 1\[\t \]*(Thread|LWP)\[^\r\n\]*\r\n$gdb_prompt $" { pass $gdb_test_name } } @@ -94,7 +94,7 @@ proc run_test { target_non_stop disable_feature } { # There should be two threads at this point with thread 1 selected. gdb_test "info threads" \ - "\\\* 1\[\t \]*Thread\[^\r\n\]*\r\n 2\[\t \]*Thread\[^\r\n\]*" \ + "\\\* 1\[\t \]*(Thread|LWP)\[^\r\n\]*\r\n 2\[\t \]*(Thread|LWP)\[^\r\n\]*" \ "second thread should now exist" # Switch threads. @@ -118,7 +118,7 @@ proc run_test { target_non_stop disable_feature } { # Check that thread 2 is still selected. gdb_test "info threads" \ - " 1\[\t \]*Thread\[^\r\n\]*\r\n\\\* 2\[\t \]*Thread\[^\r\n\]*" \ + " 1\[\t \]*(Thread|LWP)\[^\r\n\]*\r\n\\\* 2\[\t \]*(Thread|LWP)\[^\r\n\]*" \ "second thread should still be selected after stepi" # Turn scheduler locking off again so that when we continue all diff --git a/gdb/testsuite/gdb.threads/execl.exp b/gdb/testsuite/gdb.threads/execl.exp index ef4f1ea9c8d..545cca19072 100644 --- a/gdb/testsuite/gdb.threads/execl.exp +++ b/gdb/testsuite/gdb.threads/execl.exp @@ -40,7 +40,7 @@ gdb_test "b [gdb_get_line_number "breakpoint here"]" \ gdb_test "continue" ".*breakpoint here.*" "continue to exec" -gdb_test "info threads" "1 *Thread.*2 *Thread.*3 *Thread.*" "info threads before exec" +gdb_test "info threads" "1 *(Thread|LWP).*2 *(Thread|LWP).*3 *(Thread|LWP).*" "info threads before exec" # Work around PR25656, where the breakpoint above sets 2 breakpoint locations: # - one on gdb.threads/execl.c:$linenumber, and @@ -55,11 +55,11 @@ gdb_test "continue" ".*Breakpoint 1, main.*" \ "continue across exec" gdb_test_multiple "info threads" "info threads after exec" { - -re "2 *Thread .*$gdb_prompt $" { + -re "2 *(Thread|LWP) .*$gdb_prompt $" { # Old threads left behind. fail "$gdb_test_name" } - -re "4 *Thread .*$gdb_prompt $" { + -re "4 *(Thread|LWP) .*$gdb_prompt $" { # New threads registered. fail "$gdb_test_name" } diff --git a/gdb/testsuite/gdb.threads/fork-child-threads.exp b/gdb/testsuite/gdb.threads/fork-child-threads.exp index d0d13a29fdf..2b02ec6ef99 100644 --- a/gdb/testsuite/gdb.threads/fork-child-threads.exp +++ b/gdb/testsuite/gdb.threads/fork-child-threads.exp @@ -44,4 +44,4 @@ gdb_test "continue" "Breakpoint 2, start.*" "get to the spawned thread" # * 3 Thread 0x40a00950 (LWP 5553) start (arg=0x0) at ../.././gdb/testsuite/gdb.threads/fork-child-threads.c:28 # 2 Thread 0x2aaaaaac3000 (LWP 5552) 0x00000031674076dd in pthread_join (threadid=, thread_return=) at pthread_join.c:89 -gdb_test "info threads" " Thread .* Thread .*" "two threads found" +gdb_test "info threads" " (Thread|LWP) .* (Thread|LWP) .*" "two threads found" diff --git a/gdb/testsuite/gdb.threads/fork-thread-pending.exp b/gdb/testsuite/gdb.threads/fork-thread-pending.exp index db72fb2679b..03f35665c0c 100644 --- a/gdb/testsuite/gdb.threads/fork-thread-pending.exp +++ b/gdb/testsuite/gdb.threads/fork-thread-pending.exp @@ -37,7 +37,7 @@ gdb_breakpoint "start" "" "1, set breakpoint at start" gdb_test "continue" "Catchpoint.*" "1, get to the fork event" -gdb_test "info threads" " Thread .* Thread .* Thread .* Thread .*" "1, multiple threads found" +gdb_test "info threads" " (Thread|LWP) .* (Thread|LWP) .* (Thread|LWP) .* (Thread|LWP) .*" "1, multiple threads found" gdb_test "thread 1" ".*" "1, switched away from event thread" @@ -45,10 +45,10 @@ gdb_test "continue" "Not resuming.*" "1, refused to resume" set test "1, followed to the child, found one thread" gdb_test_multiple "info threads" "metest" { - -re " Thread .* Thread .*$gdb_prompt $" { + -re " (Thread|LWP) .* (Thread|LWP) .*$gdb_prompt $" { fail "$test" } - -re " Thread .*$gdb_prompt $" { + -re " (Thread|LWP) .*$gdb_prompt $" { pass "$test" } -re "$gdb_prompt $" { @@ -63,10 +63,10 @@ gdb_test "continue" "Breakpoint 3, start.*" "1, get to the spawned thread in for set test "1, followed to the child, found two threads" gdb_test_multiple "info threads" "$test" { - -re " Thread .* Thread .* Thread .*$gdb_prompt $" { + -re " (Thread|LWP) .* (Thread|LWP) .* (Thread|LWP) .*$gdb_prompt $" { fail "$test" } - -re " Thread .* Thread .*$gdb_prompt $" { + -re " (Thread|LWP) .* (Thread|LWP) .*$gdb_prompt $" { pass "$test" } -re "$gdb_prompt $" { @@ -94,16 +94,16 @@ gdb_breakpoint "start" gdb_test "continue" "Catchpoint.*" "2, get to the fork event" -gdb_test "info threads" " Thread .* Thread .* Thread .* Thread .*" "2, multiple threads found" +gdb_test "info threads" " (Thread|LWP) .* (Thread|LWP) .* (Thread|LWP) .* (Thread|LWP) .*" "2, multiple threads found" gdb_test "continue" "Breakpoint 3, start.*" "2, get to the spawned thread in fork child" set test "2, followed to the child, found two threads" gdb_test_multiple "info threads" "$test" { - -re " Thread .* Thread .* Thread .*$gdb_prompt $" { + -re " (Thread|LWP) .* (Thread|LWP) .* (Thread|LWP) .*$gdb_prompt $" { fail "$test" } - -re " Thread .* Thread .*$gdb_prompt $" { + -re " (Thread|LWP) .* (Thread|LWP) .*$gdb_prompt $" { pass "$test" } -re "$gdb_prompt $" { diff --git a/gdb/testsuite/gdb.threads/info-threads-cur-sal.exp b/gdb/testsuite/gdb.threads/info-threads-cur-sal.exp index 0614b9cd664..ba7575b93f9 100644 --- a/gdb/testsuite/gdb.threads/info-threads-cur-sal.exp +++ b/gdb/testsuite/gdb.threads/info-threads-cur-sal.exp @@ -43,8 +43,8 @@ gdb_test "list $line" \ gdb_test "info threads" \ [multi_line \ "\[ \t\]*Id\[ \t\]+Target\[ \t\]+Id\[ \t\]+Frame\[ \t\]*" \ - " 1 *Thread \[^\r\n\]* .* \[^\r\n\]*" \ - "\\* 2 *Thread \[^\r\n\]* at \[^\r\n\]*"] \ + " 1 *(Thread|LWP) \[^\r\n\]* .* \[^\r\n\]*" \ + "\\* 2 *(Thread|LWP) \[^\r\n\]* at \[^\r\n\]*"] \ "info threads before break" # Check that "break" is still operating on the same file by default. @@ -53,8 +53,8 @@ gdb_test "break $line" ".*${srcfile2}.*" "break on line" gdb_test "info threads" \ [multi_line \ "\[ \t\]*Id\[ \t\]+Target\[ \t\]+Id\[ \t\]+Frame\[ \t\]*" \ - " 1 *Thread \[^\r\n\]* .* \[^\r\n\]*" \ - "\\* 2 *Thread \[^\r\n\]* at \[^\r\n\]*"] \ + " 1 *(Thread|LWP) \[^\r\n\]* .* \[^\r\n\]*" \ + "\\* 2 *(Thread|LWP) \[^\r\n\]* at \[^\r\n\]*"] \ "info threads before list" # And that so is "list". diff --git a/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp b/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp index 0add65d3717..4756bc9782b 100644 --- a/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp +++ b/gdb/testsuite/gdb.threads/interrupt-while-step-over.exp @@ -145,7 +145,7 @@ proc test_one_iteration {} { set running_count 0 set test "all threads are stopped" return_if_nonzero [gdb_test_multiple "info threads" $test { - -re "Thread \[^\r\n\]* \\(running\\)" { + -re "(Thread|LWP) \[^\r\n\]* \\(running\\)" { incr running_count exp_continue } diff --git a/gdb/testsuite/gdb.threads/leader-exit.exp b/gdb/testsuite/gdb.threads/leader-exit.exp index df392c7b635..57805ec24cb 100644 --- a/gdb/testsuite/gdb.threads/leader-exit.exp +++ b/gdb/testsuite/gdb.threads/leader-exit.exp @@ -37,7 +37,7 @@ gdb_breakpoint [gdb_get_line_number "break-here"] gdb_continue_to_breakpoint "break-here" ".* break-here .*" gdb_test "info threads" \ - "\r\n\[ \t\]*Id\[ \t\]+Target\[ \t\]+Id\[ \t\]+Frame\[ \t\]*\r\n\\* 2 *Thread \[^\r\n\]* at \[^\r\n\]*" \ + "\r\n\[ \t\]*Id\[ \t\]+Target\[ \t\]+Id\[ \t\]+Frame\[ \t\]*\r\n\\* 2 *(Thread|LWP) \[^\r\n\]* at \[^\r\n\]*" \ "single thread has been left" # Test that ctrl-c works even if the leader has exited. diff --git a/gdb/testsuite/gdb.threads/manythreads.exp b/gdb/testsuite/gdb.threads/manythreads.exp index da3f66a810b..a6b8113ae8a 100644 --- a/gdb/testsuite/gdb.threads/manythreads.exp +++ b/gdb/testsuite/gdb.threads/manythreads.exp @@ -115,7 +115,7 @@ interrupt_and_wait "stop threads 1" set cmd "info threads" set ok 0 gdb_test_multiple $cmd $cmd { - -re " 1 *Thread " { + -re " 1 *(Thread|LWP) " { set ok 1 exp_continue } diff --git a/gdb/testsuite/gdb.threads/no-unwaited-for-left.exp b/gdb/testsuite/gdb.threads/no-unwaited-for-left.exp index be372030cb8..4a28cc00c58 100644 --- a/gdb/testsuite/gdb.threads/no-unwaited-for-left.exp +++ b/gdb/testsuite/gdb.threads/no-unwaited-for-left.exp @@ -42,7 +42,7 @@ gdb_test "continue" \ "continue stops when thread 2 exits" gdb_test "info threads" \ - "\r\n\[ \t\]*Id\[ \t\]+Target\[ \t\]+Id\[ \t\]+Frame\[ \t\]*\r\n *1 *Thread \[^\r\n\]* \[^\r\n\]*\[\r\n\]*The current thread has terminated.*" \ + "\r\n\[ \t\]*Id\[ \t\]+Target\[ \t\]+Id\[ \t\]+Frame\[ \t\]*\r\n *1 *(Thread|LWP) \[^\r\n\]* \[^\r\n\]*\[\r\n\]*The current thread has terminated.*" \ "only main thread left, thread 2 terminated" # Select the main thread, let the third thread start, and stop at the @@ -63,7 +63,7 @@ gdb_test "continue" \ "continue stops when the main thread exits" gdb_test "info threads" \ - "\r\n\[ \t\]*Id\[ \t\]+Target\[ \t\]+Id\[ \t\]+Frame\[ \t\]*\r\n *3 *Thread \[^\r\n\]* \[^\r\n\]*\[\r\n\]*The current thread has terminated.*" \ + "\r\n\[ \t\]*Id\[ \t\]+Target\[ \t\]+Id\[ \t\]+Frame\[ \t\]*\r\n *3 *(Thread|LWP) \[^\r\n\]* \[^\r\n\]*\[\r\n\]*The current thread has terminated.*" \ "only thread 3 left, main thread terminated" # Make sure thread apply all works when we have exited threads in the diff --git a/gdb/testsuite/gdb.threads/non-ldr-exc-2.exp b/gdb/testsuite/gdb.threads/non-ldr-exc-2.exp index d51ae3115ef..993369fd9c3 100644 --- a/gdb/testsuite/gdb.threads/non-ldr-exc-2.exp +++ b/gdb/testsuite/gdb.threads/non-ldr-exc-2.exp @@ -44,7 +44,7 @@ proc do_test { lock_sched nonstop } { } gdb_test "info threads" \ - "\r\n\[ \t\]*Id\[ \t\]+Target\[ \t\]+Id\[ \t\]+Frame\[ \t\]*\r\n\\* 2 *Thread \[^\r\n\]* at \[^\r\n\]*" \ + "\r\n\[ \t\]*Id\[ \t\]+Target\[ \t\]+Id\[ \t\]+Frame\[ \t\]*\r\n\\* 2 *(Thread|LWP) \[^\r\n\]* at \[^\r\n\]*" \ "single thread left" # Also test with sched-lock to make sure we can follow the diff --git a/gdb/testsuite/gdb.threads/pthreads.exp b/gdb/testsuite/gdb.threads/pthreads.exp index acd073cd5e9..92f32bda03a 100644 --- a/gdb/testsuite/gdb.threads/pthreads.exp +++ b/gdb/testsuite/gdb.threads/pthreads.exp @@ -130,7 +130,7 @@ proc test_startup {} { # We should be able to do an info threads before starting any others. set return_me 1 gdb_test_multiple "info threads" "info threads" { - -re ".*Thread.*main.*$gdb_prompt $" { + -re ".*(Thread|LWP).*main.*$gdb_prompt $" { pass "info threads" set return_me 0 } @@ -145,7 +145,7 @@ proc test_startup {} { # Extract the thread id number of main thread from "info threads" output. gdb_test_multiple "info threads" "get main thread id" { - -re "(\[0-9\]+)(${horiz}Thread${horiz}main.*)($gdb_prompt $)" { + -re "(\[0-9\]+)(${horiz}(Thread|LWP)${horiz}main.*)($gdb_prompt $)" { } } @@ -160,7 +160,7 @@ proc test_startup {} { # Extract the thread id number of thread 1 from "info threads" output. gdb_test_multiple "info threads" "get thread 1 id" { - -re "(\[0-9\]+)(${horiz}Thread${horiz}thread1.*)($gdb_prompt $)" { + -re "(\[0-9\]+)(${horiz}(Thread|LWP)${horiz}thread1.*)($gdb_prompt $)" { } } @@ -175,7 +175,7 @@ proc test_startup {} { # Extract the thread id number of thread 2 from "info threads" output. gdb_test_multiple "info threads" "get thread 2 id" { - -re "(\[0-9\]+)(${horiz}Thread${horiz}thread2.*)($gdb_prompt $)" { + -re "(\[0-9\]+)(${horiz}(Thread|LWP)${horiz}thread2.*)($gdb_prompt $)" { } } diff --git a/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp b/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp index ed03e7ae77a..7ffa221aeae 100644 --- a/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp +++ b/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp @@ -62,7 +62,7 @@ proc test { step_over } { gdb_test "thread 1" "Switching to thread 1.*" - set pattern "\\\* 1\[ \t\]+Thread.*" + set pattern "\\\* 1\[ \t\]+(Thread|LWP).*" gdb_test "info threads" $pattern "thread 1 selected" diff --git a/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp b/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp index ac391ea77fd..27c3c4d392d 100644 --- a/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp +++ b/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp @@ -63,7 +63,7 @@ proc test { schedlock } { gdb_test "continue" "all_threads_signalled.*" \ "continue to all_threads signalled" - gdb_test "info threads" "\\\* 1\[ \t\]+Thread.*" "thread 1 selected" + gdb_test "info threads" "\\\* 1\[ \t\]+(Thread|LWP).*" "thread 1 selected" # With schedlock still enabled, let each thread report its # signal. diff --git a/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp b/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp index fb4cbb0ec57..748f1188d74 100644 --- a/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp +++ b/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp @@ -42,7 +42,7 @@ proc test { command } { gdb_test "continue" "Thread 2 .*received signal SIGUSR1.*" "stop with SIGUSR1" - set pattern "\\\* 2\[ \t\]+Thread.*" + set pattern "\\\* 2\[ \t\]+(Thread|LWP).*" gdb_test "info threads" $pattern "thread 2 intercepted signal" diff --git a/gdb/testsuite/gdb.threads/signal-sigtrap.exp b/gdb/testsuite/gdb.threads/signal-sigtrap.exp index b452731f277..460f333c9de 100644 --- a/gdb/testsuite/gdb.threads/signal-sigtrap.exp +++ b/gdb/testsuite/gdb.threads/signal-sigtrap.exp @@ -41,7 +41,7 @@ proc test { sigtrap_thread } { return 0 } - set pattern "\\\* 2\[ \t\]+Thread.*" + set pattern "\\\* 2\[ \t\]+(Thread|LWP).*" gdb_test "info threads" $pattern "thread 2 hit breakpoint" gdb_test "break sigtrap_handler" "Breakpoint .* at .*$srcfile.*" @@ -57,7 +57,7 @@ proc test { sigtrap_thread } { "Continuing with signal SIGTRAP.*Breakpoint .* sigtrap_handler .*" \ "signal SIGTRAP reaches handler" - set pattern "\\\* $sigtrap_thread\[ \t\]+Thread.*" + set pattern "\\\* $sigtrap_thread\[ \t\]+(Thread|LWP).*" gdb_test "info threads" $pattern "right thread got the signal" } } diff --git a/gdb/testsuite/gdb.threads/staticthreads.exp b/gdb/testsuite/gdb.threads/staticthreads.exp index 958aa2181b1..5aacdffe594 100644 --- a/gdb/testsuite/gdb.threads/staticthreads.exp +++ b/gdb/testsuite/gdb.threads/staticthreads.exp @@ -73,7 +73,7 @@ gdb_test "continue" " .*sem_post .*" "handle $sig helps" set test "info threads" gdb_test_multiple "info threads" "$test" { - -re " Thread .*$gdb_prompt " { + -re " (Thread|LWP) .*$gdb_prompt " { pass "$test" } -re "$gdb_prompt " { diff --git a/gdb/testsuite/gdb.threads/thread-specific-bp.exp b/gdb/testsuite/gdb.threads/thread-specific-bp.exp index f603b24fa31..febc0de1983 100644 --- a/gdb/testsuite/gdb.threads/thread-specific-bp.exp +++ b/gdb/testsuite/gdb.threads/thread-specific-bp.exp @@ -35,7 +35,7 @@ proc get_thread_id {func} { set thre -1 set test "get $func thread id" gdb_test_multiple "info threads" $test { - -re "(\[0-9\]+)\[^\n\r\]*Thread\[^\n\r\]*$func.*$gdb_prompt $" { + -re "(\[0-9\]+)\[^\n\r\]*(Thread|LWP)\[^\n\r\]*$func.*$gdb_prompt $" { # Get the thread's id. set thre $expect_out(1,string) pass $test diff --git a/gdb/testsuite/gdb.threads/thread-specific.exp b/gdb/testsuite/gdb.threads/thread-specific.exp index 3c3055e5dbc..d2fa4b08f74 100644 --- a/gdb/testsuite/gdb.threads/thread-specific.exp +++ b/gdb/testsuite/gdb.threads/thread-specific.exp @@ -41,11 +41,11 @@ proc get_thread_list { } { -re "^ *Id *Target Id\[^\n\]*\n" { exp_continue } - -re "^\\* *(\[0-9\]*) *Thread \[^\n\]*main\[^\n\]*\n" { + -re "^\\* *(\[0-9\]*) *(Thread|LWP) \[^\n\]*main\[^\n\]*\n" { set thr_list "$expect_out(1,string) $thr_list" exp_continue } - -re "^ *(\[0-9\]*) *Thread \[^\n\]*\n" { + -re "^ *(\[0-9\]*) *(Thread|LWP) \[^\n\]*\n" { lappend thr_list $expect_out(1,string) exp_continue } diff --git a/gdb/testsuite/gdb.threads/tls.exp b/gdb/testsuite/gdb.threads/tls.exp index 99e9951f1f6..776376b34f9 100644 --- a/gdb/testsuite/gdb.threads/tls.exp +++ b/gdb/testsuite/gdb.threads/tls.exp @@ -207,19 +207,19 @@ gdb_expect { timeout { fail "continue to first thread (timeout)" } } -gdb_test "info thread" ".*Thread.*spin.*" \ +gdb_test "info thread" ".*(Thread|LWP).*spin.*" \ "at least one th in spin while stopped at first th" check_thread_local "first" gdb_test "continue" ".*Breakpoint 2.*tls value.*" "continue to second thread" -gdb_test "info thread" "Thread.*spin.*" \ +gdb_test "info thread" "(Thread|LWP).*spin.*" \ "at least one th in spin while stopped at second th" check_thread_local "second" gdb_test "continue" ".*Breakpoint 2.*tls value.*" "continue to third thread" -gdb_test "info thread" ".*Thread.*spin.*" \ +gdb_test "info thread" ".*(Thread|LWP).*spin.*" \ "at least one th in spin while stopped at third th" check_thread_local "third" @@ -229,7 +229,7 @@ gdb_test "continue" ".*Breakpoint 3.*still alive.*" "continue to synch point" set no_of_threads 0 send_gdb "info thread\n" gdb_expect { - -re "^info thread\[ \t\r\n\]+ *Id .*Frame\[ \t\r\n\]+.*(\[0-9\]+) *Thread\[^\r\n\]+\r\n$gdb_prompt $" { + -re "^info thread\[ \t\r\n\]+ *Id .*Frame\[ \t\r\n\]+.*(\[0-9\]+) *(Thread|LWP)\[^\r\n\]+\r\n$gdb_prompt $" { set no_of_threads $expect_out(1,string) pass "get number of threads" } @@ -280,10 +280,10 @@ gdb_test "continue" ".*Breakpoint 4.*before exit.*" "threads exited" send_gdb "info thread\n" gdb_expect { - -re ".* 1 *Thread.*2 *Thread.*$gdb_prompt $" { + -re ".* 1 *(Thread|LWP).*2 *(Thread|LWP).*$gdb_prompt $" { fail "too many threads left at end" } - -re ".*\\\* 1 *Thread.*main.*$gdb_prompt $" { + -re ".*\\\* 1 *(Thread|LWP).*main.*$gdb_prompt $" { pass "expect only base thread at end" } -re ".*No stack.*$gdb_prompt $" { diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp index 33bccaa1a6a..12a379002d7 100644 --- a/gdb/testsuite/gdb.trace/report.exp +++ b/gdb/testsuite/gdb.trace/report.exp @@ -385,7 +385,7 @@ proc use_collected_data { data_source } { # There is always a thread of an inferior, either a live one or # a faked one. - gdb_test "info threads" "\\* ${decimal} (process|Thread) \[0-9\.\]+\[ \t\].*" + gdb_test "info threads" "\\* ${decimal} (process|Thread|LWP) \[0-9\.\]+\[ \t\].*" gdb_test "info inferiors" "\\* 1 process ${decimal} \[ \t\]+\[^\r\n\]*\[ \t\]+${binfile}.*" } } diff --git a/gdb/testsuite/gdb.trace/strace.exp b/gdb/testsuite/gdb.trace/strace.exp index bbdd8b78619..c01f9a66106 100644 --- a/gdb/testsuite/gdb.trace/strace.exp +++ b/gdb/testsuite/gdb.trace/strace.exp @@ -139,7 +139,7 @@ proc strace_info_marker { } { # List all the thread. It is expected to get three threads without # any errors. gdb_test_multiple "info threads 3 2 1" "info threads" { - -re "3\[ \t\]+Thread .*2\[ \t\]+Thread .*1\[ \t\]+Thread .*${gdb_prompt} $" { + -re "3\[ \t\]+(Thread|LWP) .*2\[ \t\]+(Thread|LWP) .*1\[ \t\]+(Thread|LWP) .*${gdb_prompt} $" { pass "info threads" } }