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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ed374c1..eb5d617 100644 (file)
--- 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 0cfb253..45d2074 100644 (file)
--- 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.