From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-81686-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 11210 invoked by alias); 21 Jun 2011 13:57:05 -0000
Received: (qmail 11202 invoked by uid 22791); 21 Jun 2011 13:57:05 -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; Tue, 21 Jun 2011 13:56:45 +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 p5LDui37007234	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)	for <gdb-patches@sourceware.org>; Tue, 21 Jun 2011 09:56:44 -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 p5LDuhQX021005	for <gdb-patches@sourceware.org>; Tue, 21 Jun 2011 09:56:44 -0400
Message-ID: <4E00A31B.6030500@redhat.com>
Date: Tue, 21 Jun 2011 13:57: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: "gdb-patches@sourceware.org" <gdb-patches@sourceware.org>
Subject: [PATCH] gdb.mi/mi-var-display.exp: fix racy tests (PR testsuite/12649)
Content-Type: text/plain; charset=UTF-8
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-06/txt/msg00284.txt.bz2

Another one where we need to replace gdb_test_multiple with mi_gdb_test
to prevent failures with read1().  Note that when setting `fp', we need
to s/1/3/ since the index 1 and 2 is used by mi_gdb_test.  Tested with 
both read{,1}.  OK to apply?

2011-06-21  Marek Polacek  <mpolacek@redhat.com>

        * gdb.mi/mi-var-display.exp: Replace gdb_test_multiple with mi_gdb_test.

--- gdb/gdb/testsuite/gdb.mi/mi-var-display.exp.mp      2011-06-21 13:05:15.679575309 +0200
+++ gdb/gdb/testsuite/gdb.mi/mi-var-display.exp 2011-06-21 13:34:06.561961094 +0200
@@ -605,12 +605,8 @@ mi_gdb_test "-var-list-children anone" \
 
 
 # Record fp
-
-gdb_test_multiple "p/x \$fp" "print FP register" {
-    -re ".*($hex).*\\^done\r\n$mi_gdb_prompt$" { 
-       pass "print FP register"
-       set fp $expect_out(1,string) 
-    }
+if ![mi_gdb_test "p/x \$fp" ".*($hex).*\\^done" "Xprint FP register"] {
+       set fp $expect_out(3,string) 
 }
 
 mi_continue_to "incr_a"