From patchwork Fri Jan 22 20:25:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kratochvil X-Patchwork-Id: 10526 Received: (qmail 73242 invoked by alias); 22 Jan 2016 20:25:56 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 73218 invoked by uid 89); 22 Jan 2016 20:25:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=UD:gdb.gdb, gdb.gdb, gdbgdb X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 22 Jan 2016 20:25:55 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id D869E8F517 for ; Fri, 22 Jan 2016 20:25:53 +0000 (UTC) Received: from host1.jankratochvil.net (ovpn-116-93.ams2.redhat.com [10.36.116.93]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0MKPopD002729 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 22 Jan 2016 15:25:52 -0500 Date: Fri, 22 Jan 2016 21:25:48 +0100 From: Jan Kratochvil To: Pedro Alves Cc: gdb-patches@sourceware.org Subject: [commit] [testsuite patch]#2 Fix PR threads/19422 regression + Guile regression [Re: [PATCH+doc] Fix PR threads/19422 - show which thread caused stop] Message-ID: <20160122202548.GA14352@host1.jankratochvil.net> References: <1451950202-18024-1-git-send-email-palves@redhat.com> <5697ABE8.7060705@redhat.com> <20160122173020.GA5946@host1.jankratochvil.net> <20160122173100.GA5990@host1.jankratochvil.net> <56A276EB.1070208@redhat.com> <20160122200542.GA12621@host1.jankratochvil.net> <56A28CE6.3090406@redhat.com> <56A28E40.205@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <56A28E40.205@redhat.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-IsSubscribed: yes On Fri, 22 Jan 2016 21:17:04 +0100, Pedro Alves wrote: > Not all targets support thread names, and even those that do, not all > use the program name as default thread name -- I think that's only true > for GNU/Linux, actually. OK, changed. Considered it as an implicit approval, therefore checked in. Thanks, Jan The PR threads/19422 patchset added a new regression. Additionally below it there was already a regression if --with-guile (which is default if Guile is found) was used. racy case #1: (xgdb) PASS: gdb.gdb/selftest.exp: Set xgdb_prompt ^M Thread 1 "xgdb" received signal SIGINT, Interrupt.^M 0x00007ffff583bfdd in poll () from /lib64/libc.so.6^M (gdb) FAIL: gdb.gdb/selftest.exp: send ^C to child process signal SIGINT^M Continuing with signal SIGINT.^M ^C^M Thread 1 "xgdb" received signal SIGINT, Interrupt.^M 0x00007ffff5779da0 in sigprocmask () from /lib64/libc.so.6^M (gdb) PASS: gdb.gdb/selftest.exp: send SIGINT signal to child process backtrace^M errstring=errstring@entry=0x7e0e6c "", mask=mask@entry=RETURN_MASK_ALL) at exceptions.c:240^M errstring=errstring@entry=0x7e0e6c "", mask=mask@entry=RETURN_MASK_ALL) at exceptions.c:240^M (gdb) PASS: gdb.gdb/selftest.exp: backtrace through signal handler racy case #2: (xgdb) PASS: gdb.gdb/selftest.exp: Set xgdb_prompt ^M Thread 1 "xgdb" received signal SIGINT, Interrupt.^M 0x00007ffff583bfdd in poll () from /lib64/libc.so.6^M (gdb) FAIL: gdb.gdb/selftest.exp: send ^C to child process signal SIGINT^M Continuing with signal SIGINT.^M ^C^M Thread 2 "xgdb" received signal SIGINT, Interrupt.^M [Switching to Thread 0x7ffff3b7f700 (LWP 13227)]^M 0x00007ffff6b88b10 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0^M (gdb) PASS: gdb.gdb/selftest.exp: send SIGINT signal to child process backtrace^M (gdb) FAIL: gdb.gdb/selftest.exp: backtrace through signal handler Pedro Alves: Not all targets support thread names, and even those that do, not all use the program name as default thread name -- I think that's only true for GNU/Linux, actually. So I think it's best to not expect that, like: -re "(Thread .*|Program) received signal SIGINT.*$gdb_prompt $" { gdb/testsuite/ChangeLog 2016-01-22 Jan Kratochvil Fix testsuite compatibility with Guile. * gdb.gdb/selftest.exp (send ^C to child process): Accept also Thread. (thread 1): New test for backtrace through signal handler. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.gdb/selftest.exp | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index d7721d5..5e99adf 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-01-22 Jan Kratochvil + + Fix testsuite compatibility with Guile. + * gdb.gdb/selftest.exp (send ^C to child process): Accept also Thread. + (thread 1): New test for backtrace through signal handler. + 2016-01-22 Yao Qi PR testsuite/19491 diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp index 4d55cb5..3d98a0c 100644 --- a/gdb/testsuite/gdb.gdb/selftest.exp +++ b/gdb/testsuite/gdb.gdb/selftest.exp @@ -436,8 +436,9 @@ proc test_with_self { executable } { if ![target_info exists gdb,nointerrupts] { set description "send ^C to child process" send_gdb "\003" + # "Thread 1" is displayed iff Guile support is linked in. gdb_expect { - -re "Program received signal SIGINT.*$gdb_prompt $" { + -re "(Thread 1 .*|Program) received signal SIGINT.*$gdb_prompt $" { pass "$description" } -re ".*$gdb_prompt $" { @@ -453,6 +454,10 @@ proc test_with_self { executable } { gdb_test "signal SIGINT" \ "Continuing with signal SIGINT.*" \ "$description" + + # Switch back to the GDB thread if Guile support is linked in. + # "signal SIGINT" could also switch the current thread. + gdb_test "thread 1" {\[Switching to thread 1 .*\].*} # get a stack trace #