From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10067 invoked by alias); 4 Dec 2012 04:45:55 -0000 Received: (qmail 9995 invoked by uid 22791); 4 Dec 2012 04:45:53 -0000 X-SWARE-Spam-Status: No, hits=-4.5 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 04 Dec 2012 04:45:26 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1TfkNo-0006sf-Qi from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Mon, 03 Dec 2012 20:45:24 -0800 Received: from SVR-ORW-FEM-02.mgc.mentorg.com ([147.34.96.206]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Mon, 3 Dec 2012 20:45:24 -0800 Received: from qiyao.dyndns.org.dyndns.org (147.34.91.1) by svr-orw-fem-02.mgc.mentorg.com (147.34.96.168) with Microsoft SMTP Server id 14.1.289.1; Mon, 3 Dec 2012 20:45:23 -0800 From: Yao Qi To: Subject: [PATCH 6/6] Update test cases for 'installed' field. Date: Tue, 04 Dec 2012 04:45:00 -0000 Message-ID: <1354596282-32526-7-git-send-email-yao@codesourcery.com> In-Reply-To: <1354596282-32526-1-git-send-email-yao@codesourcery.com> References: <1354596282-32526-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain 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: 2012-12/txt/msg00052.txt.bz2 With the new field 'installed', tests depends on the output of 'info trace' should be updated. gdb/testsuite: 2012-12-03 Yao Qi * gdb.trace/actions.exp: Update test for 'installed' field. * gdb.trace/change-loc.exp (tracepoint_change_loc_1): (tracepoint_change_loc_2): Likewise. * gdb.trace/deltrace.exp: Likewise. * gdb.trace/infotrace.exp: Likewise. * gdb.trace/mi-traceframe-changed.exp (test_tfind_remote): Likewise. * gdb.trace/passcount.exp: Likewise. * gdb.trace/tracecmd.exp: Likewise. * gdb.trace/while-stepping.exp: Likewise. --- gdb/testsuite/gdb.trace/actions.exp | 25 +++++++++++++++--- gdb/testsuite/gdb.trace/change-loc.exp | 6 +++- gdb/testsuite/gdb.trace/deltrace.exp | 22 ++++++++++++--- gdb/testsuite/gdb.trace/infotrace.exp | 10 +++++-- gdb/testsuite/gdb.trace/mi-traceframe-changed.exp | 3 +- gdb/testsuite/gdb.trace/passcount.exp | 28 +++++++++++++++------ gdb/testsuite/gdb.trace/tracecmd.exp | 13 ++++++--- gdb/testsuite/gdb.trace/while-stepping.exp | 3 +- 8 files changed, 81 insertions(+), 29 deletions(-) diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp index 5e2cb12..0345f0d 100644 --- a/gdb/testsuite/gdb.trace/actions.exp +++ b/gdb/testsuite/gdb.trace/actions.exp @@ -80,8 +80,11 @@ gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. \[\t \]+collect gdb_char_test. +\[\t \]+installed n . \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. -\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+" \ +\[\t \]+installed n . +\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+. +\[\t \]+installed n ." \ "5.1c: verify actions set for first tracepoint" gdb_trace_setactions "5.1d: set actions for second tracepoint" \ @@ -92,9 +95,12 @@ gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. \[\t \]+collect gdb_char_test. +\[\t \]+installed n . \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. \[\t \]+collect gdb_short_test. -\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+" \ +\[\t \]+installed n . +\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+. +\[\t \]+installed n ." \ "5.1e: verify actions set for second tracepoint" gdb_trace_setactions "5.2a: set actions for last (default) tracepoint" \ @@ -105,10 +111,13 @@ gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. \[\t \]+collect gdb_char_test. +\[\t \]+installed n . \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. \[\t \]+collect gdb_short_test. +\[\t \]+installed n . \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+. -\[\t \]+collect gdb_long_test." \ +\[\t \]+collect gdb_long_test. +\[\t \]+installed n ." \ "5.2b: verify actions set for second tracepoint" # 5.3 replace actions set earlier @@ -121,10 +130,13 @@ gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. \[\t \]+collect gdb_struct1_test. +\[\t \]+installed n . \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. \[\t \]+collect gdb_short_test. +\[\t \]+installed n . \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+. -\[\t \]+collect gdb_long_test." \ +\[\t \]+collect gdb_long_test. +\[\t \]+installed n ." \ "5.3b: verify actions set for first tracepoint" # @@ -214,9 +226,12 @@ gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. \[\t \]+teval gdb_char_test. +\[\t \]+installed n . \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. \[\t \]+teval \\\$tsv \\\+= 1. +\[\t \]+installed n . \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+. -\[\t \]+collect gdb_long_test." \ +\[\t \]+collect gdb_long_test. +\[\t \]+installed n ." \ "5.10a: verify teval actions set for two tracepoints" diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp index 0064b6f..fa8d09b 100644 --- a/gdb/testsuite/gdb.trace/change-loc.exp +++ b/gdb/testsuite/gdb.trace/change-loc.exp @@ -154,7 +154,8 @@ proc tracepoint_change_loc_1 { trace_type } { with_test_prefix "1 $trace_type" { # shlib is unloaded, there are still three locations, but one is pending. gdb_test "info trace" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* -\[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\.*4\.1.* in func4.*(4\.2.* in func4.*4\.3.* \\[\t \]+set_tracepoint|4\.2.* \\[\t \]+set_tracepoint\r\n4\.3.* in func4).*" \ +\[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\.* +4\.1.* in func4.*installed y \r\n(4\.2.* in func4.*installed y \r\n4\.3.* \\[\t \]+set_tracepoint.*installed n |4\.2.* \\[\t \]+set_tracepoint.*installed n \r\n4\.3.* in func4.*installed y).*" \ "tracepoint with two locations (unload)" gdb_test_no_output "tstop" @@ -258,7 +259,8 @@ proc tracepoint_change_loc_2 { trace_type } { with_test_prefix "2 $trace_type" { # shlib is unloaded, there are still three locations, but one is pending. gdb_test "info trace" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* -\[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\.*1\.1.* in func4.*(1\.2.* in func4.*1\.3.* \\[\t \]+set_tracepoint|1\.2.* \\[\t \]+set_tracepoint\r\n1\.3.* in func4).*" \ +\[0-9\]+\[\t \]+\(|fast \)tracepoint\[ \]+keep y.*\.* +1\.1.* in func4.*installed y \r\n(1\.2.* in func4.*installed y \r\n1\.3.* \\[\t \]+set_tracepoint\r\n\[\t \]+installed n|1\.2.* \\[\t \]+set_tracepoint\r\n\[\t \]+installed n \r\n1\.3.* in func4.*installed y ).*" \ "tracepoint with two locations (unload)" gdb_test_no_output "tstop" diff --git a/gdb/testsuite/gdb.trace/deltrace.exp b/gdb/testsuite/gdb.trace/deltrace.exp index 2423de2..e7143a0 100644 --- a/gdb/testsuite/gdb.trace/deltrace.exp +++ b/gdb/testsuite/gdb.trace/deltrace.exp @@ -56,8 +56,11 @@ gdb_test "trace $testline1" "Tracepoint \[0-9\]+ at .*" "set tracepoint 3" gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. +\[\t \]+installed n . \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. -\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+" \ +\[\t \]+installed n . +\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+. +\[\t \]+installed n ." \ "3.1a: set three tracepoints" gdb_test "delete tracepoints" \ @@ -80,8 +83,11 @@ if { $trcpt1 <= 0 || $trcpt2 <= 0 || $trcpt3 <= 0 } then { gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. +\[\t \]+installed n . \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. -\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+" \ +\[\t \]+installed n . +\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+. +\[\t \]+installed n ." \ "3.2a: set three tracepoints" #gdb_test_no_output "delete tracepoint $trcpt1" "" @@ -100,7 +106,9 @@ gdb_test_multiple "delete tracepoint $trcpt1" "3.2b: delete first tracepoint" { gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. -\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+" \ +\[\t \]+installed n . +\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+. +\[\t \]+installed n ." \ "3.2c: verify delete first tracepoint" #gdb_test_no_output "delete tracepoint $trcpt2" "" @@ -118,7 +126,8 @@ gdb_test_multiple "delete tracepoint $trcpt2" "3.2d: delete second tracepoint" { gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* -\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+" \ +\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+. +\[\t \]+installed n ." \ "3.2e: verify delete second tracepoint" #gdb_test_no_output "delete tracepoint $trcpt3" "" @@ -152,8 +161,11 @@ if { $trcpt1 <= 0 || $trcpt2 <= 0 || $trcpt3 <= 0 } then { gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. +\[\t \]+installed n . \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. -\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+" \ +\[\t \]+installed n . +\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+. +\[\t \]+installed n ." \ "3.3a: set three tracepoints" #gdb_test_no_output "delete tracepoint $trcpt1 $trcpt2 $trcpt3" "" diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trace/infotrace.exp index bdc3830..4dac614 100644 --- a/gdb/testsuite/gdb.trace/infotrace.exp +++ b/gdb/testsuite/gdb.trace/infotrace.exp @@ -50,18 +50,22 @@ if { $c_test_num <= 0 || $asm_test_num <= 0 } then { gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. -\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+." \ +\[\t \]+installed n . +\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. +\[\t \]+installed n ." \ "2.1: info tracepoints (all)" # 2.2 info tracepoint (specific) gdb_test "info tracepoint $c_test_num" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* -\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+." \ +\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. +\[\t \]+installed n ." \ "2.2a: info tracepoint $c_test_num (gdb_c_test)" gdb_test "info tracepoint $asm_test_num" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* -\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+." \ +\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. +\[\t \]+installed n ." \ "2.2b: info tracepoint $asm_test_num (gdb_asm_test)" # 2.3 info tracepoint (invalid tracepoint number) diff --git a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp index b587d10..60e7076 100644 --- a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp +++ b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp @@ -109,7 +109,8 @@ proc test_tfind_remote { } { with_test_prefix "remote" { mi_gdb_test "-break-insert end" "\\^done.*" "break end" mi_gdb_test "-break-insert -a func2" "\\^done.*" "break func2" - mi_gdb_test "-trace-start" "\\^done.*" "trace start" + mi_gdb_test "-trace-start" "=breakpoint-modified,bkpt={.*installed=\"y\".*}.*\\^done.*" \ + "trace start" mi_execute_to "exec-continue" "breakpoint-hit" end "" ".*" ".*" \ { "" "disp=\"keep\"" } \ diff --git a/gdb/testsuite/gdb.trace/passcount.exp b/gdb/testsuite/gdb.trace/passcount.exp index 42f767a..9f27131 100644 --- a/gdb/testsuite/gdb.trace/passcount.exp +++ b/gdb/testsuite/gdb.trace/passcount.exp @@ -61,8 +61,11 @@ if { $trcpt1 <= 0 || $trcpt2 <= 0 || $trcpt3 <= 0 } then { gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. +\[\t \]+installed n . \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. -\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+" \ +\[\t \]+installed n . +\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+. +\[\t \]+installed n ." \ "4.1a: set three tracepoints, passcounts all zero" gdb_test "passcount 2 $trcpt1" \ @@ -72,9 +75,12 @@ gdb_test "passcount 2 $trcpt1" \ gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. -\[\t \]+pass count 2 .* +\[\t \]+pass count 2 . +\[\t \]+installed n . \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. -\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+" \ +\[\t \]+installed n . +\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+. +\[\t \]+installed n ." \ "4.1c: verify 1st tracepoint's passcount set to two" gdb_test "passcount 4 $trcpt2" \ @@ -84,10 +90,13 @@ gdb_test "passcount 4 $trcpt2" \ gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. -\[\t \]+pass count 2 .* +\[\t \]+pass count 2 . +\[\t \]+installed n . \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. -\[\t \]+pass count 4 .* -\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+" \ +\[\t \]+pass count 4 . +\[\t \]+installed n . +\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+. +\[\t \]+installed n ." \ "4.1c: verify 2nd tracepoint's passcount set to four" # 4.2 passcount of last (default) tracepoint @@ -181,10 +190,13 @@ gdb_test "passcount 0 $trcpt1" \ gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. +\[\t \]+installed n . \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. -\[\t \]+pass count 4 .* +\[\t \]+pass count 4 . +\[\t \]+installed n . \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+. -\[\t \]+pass count 4 .*" \ +\[\t \]+pass count 4 . +\[\t \]+installed n ." \ "4.6: set passcount to zero" # 4.7 (test a very large passcount) diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp index b4fc3e2..4b768b7 100644 --- a/gdb/testsuite/gdb.trace/tracecmd.exp +++ b/gdb/testsuite/gdb.trace/tracecmd.exp @@ -62,7 +62,8 @@ gdb_delete_tracepoints gdb_test "trace $srcfile:$testline2" \ "Tracepoint $decimal at $hex: file.*$srcfile, line $testline2." \ "1.1a: set tracepoint at sourceline" -gdb_test "info trace" "in gdb_recursion_test.*$srcfile:$testline2" \ +gdb_test "info trace" "in gdb_recursion_test.*$srcfile:$testline2. +\[\t \]+installed n ." \ "1.1b: trace sourcefile:line" # 1.2 trace invalid source line @@ -85,7 +86,8 @@ gdb_delete_tracepoints gdb_test "trace gdb_recursion_test" \ "Tracepoint $decimal at $hex: file.*$srcfile, line $testline1." \ "1.4a: trace function by name" -gdb_test "info trace" "in gdb_recursion_test.*$srcfile:$testline1" \ +gdb_test "info trace" "in gdb_recursion_test.*$srcfile:$testline1. +\[\t \]+installed n ." \ "1.4b: trace function by name" # 1.5 trace non-existant function @@ -122,7 +124,8 @@ gdb_delete_tracepoints gdb_test "trace \*gdb_recursion_test" \ "Tracepoint $decimal at .*$c_test_addr.*" \ "1.7a: trace at function label (before prologue)" -gdb_test "info trace" "$c_test_addr.*in gdb_recursion_test.*:$baseline" \ +gdb_test "info trace" "$c_test_addr.*in gdb_recursion_test.*:$baseline. +\[\t \]+installed n ." \ "1.7b: verify trace at specific address" # 1.8 trace at invalid address @@ -139,7 +142,9 @@ gdb_delete_tracepoints gdb_test "trace gdb_recursion_test if q1 > 0" \ "Tracepoint $decimal at $hex: file.*$srcfile, line $testline1." \ "1.11a: conditional tracepoint" -gdb_test "info trace" "in gdb_recursion_test.*$srcfile:$testline1.*trace only if q1 > 0" \ +gdb_test "info trace" "in gdb_recursion_test.*$srcfile:$testline1. +\[\t \]+trace only if q1 > 0. +\[\t \]+installed n ." \ "1.11b: verify conditional tracepoint" # 1.12 set tracepoint in prologue diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb.trace/while-stepping.exp index 5d8e066..c8a603c 100644 --- a/gdb/testsuite/gdb.trace/while-stepping.exp +++ b/gdb/testsuite/gdb.trace/while-stepping.exp @@ -49,7 +49,8 @@ if { $trcpt1 <= 0 } then { gdb_test "info tracepoints" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* -\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+" \ +\[0-9\]+\[\t \]+tracepoint keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. +\[\t \]+installed n ." \ "5.12: set a tracepoint, stepcount is zero" set stepcount 12 -- 1.7.7.6