libjava.exp (libjava_arguments): Use 'file normalize' rather than the defunct DejaGnu...

	* testsuite/lib/libjava.exp (libjava_arguments): Use 'file
	normalize' rather than the defunct DejaGnu 'absolute' proc.

From-SVN: r235222

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index dc5799366852758329764ef2a378a2b7d1dd854d..ce6f201d4909098f689742256bf0bc7fa4a6715b 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+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-01-04  Jakub Jelinek  <jakub@redhat.com>
 
        * classpath/gnu/java/rmi/registry/RegistryImpl.java (version): Update

diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 0cfb25330a5c5969b4ed9c2f8b452572ab304b71..45d2074e088c28fbae86d7e52700327c1657ee27 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.