From 10c5f0a8a83c4fcec433a2498c4d205921413e6a Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Mon, 15 Sep 2014 19:06:22 +0800 Subject: [PATCH] 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 * gdb.python/py-parameter.exp: Don't match $srcdir/$subdir on remote host. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.python/py-parameter.exp | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index fd8898c7ba4..68ab5fbe466 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-10-15 Yao Qi + + * gdb.python/py-parameter.exp: Don't match $srcdir/$subdir on + remote host. + 2014-10-15 Yao Qi * gdb.python/py-symbol.exp: Match file base name if host is diff --git a/gdb/testsuite/gdb.python/py-parameter.exp b/gdb/testsuite/gdb.python/py-parameter.exp index 8bc122f7f76..36c109dc4f4 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" \ -- 2.30.2