From patchwork Fri Oct 14 10:53:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 16500 Received: (qmail 59524 invoked by alias); 14 Oct 2016 10:53:29 -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 59298 invoked by uid 89); 14 Oct 2016 10:53:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1920, ptid X-HELO: mail-pf0-f196.google.com Received: from mail-pf0-f196.google.com (HELO mail-pf0-f196.google.com) (209.85.192.196) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 14 Oct 2016 10:53:17 +0000 Received: by mail-pf0-f196.google.com with SMTP id 128so7038863pfz.1 for ; Fri, 14 Oct 2016 03:53:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=c20pmRpOp4ipFA5+PaWJE/SRBi5o2j6wqVdOflZZnNk=; b=lqGbOPCJFV4B7h1JpOgxve+JjG/aEBvl2kTJ0Z8NuTj5OXALjR17ysvnHdOhj6FTDp chXJVN+CKyELGKDmawNItP0jhWaWH4aOQiNaHzpso+BVsSE48NAU8+7f8B2mKuz53j7k NQngCIQ+Td39vTjBke5PRS6q0uJceRtQ35SqT1F4/Y2vx0dvdOerIRMOXeLw8adcSRZ2 dxL2s89e8qFO8hLUuMsH/yqSRuStj3dfISl/lCX5YKKKBo0sy2XozB5KoQ4eW7zk2SXM 9rIX/mhDVRlzfZgpKBO8gF95z2I7FflovVLiapvkBXaixecLWmHEKDGdU3uH/p+C9v+J Ta3A== X-Gm-Message-State: AA6/9RlzV0XZSUoNY19ymRplBc6V/kLEIPTyb5uTVDWbmamJALqnsOGMifUVkeKe+7N3UA== X-Received: by 10.98.141.19 with SMTP id z19mr12160071pfd.105.1476442395759; Fri, 14 Oct 2016 03:53:15 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (gcc1-power7.osuosl.org. [140.211.15.137]) by smtp.gmail.com with ESMTPSA id b4sm26598432paw.10.2016.10.14.03.53.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Oct 2016 03:53:15 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 1/3] Use get_var_address in test cases Date: Fri, 14 Oct 2016 11:53:05 +0100 Message-Id: <1476442387-17291-2-git-send-email-yao.qi@linaro.org> In-Reply-To: <1476442387-17291-1-git-send-email-yao.qi@linaro.org> References: <1476442387-17291-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes This patch uses get_var_address more. gdb/testsuite: 2016-10-13 Yao Qi * gdb.python/py-events.exp: Call get_var_address. * gdb.trace/tracecmd.exp: Call get_var_address and match possible leading zeros. --- gdb/testsuite/gdb.python/py-events.exp | 7 +------ gdb/testsuite/gdb.trace/tracecmd.exp | 9 ++++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/gdb/testsuite/gdb.python/py-events.exp b/gdb/testsuite/gdb.python/py-events.exp index de8de07..602fbae 100644 --- a/gdb/testsuite/gdb.python/py-events.exp +++ b/gdb/testsuite/gdb.python/py-events.exp @@ -88,12 +88,7 @@ gdb_test_multiple "info threads" "get current thread" { } } -gdb_test_multiple "print do_nothing" "get address of do_nothing" { - -re "\[^\n\r\]*(0x\[0-9a-f\]+) \.*$gdb_prompt $" { - set addr $expect_out(1,string) - pass "get address of do_nothing" - } -} +set addr [get_var_address "do_nothing"] set expected [list "event type: pre-call"] lappend expected "ptid: \\($process_id, $process_id, 0\\)" "address: $addr" diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp index 11ef691..7e1dc4b 100644 --- a/gdb/testsuite/gdb.trace/tracecmd.exp +++ b/gdb/testsuite/gdb.trace/tracecmd.exp @@ -114,11 +114,10 @@ gdb_test "info trace" "$asm_test_addr.*gdb_asm_test.*" \ # 1.7 trace at function's exact address # Collect the address of the function for comparison -gdb_test_multiple "print gdb_recursion_test" "" { - -re "\[$\]\[0-9\].*0x(\[0-9a-fA-F\]+).*$gdb_prompt $" { - set c_test_addr $expect_out(1,string) - } -} +set c_test_addr [get_var_address "gdb_recursion_test"] +# Match leading zeros in address. +set c_test_addr [string range $c_test_addr 2 [expr {[string length $c_test_addr] -1}]] +set c_test_addr "0x(0)*$c_test_addr" gdb_delete_tracepoints gdb_test "trace \*gdb_recursion_test" \