[PATCH 4/4] Replace "." with "\r+".

Yao Qi
2013-09-17T13:07:41Z

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 <yao@codesourcery.com>

* 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