diff options
| author | Ben Elliston <bje@gnu.org> | 2014-07-15 22:56:46 +1000 |
|---|---|---|
| committer | Ben Elliston <bje@gnu.org> | 2014-07-15 22:56:46 +1000 |
| commit | ee21af3cae2cc92bc10b7e19f04b31f785ce04bd (patch) | |
| tree | b9ec0f527bf46018f1b5f85b018800d02e28d7c1 | |
| parent | f53d3dc51d10229a40df1fc85dd330a0fbc12727 (diff) | |
| parent | 45a1dbdf9a382b63d51fd28248be206c33f7afc0 (diff) | |
| download | dejagnu-ee21af3cae2cc92bc10b7e19f04b31f785ce04bd.zip dejagnu-ee21af3cae2cc92bc10b7e19f04b31f785ce04bd.tar.gz dejagnu-ee21af3cae2cc92bc10b7e19f04b31f785ce04bd.tar.bz2 | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/dejagnu
Conflicts:
ChangeLog
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | runtest.exp | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -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. diff --git a/runtest.exp b/runtest.exp index bd39dd8..9f0997f 100644 --- a/runtest.exp +++ b/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] } |