Merge branch 'master' of git.sv.gnu.org:/srv/git/dejagnu

Conflicts:
	ChangeLog

ChangeLog

@@ -9,6 +9,11 @@
 	reference.  Reorder `gdb_init_command' table rows and remove a
 	duplicate entry, reusing it for `gdb_init_commands'.
 
+2014-06-25  Rob Savoye  <rob.savoye@linaro.org>
+
+	* runtest.exp: (lookfor-file): Fix bug were none of the relative
+	paths were actually being used for file lookup.
+
 2014-06-06  Ben Elliston  <bje@gnu.org>
 
 	* depcomp, install-sh, missing: Update to latest versions.

runtest.exp

@@ -571,8 +571,8 @@ if {[string match "" $logname]} {
 # lookfor_file -- try to find a file by searching up multiple directory levels
 #
 proc lookfor_file { dir name } {
-    foreach x ".. ../.. ../../.. ../../../.." {
-	verbose "$dir/$name" 2
+    foreach x ". .. ../.. ../../.. ../../../.." {
+	verbose "$dir/$x/$name" 2
 	if {[file exists [file join $dir $name]]} {
 	    return [file join $dir $name]
 	}