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.
This commit is contained in:
Yao Qi 2014-05-13 14:40:22 +08:00
parent f23fcd46a7
commit 71a79f8c9c
2 changed files with 13 additions and 2 deletions

View file

@ -1,3 +1,10 @@
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> 2014-05-14 Yao Qi <yao@codesourcery.com>
* boards/local-remote-host-notty.exp (${board}_file): New * boards/local-remote-host-notty.exp (${board}_file): New

View file

@ -39,7 +39,11 @@ proc test_file_list_exec_source_file {} {
global srcdir global srcdir
global subdir global subdir
global fullname_syntax 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 # 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 # get the path and absolute path to the current executable
mi_gdb_test "222-file-list-exec-source-files" \ 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." "Getting a list of source files."
} }