aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorYao Qi <yao@codesourcery.com>2014-09-15 19:06:22 +0800
committerYao Qi <yao@codesourcery.com>2014-10-15 15:33:24 +0800
commit10c5f0a8a83c4fcec433a2498c4d205921413e6a (patch)
tree06f22c7b8052cc633556b64cc51168f30e8b8c19 /gdb
parent65d7b369af5b9557cde8fbe6f63cefa215c0af60 (diff)
downloadgdb-10c5f0a8a83c4fcec433a2498c4d205921413e6a.zip
gdb-10c5f0a8a83c4fcec433a2498c4d205921413e6a.tar.gz
gdb-10c5f0a8a83c4fcec433a2498c4d205921413e6a.tar.bz2
Fix py-parameter.exp for remote host
Test gdb.python/py-parameter.exp expects output "$srcdir/$subdir:\$cdir:\$cwd", but proc gdb_reinitialize_dir doesn't set $srcdir/$subdir in search directories on remote host because it doesn't exist on remote host. proc gdb_reinitialize_dir { subdir } { global gdb_prompt if [is_remote host] { return "" } It causes the fail below: (gdb) python print (gdb.parameter ('directories'))^M /tmp/gdb:$cdir:$cwd^M (gdb) FAIL: gdb.python/py-parameter.exp: python print (gdb.parameter ('directories')) This patch is to fix this fail by not matching $srcdir/$subdir on remote host. gdb/testsuite: 2014-10-15 Yao Qi <yao@codesourcery.com> * gdb.python/py-parameter.exp: Don't match $srcdir/$subdir on remote host.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.python/py-parameter.exp9
2 files changed, 13 insertions, 1 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index fd8898c..68ab5fb 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2014-10-15 Yao Qi <yao@codesourcery.com>
+ * gdb.python/py-parameter.exp: Don't match $srcdir/$subdir on
+ remote host.
+
+2014-10-15 Yao Qi <yao@codesourcery.com>
+
* gdb.python/py-symbol.exp: Match file base name if host is
remote, otherwise match file name with dir name.
* gdb.python/py-symtab.exp: Likewise.
diff --git a/gdb/testsuite/gdb.python/py-parameter.exp b/gdb/testsuite/gdb.python/py-parameter.exp
index 8bc122f..36c109d 100644
--- a/gdb/testsuite/gdb.python/py-parameter.exp
+++ b/gdb/testsuite/gdb.python/py-parameter.exp
@@ -27,7 +27,14 @@ gdb_reinitialize_dir $srcdir/$subdir
if { [skip_python_tests] } { continue }
# We use "." here instead of ":" so that this works on win32 too.
-gdb_test "python print (gdb.parameter ('directories'))" "$srcdir/$subdir.\\\$cdir.\\\$cwd"
+if { [is_remote host] } {
+ # Don't match $srcdir/$subdir because proc gdb_reinitialize_dir
+ # doesn't set search directories on remote host.
+ set directories ".*\\\$cdir.\\\$cwd"
+} else {
+ set directories "$srcdir/$subdir.\\\$cdir.\\\$cwd"
+}
+gdb_test "python print (gdb.parameter ('directories'))" $directories
# Test a simple boolean parameter.
gdb_py_test_multiple "Simple gdb booleanparameter" \