From 2b390c5a0d11b6202975b3d71899721296d48747 Mon Sep 17 00:00:00 2001 From: Dominique d'Humieres Date: Sat, 23 Apr 2016 23:36:16 +0200 Subject: [PATCH] backport: libjava.exp (libjava_arguments): Use 'file normalize' rather than the defunct DejaGnu 'absolute' proc. 2016-04-23 Dominique d'Humieres backport from trunk: 2016-04-20 Ben Elliston * testsuite/lib/libjava.exp (libjava_arguments): Use 'file normalize' rather than the defunct DejaGnu 'absolute' proc. From-SVN: r235385 --- libjava/ChangeLog | 8 ++++++++ libjava/testsuite/lib/libjava.exp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d384accdb893..485ff84d2891 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2016-04-23 Dominique d'Humieres + + backport from trunk: + 2016-04-20 Ben Elliston + + * 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 0de823b737cf..932765b60222 100644 --- 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. -- 2.47.2