From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4836 invoked by alias); 19 May 2011 10:41:38 -0000 Received: (qmail 4827 invoked by uid 22791); 19 May 2011 10:41:37 -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; Thu, 19 May 2011 10:41:18 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p4JAeuZK012061 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 19 May 2011 06:41:07 -0400 Received: from dhcp-25-89.brq.redhat.com (pdp-11.brq.redhat.com [10.34.24.63]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p4JAetdc003563 for ; Thu, 19 May 2011 06:40:56 -0400 Message-ID: <4DD4F3B7.2070003@redhat.com> Date: Thu, 19 May 2011 10:41:00 -0000 From: Marek Polacek 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" Subject: [PATCH] gdb.mi/mi-nonstop.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: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2011-05/txt/msg00434.txt.bz2 In this test, there were three occurrences of the gdb_tes_multiple. All of them are of course causing races. The first case is exactly the same as in `mi-nonstop-exit.exp'. The second test case cannot be, I think, converted to mi_gdb_test :(. It is because mi_gdb_test automatically appends `\[\r\n\]+$mi_gdb_prompt', but in this particular case, we don't want this, since we expect the following (no prompt at the end, instead, prompt is in the middle): -exec-interrupt --thread 1 ^done (gdb) *stopped,reason="signal-received",signal-name="0",signal-meaning="... And the third case could be, fortunately, converted into mi_gdb_test. Tested with both read{,1}. Ok? 2011-05-19 Marek Polacek * gdb.mi/mi-nonstop.exp: Use the send_gdb+gdb_expect or mi_gdb_test instead of the gdb_test_multiple. --- gdb/gdb/testsuite/gdb.mi/mi-nonstop.exp.mp 2011-01-01 16:33:47.000000000 +0100 +++ gdb/gdb/testsuite/gdb.mi/mi-nonstop.exp 2011-05-19 12:33:22.038216967 +0200 @@ -47,13 +47,17 @@ mi_gdb_reinitialize_dir $srcdir/$subdir mi_gdb_load $binfile set supported 0 -gdb_test_multiple "-gdb-show non-stop" "" { - -re ".*\\^done,value=\"off\",supported=\"(\[^\"\]+)\"\r\n$mi_gdb_prompt$" { +send_gdb "-gdb-show non-stop\n" +gdb_expect { + -re "\\^done,value=\"off\",supported=\"(\[^\"\]+)\"\r\n$mi_gdb_prompt$" { if { $expect_out(1,string) == "1" } { set supported 1 } } + -re "\\^done,value=\"off\"\r\n$mi_gdb_prompt$" { + } -re ".*$mi_gdb_prompt$" { + fail "-gdb-show non-stop" } } @@ -92,22 +96,21 @@ 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" { +send_gdb "-exec-interrupt --thread 1\n" +gdb_expect { -re "\\^done\r\n$mi_gdb_prompt\\*stopped\[^\r\n\]+\r\n$" { pass "interrupted" } } + # 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"