From patchwork Tue May 3 20:00:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 11993 Received: (qmail 38477 invoked by alias); 3 May 2016 20:00:35 -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 38453 invoked by uid 89); 3 May 2016 20:00:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.9 required=5.0 tests=BAYES_00, KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 spammy=load_lib, states, sleep X-HELO: usplmg20.ericsson.net Received: from usplmg20.ericsson.net (HELO usplmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Tue, 03 May 2016 20:00:23 +0000 Received: from EUSAAHC007.ericsson.se (Unknown_Domain [147.117.188.93]) by usplmg20.ericsson.net (Symantec Mail Security) with SMTP id 69.BD.09012.ECBF8275; Tue, 3 May 2016 21:28:14 +0200 (CEST) Received: from elxcz23q12-y4.dyn.mo.ca.am.ericsson.se (147.117.188.8) by smtps-am.internal.ericsson.com (147.117.188.93) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 3 May 2016 16:00:16 -0400 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH] Add mi-threads-interrupt.exp test (PR 20039) Date: Tue, 3 May 2016 16:00:12 -0400 Message-ID: <1462305612-16493-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-IsSubscribed: yes Add a new test for PR 20039. The test spawns new threads, then tries to interrupt, continue, and interrupt again. This use case was fixed by commit 5fe966540d6b748f825774868463003700f0c878 in master, but gdb 7.11 is affected (so if you try it on the gdb-7.11-branch right now, the test will fail). gdb/testsuite/ChangeLog: * gdb.mi/mi-threads-interrupt.c: New file. * gdb.mi/mi-threads-interrupt.exp: New file. --- gdb/testsuite/gdb.mi/mi-threads-interrupt.c | 61 +++++++++++++++++++++++++++ gdb/testsuite/gdb.mi/mi-threads-interrupt.exp | 60 ++++++++++++++++++++++++++ 2 files changed, 121 insertions(+) create mode 100644 gdb/testsuite/gdb.mi/mi-threads-interrupt.c create mode 100644 gdb/testsuite/gdb.mi/mi-threads-interrupt.exp diff --git a/gdb/testsuite/gdb.mi/mi-threads-interrupt.c b/gdb/testsuite/gdb.mi/mi-threads-interrupt.c new file mode 100644 index 0000000..8747806 --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-threads-interrupt.c @@ -0,0 +1,61 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2016 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include +#include + +#define NUM_THREADS 2 + +static pthread_barrier_t barrier; + +static void * +thread_func (void *v) +{ + int i; + + pthread_barrier_wait (&barrier); + + for (i = 0; i < 100; i++) + sleep (1); +} + +static void +all_threads_created (void) +{ +} + +int +main(void) +{ + int i; + pthread_t threads[NUM_THREADS]; + + /* +1 to account for the main thread */ + pthread_barrier_init (&barrier, NULL, NUM_THREADS + 1); + + for (i = 0; i < NUM_THREADS; i++) + pthread_create (&threads[i], NULL, thread_func, NULL); + + pthread_barrier_wait (&barrier); + + all_threads_created (); + + for (i = 0; i < 100; i++) + sleep (1); + + return 0; +} diff --git a/gdb/testsuite/gdb.mi/mi-threads-interrupt.exp b/gdb/testsuite/gdb.mi/mi-threads-interrupt.exp new file mode 100644 index 0000000..2bcdeba --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-threads-interrupt.exp @@ -0,0 +1,60 @@ +# Copyright 2016 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +load_lib mi-support.exp +set MIFLAGS "-i=mi" + +standard_testfile + +if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable {debug}] != "" } { + return -1 +} + +# This tests the resolution of PR 20039. +# +# With a multi-threaded inferior and with MI/all-stop, it was not possible +# to interrupt it with ctrl-C after a continue. + +proc test_continue_interrupt { } { + global binfile + + gdb_exit + if {[mi_gdb_start]} { + continue + } + + # Load the binary in gdb and run it. + mi_gdb_load $binfile + mi_runto "all_threads_created" + + # Consistency check. + mi_check_thread_states {"stopped" "stopped" "stopped"} "check thread states" + + # Continue. + mi_gdb_test "565-exec-continue" "565\\^running\r\n\\*running,thread-id=\"all\"" "continue #1" + + # Send ctrl-C + send_gdb "\003" + mi_expect_interrupt "interrupt #1" + + # Continue. + mi_gdb_test "565-exec-continue" "565\\^running\r\n\\*running,thread-id=\"all\"" "continue #2" + + # Send ctrl-C again. + send_gdb "\003" + mi_expect_interrupt "interrupt #2" +} + +test_continue_interrupt