From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15657 invoked by alias); 17 Sep 2013 13:07:41 -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 15474 invoked by uid 89); 17 Sep 2013 13:07:40 -0000 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 17 Sep 2013 13:07:40 +0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,RDNS_NONE,SPF_HELO_FAIL autolearn=no version=3.3.2 X-HELO: relay1.mentorg.com Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1VLuzp-0004dO-T6 from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Tue, 17 Sep 2013 06:07:13 -0700 Received: from SVR-ORW-FEM-04.mgc.mentorg.com ([147.34.97.41]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Tue, 17 Sep 2013 06:07:13 -0700 Received: from qiyao.dyndns.org (147.34.91.1) by svr-orw-fem-04.mgc.mentorg.com (147.34.97.41) with Microsoft SMTP Server id 14.2.247.3; Tue, 17 Sep 2013 06:07:12 -0700 From: Yao Qi To: Subject: [PATCH 4/4] Replace "." with "\r+". Date: Tue, 17 Sep 2013 13:07:00 -0000 Message-ID: <1379423179-8515-5-git-send-email-yao@codesourcery.com> In-Reply-To: <1379423179-8515-1-git-send-email-yao@codesourcery.com> References: <87a9ldyu8k.fsf@fleche.redhat.com> <1379423179-8515-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes X-SW-Source: 2013-09/txt/msg00501.txt.bz2 These "gdb_test" can't be replaced by "gdb_test_sequence" because variables are used in patterns, and variables can't be expanded. We replace "." with "\r+" one by one. gdb/testsuite: 2013-09-17 Yao Qi * gdb.trace/tracecmd.exp (gdb_delete_tracepoints): Replace "." with "\r+" in patterns. * gdb.trace/while-stepping.exp: Likewise. --- gdb/testsuite/gdb.trace/tracecmd.exp | 12 ++++++------ gdb/testsuite/gdb.trace/while-stepping.exp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp index 81dc1ed..a239d75 100644 --- a/gdb/testsuite/gdb.trace/tracecmd.exp +++ b/gdb/testsuite/gdb.trace/tracecmd.exp @@ -62,7 +62,7 @@ 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\r+ \[\t \]+not installed on target." \ "1.1b: trace sourcefile:line" @@ -86,7 +86,7 @@ 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\r+ \[\t \]+not installed on target." \ "1.4b: trace function by name" @@ -124,7 +124,7 @@ 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\r+ \[\t \]+not installed on target." \ "1.7b: verify trace at specific address" @@ -142,9 +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. -\[\t \]+trace only if q1 > 0. -\[\t \]+not installed on target." \ +gdb_test "info trace" "in gdb_recursion_test.*$srcfile:$testline1\r+ +\[\t \]+trace only if q1 > 0\r+ +\[\t \]+not installed on target\r+" \ "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 3202ea5..77dba1d 100644 --- a/gdb/testsuite/gdb.trace/while-stepping.exp +++ b/gdb/testsuite/gdb.trace/while-stepping.exp @@ -97,7 +97,7 @@ gdb_trace_setactions "5.16: step without collecting anything" \ 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\]+\r+ .*while-stepping $stepcount.* .*end.*" \ "5.16: confirm actions, step without collecting anything" -- 1.7.7.6