From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 46530 invoked by alias); 6 Mar 2016 16:40:15 -0000 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 Received: (qmail 46514 invoked by uid 89); 6 Mar 2016 16:40:14 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_PASS autolearn=ham version=3.3.2 spammy=y*, 3*, PENDING, enb X-HELO: xyzzy.0x04.net Received: from xyzzy.0x04.net (HELO xyzzy.0x04.net) (109.74.193.254) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 06 Mar 2016 16:40:13 +0000 Received: from hogfather.0x04.net (89-65-66-135.dynamic.chello.pl [89.65.66.135]) by xyzzy.0x04.net (Postfix) with ESMTPS id 4A34741098 for ; Sun, 6 Mar 2016 17:35:59 +0100 (CET) Received: by hogfather.0x04.net (Postfix, from userid 1000) id 8292D580090; Sun, 6 Mar 2016 17:35:00 +0100 (CET) From: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= To: gdb-patches@sourceware.org Cc: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= Subject: [PATCH 5/8] gdb.trace/change-loc.exp: Don't depend on tracepoint ordering. Date: Sun, 06 Mar 2016 16:40:00 -0000 Message-Id: <1457282097-7201-6-git-send-email-koriakin@0x04.net> In-Reply-To: <1457282097-7201-1-git-send-email-koriakin@0x04.net> References: <1457282097-7201-1-git-send-email-koriakin@0x04.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-IsSubscribed: yes X-SW-Source: 2016-03/txt/msg00108.txt.bz2 powerpc (32-bit) loads shared libraries below the main executable, so the PENDING location is the first one, which the current regex doesn't match. Split it into two tests instead, one looking for the pending tracepoint location, and the other for two installed locations. gdb/testsuite/ChangeLog: * gdb.trace/change-loc.exp: Don't depend on tracepoint location ordering. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.trace/change-loc.exp | 20 ++++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index e2835d5..2cf9531 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2016-03-05 Marcin Kościelnicki + * gdb.trace/change-loc.exp: Don't depend on tracepoint location + ordering. + +2016-03-05 Marcin Kościelnicki + * gdb.trace/unavailable-dwarf-piece.c (foo): Add foo_start_lbl label. (bar): Add bar_start_lbl label. * gdb.trace/unavailable-dwarf-piece.exp: Use foo/bar_start_lbl instead diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp index 80beb4d..c4e0b4b 100644 --- a/gdb/testsuite/gdb.trace/change-loc.exp +++ b/gdb/testsuite/gdb.trace/change-loc.exp @@ -152,8 +152,14 @@ proc tracepoint_change_loc_1 { trace_type } { gdb_test "info trace" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\.* -4\.1.* in func4.*\tinstalled on target\r\n(4\.2.* in func4.*\tinstalled on target\r\n4\.3.* \\[\t \]+set_tracepoint|4\.2.* \\[\t \]+set_tracepoint.*4\.3.* in func4.*\tinstalled on target).*" \ - "tracepoint with two locations (unload)" +(4\.\[1-3].* in func4.*\tinstalled on target.*){2}" \ + "tracepoint with two locations - installed (unload)" + + gdb_test "info trace" \ + "Num Type\[ \]+Disp Enb Address\[ \]+What.* +\[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\.* +4\.\[1-3].* \\[\t \]+set_tracepoint.*" \ + "tracepoint with two locations - pending (unload)" gdb_test_no_output "tstop" @@ -262,8 +268,14 @@ proc tracepoint_change_loc_2 { trace_type } { gdb_test "info trace" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\.* -1\.1.* in func4.*\tinstalled on target\r\n(1\.2.* in func4.*\tinstalled on target\r\n1\.3.* \\[\t \]+set_tracepoint|1\.2.* \\[\t \]+set_tracepoint\r\n1\.3.* in func4.*\tinstalled on target).*" \ - "tracepoint with two locations (unload)" +(1\.\[1-3].* in func4.*\tinstalled on target.*){2}" \ + "tracepoint with two locations - installed (unload)" + + gdb_test "info trace" \ + "Num Type\[ \]+Disp Enb Address\[ \]+What.* +\[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\.* +1\.\[1-3].* \\[\t \]+set_tracepoint.*" \ + "tracepoint with two locations - pending (unload)" gdb_test_no_output "tstop" -- 2.7.2