diff options
| author | Yao Qi <yao@codesourcery.com> | 2014-05-13 14:40:22 +0800 |
|---|---|---|
| committer | Yao Qi <yao@codesourcery.com> | 2014-05-14 20:11:53 +0800 |
| commit | 71a79f8c9cf2a66f4e4cb9b5c6cb44f8723724eb (patch) | |
| tree | 34b9d1d5f274b6eaabcf5172339fc0bfa5513e60 /gdb | |
| parent | f23fcd46a7ca34bf466de9164780a78d38729ff7 (diff) | |
| download | gdb-71a79f8c9cf2a66f4e4cb9b5c6cb44f8723724eb.zip gdb-71a79f8c9cf2a66f4e4cb9b5c6cb44f8723724eb.tar.gz gdb-71a79f8c9cf2a66f4e4cb9b5c6cb44f8723724eb.tar.bz2 | |
Fix mi-file.exp fails on remote host
This patch fixes mi-file.exp fails on remote host. First, we can't
assume ${srcdir}/${subdir}/${srcfile} directory exists on remote host,
so this patch changes it to match ${srcfile} only on remote host.
Second, regexp pattern ".*/${srcfile}" isn't friendly to Windows path.
The file name is "basics.c" in my test env and can't match the pattern
due to "/" in it. Remove "/" from the pattern.
gdb/testsuite:
2014-05-14 Yao Qi <yao@codesourcery.com>
* gdb.mi/mi-file.exp (test_file_list_exec_source_file): Don't
match absolute path on remote host.
(test_file_list_exec_source_files): Remove "/" from the
pattern.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.mi/mi-file.exp | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index e3343ae..836deb7 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,12 @@ 2014-05-14 Yao Qi <yao@codesourcery.com> + * gdb.mi/mi-file.exp (test_file_list_exec_source_file): Don't + match absolute path on remote host. + (test_file_list_exec_source_files): Remove "/" from the + pattern. + +2014-05-14 Yao Qi <yao@codesourcery.com> + * boards/local-remote-host-notty.exp (${board}_file): New proc. diff --git a/gdb/testsuite/gdb.mi/mi-file.exp b/gdb/testsuite/gdb.mi/mi-file.exp index 85998a2..eeedc4d 100644 --- a/gdb/testsuite/gdb.mi/mi-file.exp +++ b/gdb/testsuite/gdb.mi/mi-file.exp @@ -39,7 +39,11 @@ proc test_file_list_exec_source_file {} { global srcdir global subdir global fullname_syntax - set srcfilepath [string_to_regexp ${srcdir}/${subdir}/${srcfile}] + if { [is_remote host] } { + set srcfilepath ".*${srcfile}" + } else { + set srcfilepath [string_to_regexp ${srcdir}/${subdir}/${srcfile}] + } # get the path and absolute path to the current executable # @@ -64,7 +68,7 @@ proc test_file_list_exec_source_files {} { # get the path and absolute path to the current executable mi_gdb_test "222-file-list-exec-source-files" \ - "222\\\^done,files=\\\[\{file=\".*/${srcfile}\",fullname=\"$fullname_syntax${srcfile}\"\}.*]" \ + "222\\\^done,files=\\\[\{file=\".*${srcfile}\",fullname=\"$fullname_syntax${srcfile}\"\}.*]" \ "Getting a list of source files." } |