From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29795 invoked by alias); 27 May 2011 14:14:15 -0000 Received: (qmail 29778 invoked by uid 22791); 27 May 2011 14:14:14 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 27 May 2011 14:14:00 +0000 Received: (qmail 5407 invoked from network); 27 May 2011 14:13:59 -0000 Received: from unknown (HELO scottsdale.localnet) (pedro@127.0.0.2) by mail.codesourcery.com with ESMTPA; 27 May 2011 14:13:59 -0000 From: Pedro Alves To: gdb-patches@sourceware.org Subject: Re: [PATCH] gdb.mi/mi-nonstop.exp: fix racy tests (PR testsuite/12649) Date: Fri, 27 May 2011 14:14:00 -0000 User-Agent: KMail/1.13.6 (Linux/2.6.38-8-generic; KDE/4.6.2; x86_64; ; ) Cc: Marek Polacek , Tom Tromey References: <4DD4F3B7.2070003@redhat.com> <201105261732.05437.pedro@codesourcery.com> <4DDFAFFB.5000501@redhat.com> In-Reply-To: <4DDFAFFB.5000501@redhat.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201105271513.57369.pedro@codesourcery.com> X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2011-05/txt/msg00635.txt.bz2 On Friday 27 May 2011 15:06:51, Marek Polacek wrote: > On 05/26/2011 06:32 PM, Pedro Alves wrote: > [...] > > Another take, now with the mi_gdb_test and the mi_expect_interrupt. > Tested with both read{,1}. Ok? Yes, thanks. > > 2011-05-27 Marek Polacek > > * gdb.mi/mi-nonstop.exp: Replace gdb_test_multiple with mi_gdb_test. > > --- gdb/gdb/testsuite/gdb.mi/mi-nonstop.exp.mp 2011-05-27 14:36:57.000000000 +0200 > +++ gdb/gdb/testsuite/gdb.mi/mi-nonstop.exp 2011-05-27 15:54:27.063216883 +0200 > @@ -81,22 +81,17 @@ mi_varobj_update * {I_W1 I_W0} "update v > mi_check_varobj_value I_W0 1 "check varobj, w0, 1" > mi_check_varobj_value I_W1 1 "check varobj, w1, 1" > > -gdb_test_multiple "-exec-interrupt --thread 1" "interrupted" { > - -re "\\^done\r\n$mi_gdb_prompt\\*stopped\[^\r\n\]+\r\n$" { > - pass "interrupted" > - } > -} > +mi_gdb_test "-exec-interrupt --thread 1" "\\^done" "interrupted" > +mi_expect_interrupt "got interrupt" > + > # The interrupt command sends SIGINT to the target, and therefore the > # thread might not be stopped immediately when we return from the target. > # So, wait a bit > sleep 1 > mi_check_thread_states {"stopped" "stopped" "stopped"} "thread state, stop 4" > > -gdb_test_multiple "-exec-continue --all" "resume all" { > - -re ".*\\*running,thread-id=\"3\"\r\n\\*running,thread-id=\"2\"\r\n\\*running,thread-id=\"1\"\r\n$mi_gdb_prompt" { > - pass "resume all" > - } > -} > +mi_gdb_test "-exec-continue --all" ".*\\*running,thread-id=\"3\"\r\n\\*running,thread-id=\"2\"\r\n\\*running,thread-id=\"1\"" \ > + "resume all" > > mi_expect_stop "breakpoint-hit" "break_at_me" "\[^\n\]*" "non-stop.c" "\[0-9\]*" {"" "disp=\"keep\""} "w0,i2 stop" > mi_expect_stop "breakpoint-hit" "break_at_me" ".*" "non-stop.c" ".*" {"" "disp=\"keep\""} "w1,i2 stop" > -- Pedro Alves