aboutsummaryrefslogtreecommitdiff
path: root/gdb/testsuite
diff options
context:
space:
mode:
authorYao Qi <yao@codesourcery.com>2014-03-29 09:41:02 +0800
committerYao Qi <yao@codesourcery.com>2014-04-03 14:51:40 +0800
commit9810b41048d4fc230ec5e124ecdead4a3a9598ec (patch)
treee3dfc1b8564f9792ae13d3d4dcd7ef6ecc841ab1 /gdb/testsuite
parent048ea17465ce5effe702895cd644fa3d9dd94680 (diff)
downloadgdb-9810b41048d4fc230ec5e124ecdead4a3a9598ec.zip
gdb-9810b41048d4fc230ec5e124ecdead4a3a9598ec.tar.gz
gdb-9810b41048d4fc230ec5e124ecdead4a3a9598ec.tar.bz2
Escape backslash in windows path
Hi, On windows host, we see the following ERROR, (gdb) PASS: gdb.base/setshow.exp: set history filename ~/foobar.baz ERROR OCCURED: couldn't compile regular expression pattern: invalid escape \ seq uence while executing "expect -nobrace -i exp13 -timeout 10 -re {.*A problem internal to GDB has been detected} { fail "$message (GDB internal error)" gdb_internal..." invoked from within "expect { -i exp13 -timeout 10 -re ".*A problem internal to GDB has been detected" { fail "$message (GDB internal error)" gdb_internal_erro..." ("uplevel" body line 1) invoked from within "uplevel $body" REGEXP REG_EESCAPE {invalid escape \ sequence} couldn't compile regular expression pattern: invalid escape \ sequenceERROR: Process no longer ex ists which leads to UNRESOLVED: gdb.base/setshow.exp: show history filename (~/foobar.baz) and this error is thrown from this test below: gdb_test "show history filename" \ "The filename in which to record the command history is \"$HOME/foobar.baz\"..*" \ "show history filename (~/foobar.baz)" HOME is a windows path, like C:\foo\bar. When it is used in gdb_test to match output, the error is thrown because backslash is a special character in regular expression. This patch is to escape backslash to fix this error by using string_to_regexp. gdb/testsuite: 2014-04-03 Yao Qi <yao@codesourcery.com> * gdb.base/setshow.exp: Invoke string_to_regexp to HOME and PWD.
Diffstat (limited to 'gdb/testsuite')
-rw-r--r--gdb/testsuite/ChangeLog4
-rw-r--r--gdb/testsuite/gdb.base/setshow.exp4
2 files changed, 6 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 51f2a70..bf7c7a6 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-03 Yao Qi <yao@codesourcery.com>
+
+ * gdb.base/setshow.exp: Invoke string_to_regexp to HOME and PWD.
+
2014-04-01 Anton Blanchard <anton@samba.org>
* gdb.arch/ppc64-atomic-inst.exp: Use untested. Make test
diff --git a/gdb/testsuite/gdb.base/setshow.exp b/gdb/testsuite/gdb.base/setshow.exp
index 13da410..639ca72 100644
--- a/gdb/testsuite/gdb.base/setshow.exp
+++ b/gdb/testsuite/gdb.base/setshow.exp
@@ -179,7 +179,7 @@ gdb_test_no_output "set history filename ~/foobar.baz" \
"set history filename ~/foobar.baz"
#test show history filename ~/foobar.baz
gdb_test "show history filename" \
- "The filename in which to record the command history is \"$HOME/foobar.baz\"..*" \
+ "The filename in which to record the command history is \"[string_to_regexp $HOME]/foobar.baz\"..*" \
"show history filename (~/foobar.baz)"
#get current working directory
set PWD ""
@@ -195,7 +195,7 @@ gdb_test_no_output "set history filename foobar.baz" \
"set history filename foobar.baz"
#test show history filename foobar.baz
gdb_test "show history filename" \
- "The filename in which to record the command history is \"$PWD/foobar.baz\"..*" \
+ "The filename in which to record the command history is \"[string_to_regexp $PWD]/foobar.baz\"..*" \
"show history filename (current_directory/foobar.baz)"
#test set history save on
gdb_test_no_output "set history save on" "set history save on"