From patchwork Wed Mar 19 15:57:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 162 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx20.g.dreamhost.com (caibbdcaaahc.dreamhost.com [208.113.200.72]) by wilcox.dreamhost.com (Postfix) with ESMTP id 4C9C13600D6 for ; Wed, 19 Mar 2014 08:58:28 -0700 (PDT) Received: by homiemail-mx20.g.dreamhost.com (Postfix, from userid 14314964) id 0E74340DDDAEB; Wed, 19 Mar 2014 08:58:28 -0700 (PDT) X-Original-To: gdb@patchwork.siddhesh.in Delivered-To: x14314964@homiemail-mx20.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx20.g.dreamhost.com (Postfix) with ESMTPS id DECF340DDDABC for ; Wed, 19 Mar 2014 08:58:27 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=M4TkAZO84tGSCmocLOviIbsSH8kq1vz 91zhV1pa7aegry/j5fNVr65CzmJka6Y1p5KyQ5ZksBrwGjX8QAIuDW1lZfc42oaQ p8JjBe9SQme4yKw6KGpbRfSHt4birR61jAkkRdFasjCsslWiS3euovka9bi0mIGC BiTLrWLN2Mw4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=ip5Q9VHCoC0WoEDO/31j8p22n2o=; b=OMgJf fm1r4aq+/+5vGw9/8t7fobKt1kjNFrDhvj/NAEsa3kFvZhCr5Xfb9LnTWy26Bxuw E+7FERk6QJ5omtEhD2bBF1Ro3FDxewpvB4su8T0AxTIYXeXMANW4UxQhMD+zL2WR Vc7KoxHn0Fdjts/g0QRC/AMSFHpe9K4gl6uVAA= Received: (qmail 19775 invoked by alias); 19 Mar 2014 15:58:09 -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 19720 invoked by uid 89); 19 Mar 2014 15:58:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.8 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD, UNSUBSCRIBE_BODY autolearn=no version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 19 Mar 2014 15:58:07 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s2JFw5pY008895 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 19 Mar 2014 11:58:05 -0400 Received: from brno.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s2JFw1ME008699 for ; Wed, 19 Mar 2014 11:58:05 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PUSHED 3/8] gdb.base/async.exp: Fix stepi& test. Date: Wed, 19 Mar 2014 15:57:56 +0000 Message-Id: <1395244681-24272-4-git-send-email-palves@redhat.com> In-Reply-To: <1395244681-24272-1-git-send-email-palves@redhat.com> References: <1395244681-24272-1-git-send-email-palves@redhat.com> X-DH-Original-To: gdb@patchwork.siddhesh.in Currently the test assumes that "stepi" over: 13 x = 5; end up somewhere midline. But, (at least) on x86, that assignment ends up compiled as just one movl instruction, so a stepi stops at the next line already: completed. PASS: gdb.base/async.exp: step & step& (gdb) foo () at ../../../src/gdb/testsuite/gdb.base/async.c:13 13 x = 5; completed. PASS: gdb.base/async.exp: step & stepi& (gdb) 14 y = 3; completed. FAIL: gdb.base/async.exp: (timeout) stepi & nexti& (gdb) 16 return x + y; completed. FAIL: gdb.base/async.exp: (timeout) nexti & finish& Run till exit from #0 foo () at ../../../src/gdb/testsuite/gdb.base/async.c:16 This patch fixes it, by making sure there's more than one instruction in that line. gdb/testsuite/ 2014-03-19 Pedro Alves * gdb.base/async.c (foo): Make 'x' volatile. Write to it twice in the same line. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/async.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index fa7b282..cc8de97 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2014-03-19 Pedro Alves + * gdb.base/async.c (foo): Make 'x' volatile. Write to it twice in + the same line. + +2014-03-19 Pedro Alves + * gdb.base/async.c (main): Add "jump here" and "until here" line marker comments. * gdb.base/async.exp (jump_here): New global. diff --git a/gdb/testsuite/gdb.base/async.c b/gdb/testsuite/gdb.base/async.c index fb53082..76ce8be 100644 --- a/gdb/testsuite/gdb.base/async.c +++ b/gdb/testsuite/gdb.base/async.c @@ -8,9 +8,10 @@ int foo () #endif { - int x, y; + int y; + volatile int x; - x = 5; + x = 5; x = 5; y = 3; return x + y;