diff options
| author | dominiq <dominiq@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-04-29 11:50:42 +0000 |
|---|---|---|
| committer | dominiq <dominiq@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-04-29 11:50:42 +0000 |
| commit | 5ae6e48ab6a9792f07477572d361307513b7adaf (patch) | |
| tree | 1324565b4b880c1446fcccf7c645f51a75bdb1c8 | |
| parent | a0673e2915bce001288ae66622bf6423b285c552 (diff) | |
2016-04-29 Dominique d'Humieres <dominiq@lps.ens.fr>
backport from trunk:
2016-04-20 Ben Elliston <bje@gnu.org>
* testsuite/lib/libjava.exp (libjava_arguments): Use 'file
normalize' rather than the defunct DejaGnu 'absolute' proc.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@235634 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/testsuite/lib/libjava.exp | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ed374c1dd7b..eb5d617988f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2016-04-29 Dominique d'Humieres <dominiq@lps.ens.fr> + + backport from trunk: + 2016-04-20 Ben Elliston <bje@gnu.org> + + * testsuite/lib/libjava.exp (libjava_arguments): Use 'file + normalize' rather than the defunct DejaGnu 'absolute' proc. + 2016-04-27 Release Manager * GCC 6.1.0 released. diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index 0cfb25330a5..45d2074e088 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -416,7 +416,7 @@ proc libjava_arguments {{mode compile}} { # Search for libtool. We need it to link. set found_compiler 0 - set d [absolute $objdir] + set d [file normalize $objdir] foreach x {. .. ../.. ../../..} { if {[file exists $d/$x/libtool]} then { # We have to run silently to avoid DejaGNU lossage. |