From 00dbd492e462565366a2691e0579b510ce4c3733 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 9 Mar 2016 20:24:14 +0000 Subject: [PATCH] More "Program" -> "Thread NN received signal" testsuite adjustment These tests should have been adjusted by f303dbd60d9c (Fix PR threads/19422 - show which thread caused stop), but clearly I had missed grepping for potential-fail cases. gdb/testsuite/ChangeLog 2016-03-09 Pedro Alves * gdb.threads/attach-into-signal.exp: Adjust to "Program received signal" -> "Thread NN received signal" output change. * gdb.threads/ia64-sigill.exp: Likewise. * gdb.threads/linux-dp.exp: Likewise. * gdb.threads/manythreads.exp: Likewise. * gdb.threads/pending-step.exp: Likewise. * gdb.threads/print-threads.exp: Likewise. * gdb.threads/sigstep-threads.exp: Likewise. * gdb.threads/staticthreads.exp: Likewise. * gdb.threads/tls.exp: Likewise. --- gdb/testsuite/ChangeLog | 13 +++++++++++++ gdb/testsuite/gdb.threads/attach-into-signal.exp | 2 +- gdb/testsuite/gdb.threads/ia64-sigill.exp | 2 +- gdb/testsuite/gdb.threads/linux-dp.exp | 2 +- gdb/testsuite/gdb.threads/manythreads.exp | 6 +++--- gdb/testsuite/gdb.threads/pending-step.exp | 2 +- gdb/testsuite/gdb.threads/print-threads.exp | 2 +- gdb/testsuite/gdb.threads/sigstep-threads.exp | 2 +- gdb/testsuite/gdb.threads/staticthreads.exp | 2 +- gdb/testsuite/gdb.threads/tls.exp | 2 +- 10 files changed, 24 insertions(+), 11 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 644a6f1bff4..6ce48bfa023 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,16 @@ +2016-03-09 Pedro Alves + + * gdb.threads/attach-into-signal.exp: Adjust to "Program received + signal" -> "Thread NN received signal" output change. + * gdb.threads/ia64-sigill.exp: Likewise. + * gdb.threads/linux-dp.exp: Likewise. + * gdb.threads/manythreads.exp: Likewise. + * gdb.threads/pending-step.exp: Likewise. + * gdb.threads/print-threads.exp: Likewise. + * gdb.threads/sigstep-threads.exp: Likewise. + * gdb.threads/staticthreads.exp: Likewise. + * gdb.threads/tls.exp: Likewise. + 2016-03-09 Marcin Kościelnicki * gdb.trace/ftrace.exp: Set arg0exp for ppc. diff --git a/gdb/testsuite/gdb.threads/attach-into-signal.exp b/gdb/testsuite/gdb.threads/attach-into-signal.exp index 29197258b3b..c4e1f92fd52 100644 --- a/gdb/testsuite/gdb.threads/attach-into-signal.exp +++ b/gdb/testsuite/gdb.threads/attach-into-signal.exp @@ -86,7 +86,7 @@ proc corefunc { threadtype executable } { # Main test: set test "attach (pass $passes), pending signal catch" if {[gdb_test_multiple "attach $testpid" $test { - -re "Attaching to program.*`?$escapedbinfile'?, process $testpid.*Program received signal SIGALRM.*$gdb_prompt $" { + -re "Attaching to program.*`?$escapedbinfile'?, process $testpid.* received signal SIGALRM.*$gdb_prompt $" { # nonthreaded: pass $test verbose -log "$test succeeded on the attempt # $attempt of $attempts" diff --git a/gdb/testsuite/gdb.threads/ia64-sigill.exp b/gdb/testsuite/gdb.threads/ia64-sigill.exp index e5649ae0b3a..0d470855625 100644 --- a/gdb/testsuite/gdb.threads/ia64-sigill.exp +++ b/gdb/testsuite/gdb.threads/ia64-sigill.exp @@ -67,7 +67,7 @@ gdb_test_multiple "continue" $test { # Breakpoint has been skipped in the other thread. pass $test } - -re "Program received signal .*\r\n$gdb_prompt $" { + -re " received signal .*\r\n$gdb_prompt $" { fail $test } } diff --git a/gdb/testsuite/gdb.threads/linux-dp.exp b/gdb/testsuite/gdb.threads/linux-dp.exp index 6365f7d0985..9f717c79ffa 100644 --- a/gdb/testsuite/gdb.threads/linux-dp.exp +++ b/gdb/testsuite/gdb.threads/linux-dp.exp @@ -94,7 +94,7 @@ for {set i 0} {$i < 5} {incr i} { } -re "^$gdb_prompt $" { } - -re "Program received signal.*(Unknown signal|SIGUSR|Real-time event).*$gdb_prompt $" { + -re " received signal.*(Unknown signal|SIGUSR|Real-time event).*$gdb_prompt $" { # It would be nice if we could catch the message that GDB prints # when it first notices that the thread library doesn't support # debugging, or if we could explicitly ask GDB somehow. diff --git a/gdb/testsuite/gdb.threads/manythreads.exp b/gdb/testsuite/gdb.threads/manythreads.exp index 8cc4c5cc9a3..0dd72b798d6 100644 --- a/gdb/testsuite/gdb.threads/manythreads.exp +++ b/gdb/testsuite/gdb.threads/manythreads.exp @@ -75,8 +75,8 @@ proc interrupt_and_wait { message } { } -re "$gdb_prompt $" { # Note that with this regex order, if GDB emits [New - # Thread ...] output between "Program received signal" and - # the prompt, the "received signal" regex won't match. + # Thread ...] output between "Thread NNN received signal" + # and the prompt, the "received signal" regex won't match. # That's good, as if we see that happening, it's a # regression. # @@ -151,7 +151,7 @@ remote_expect host 1 { -re "\\\[\[^\]\]* exited\\\]\r\n" { exp_continue -continue_timer } - -re "Program received signal SIGINT.*$gdb_prompt $" { + -re " received signal SIGINT.*$gdb_prompt $" { if { $failed == 0 } { fail "check for duplicate SIGINT" } diff --git a/gdb/testsuite/gdb.threads/pending-step.exp b/gdb/testsuite/gdb.threads/pending-step.exp index ffb045c8c09..d3c7d57de25 100644 --- a/gdb/testsuite/gdb.threads/pending-step.exp +++ b/gdb/testsuite/gdb.threads/pending-step.exp @@ -70,7 +70,7 @@ set ok 0 for {set i 0} {$i < $iterations} {incr i} { set ok 0 gdb_test_multiple "next" "$test" { - -re "Program received signal SIGTRAP.*$gdb_prompt $" { + -re " received signal SIGTRAP.*$gdb_prompt $" { fail "$test (spurious SIGTRAP)" } -re "$gdb_prompt $" { diff --git a/gdb/testsuite/gdb.threads/print-threads.exp b/gdb/testsuite/gdb.threads/print-threads.exp index 1de3054afa6..1cbec5f0864 100644 --- a/gdb/testsuite/gdb.threads/print-threads.exp +++ b/gdb/testsuite/gdb.threads/print-threads.exp @@ -72,7 +72,7 @@ proc test_all_threads { name kill } { fail "all threads ran once ($name) (total $i threads ran)" } } - -re "Program received signal SIGTRAP.*(Thread \[-0-9a-fx\]* \\(zombie\\)|0x00000000 in ).*$gdb_prompt $" { + -re " received signal SIGTRAP.*(Thread \[-0-9a-fx\]* \\(zombie\\)|0x00000000 in ).*$gdb_prompt $" { if { $kill == 1 } { kfail "gdb/1265" "Running threads ($name) (zombie thread)" } else { diff --git a/gdb/testsuite/gdb.threads/sigstep-threads.exp b/gdb/testsuite/gdb.threads/sigstep-threads.exp index af4681983aa..99bd133d1cd 100644 --- a/gdb/testsuite/gdb.threads/sigstep-threads.exp +++ b/gdb/testsuite/gdb.threads/sigstep-threads.exp @@ -45,7 +45,7 @@ for {set i 0} {$i < 100} {incr i} { # Presume this step failed - as in the case of a timeout. set failed 1 gdb_test_multiple "step" $test { - -re "\r\nProgram received signal SIGUSR1, User defined signal 1.\r\n" { + -re " received signal SIGUSR1, User defined signal 1.\r\n" { exp_continue -continue_timer } -re "step-(\[012\]).*\r\n$gdb_prompt $" { diff --git a/gdb/testsuite/gdb.threads/staticthreads.exp b/gdb/testsuite/gdb.threads/staticthreads.exp index 8631dfb7b38..16fcb68d18e 100644 --- a/gdb/testsuite/gdb.threads/staticthreads.exp +++ b/gdb/testsuite/gdb.threads/staticthreads.exp @@ -47,7 +47,7 @@ gdb_test_multiple "continue" "$test" { -re "Breakpoint .*, .*sem_post .*$gdb_prompt " { pass "$test" } - -re "Program received signal .*$gdb_prompt " { + -re " received signal .*$gdb_prompt " { kfail gdb/1328 "$test" } } diff --git a/gdb/testsuite/gdb.threads/tls.exp b/gdb/testsuite/gdb.threads/tls.exp index 4d0a2355eb6..29384e5449f 100644 --- a/gdb/testsuite/gdb.threads/tls.exp +++ b/gdb/testsuite/gdb.threads/tls.exp @@ -162,7 +162,7 @@ gdb_test "b [gdb_get_line_number "before exit"]" \ send_gdb "continue\n" gdb_expect { - -re ".*Program received signal SIGSEGV.*a_thread_local = 0;.*$gdb_prompt $" { + -re ".* received signal SIGSEGV.*a_thread_local = 0;.*$gdb_prompt $" { # This is the first symptom if the gcc and binutils versions # in use support TLS, but the system glibc does not. unsupported "continue to first thread: system does not support TLS" -- 2.30.2