From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-81323-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 23912 invoked by alias); 27 May 2011 14:07:14 -0000
Received: (qmail 23899 invoked by uid 22791); 27 May 2011 14:07:13 -0000
X-SWARE-Spam-Status: No, hits=-6.9 required=5.0	tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD
X-Spam-Check-By: sourceware.org
Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28)    by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 27 May 2011 14:06:59 +0000
Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p4RE6qbL017754	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);	Fri, 27 May 2011 10:06:53 -0400
Received: from dhcp-25-89.brq.redhat.com (pdp-11.brq.redhat.com [10.34.24.63])	by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p4RE6pHY009424;	Fri, 27 May 2011 10:06:52 -0400
Message-ID: <4DDFAFFB.5000501@redhat.com>
Date: Fri, 27 May 2011 14:07:00 -0000
From: Marek Polacek <mpolacek@redhat.com>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.9) Gecko/20100827 Red Hat Thunderbird/3.1.3
MIME-Version: 1.0
To: Pedro Alves <pedro@codesourcery.com>
CC: gdb-patches@sourceware.org, Tom Tromey <tromey@redhat.com>
Subject: Re: [PATCH] gdb.mi/mi-nonstop.exp: fix racy tests (PR testsuite/12649)
References: <4DD4F3B7.2070003@redhat.com> <m34o4h1ldc.fsf@fleche.redhat.com> <201105261732.05437.pedro@codesourcery.com>
In-Reply-To: <201105261732.05437.pedro@codesourcery.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-IsSubscribed: yes
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
X-SW-Source: 2011-05/txt/msg00634.txt.bz2

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?

2011-05-27  Marek Polacek  <mpolacek@redhat.com>

        * 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"