From: Yao Qi <yao@codesourcery.com>
Date: Tue, 13 May 2014 06:40:22 +0000 (+0800)
Subject: Fix mi-file.exp fails on remote host
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=71a79f8c9cf2a66f4e4cb9b5c6cb44f8723724eb;p=binutils-gdb.git

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.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e3343ae6191..836deb73460 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -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>
 
 	* boards/local-remote-host-notty.exp (${board}_file): New
diff --git a/gdb/testsuite/gdb.mi/mi-file.exp b/gdb/testsuite/gdb.mi/mi-file.exp
index 85998a2dab9..eeedc4df92f 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."
 }