From: bje <bje@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 19 Apr 2016 21:08:47 +0000 (+0000)
Subject: 	* testsuite/lib/libjava.exp (libjava_arguments): Use 'file
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4cdbe9d8f64eb9abad68e9ce359643f7b1129178;p=thirdparty%2Fgcc.git

	* 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/trunk@235222 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index dc5799366852..ce6f201d4909 100644
--- 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 0cfb25330a5c..45d2074e088c 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.