From 8a1edc971f6439c51027873a345378ec52954c9d Mon Sep 17 00:00:00 2001
From: Eric Blake <ebb9@byu.net>
Date: Tue, 22 Sep 2009 15:03:02 -0600
Subject: readlink: pick up gnulib changes to readlink -f

* bootstrap.conf (obsolete_gnulib_modules): Move rename...
(gnulib_modules): ...here.  Add symlink.
* NEWS: Document the change in readlink.
* doc/coreutils.texi (readlink invocation): Likewise.
* tests/readlink/can-f: Update test to new semantics, and add test
of loop.
---
 tests/readlink/can-f | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

(limited to 'tests/readlink/can-f')

diff --git a/tests/readlink/can-f b/tests/readlink/can-f
index 8a000f8e9..a702ba990 100755
--- a/tests/readlink/can-f
+++ b/tests/readlink/can-f
@@ -38,6 +38,7 @@ ln -s regfile link1 || framework_failure
 ln -s subdir link2 || framework_failure
 ln -s missing link3 || framework_failure
 ln -s subdir/missing link4 || framework_failure
+ln -s link5 link5 || framework_failure
 
 cd "$pwd/$tmp/removed" || framework_failure
 
@@ -73,14 +74,14 @@ for p in "" "$pwd/$tmp/"; do
   v=`readlink -f "${p}subdir/more"` || fail=1
   test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1
 
-  v=`readlink -f "${p}./subdir/more/"` && fail=1
-  test -z "$v" || fail=1
+  v=`readlink -f "${p}./subdir/more/"` || fail=1
+  test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1
 
   v=`readlink -f "${p}missing"` || fail=1
   test "$v" = "$my_pwd/$tmp/missing" || fail=1
 
-  v=`readlink -f "${p}./missing/"` && fail=1
-  test -z "$v" || fail=1
+  v=`readlink -f "${p}./missing/"` || fail=1
+  test "$v" = "$my_pwd/$tmp/missing" || fail=1
 
   v=`readlink -f "${p}missing/more"` && fail=1
   test -z "$v" || fail=1
@@ -109,8 +110,8 @@ for p in "" "$pwd/$tmp/"; do
   v=`readlink -f "${p}link2/more"` || fail=1
   test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1
 
-  v=`readlink -f "${p}./link2/more/"` && fail=1
-  test -z "$v" || fail=1
+  v=`readlink -f "${p}./link2/more/"` || fail=1
+  test "$v" = "$my_pwd/$tmp/subdir/more" || fail=1
 
   v=`readlink -f "${p}link2/more/more2"` && fail=1
   test -z "$v" || fail=1
@@ -121,8 +122,8 @@ for p in "" "$pwd/$tmp/"; do
   v=`readlink -f "${p}link3"` || fail=1
   test "$v" = "$my_pwd/$tmp/missing" || fail=1
 
-  v=`readlink -f "${p}./link3/"` && fail=1
-  test -z "$v" || fail=1
+  v=`readlink -f "${p}./link3/"` || fail=1
+  test "$v" = "$my_pwd/$tmp/missing" || fail=1
 
   v=`readlink -f "${p}link3/more"` && fail=1
   test -z "$v" || fail=1
@@ -133,11 +134,26 @@ for p in "" "$pwd/$tmp/"; do
   v=`readlink -f "${p}link4"` || fail=1
   test "$v" = "$my_pwd/$tmp/subdir/missing" || fail=1
 
-  v=`readlink -f "${p}./link4/"` && fail=1
-  test -z "$v" || fail=1
+  v=`readlink -f "${p}./link4/"` || fail=1
+  test "$v" = "$my_pwd/$tmp/subdir/missing" || fail=1
 
   v=`readlink -f "${p}link4/more"` && fail=1
   test -z "$v" || fail=1
+
+  v=`readlink -f "${p}./link4/more"` && fail=1
+  test -z "$v" || fail=1
+
+  v=`readlink -f "${p}link5"` && fail=1
+  test -z "$v" || fail=1
+
+  v=`readlink -f "${p}./link5/"` && fail=1
+  test -z "$v" || fail=1
+
+  v=`readlink -f "${p}link5/more"` && fail=1
+  test -z "$v" || fail=1
+
+  v=`readlink -f "${p}./link5/more"` && fail=1
+  test -z "$v" || fail=1
 done
 
 Exit $fail
-- 
cgit v1.2.3-54-g00ecf