backport: libjava.exp (libjava_arguments): Use 'file normalize' rather than the defun...

2016-04-23  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.

From-SVN: r235385

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d384accdb8934c0facaccfb83d98459b531e9ac4..485ff84d289115722479ea51cff000b1a77828d7 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2016-04-23  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.
+
 2015-06-26  Release Manager
 
        * GCC 4.9.3 released.

diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 0de823b737cf7cc74aa6842db59482528da0600e..932765b602228fa5c14658ba96665118231e9557 100644 (file)
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -414,7 +414,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.