From: Jim Meyering <meyering@fb.com>
Date: Tue, 1 Jul 2014 15:32:57 +0000 (-0700)
Subject: tests: adapt tests to change in pwd's default
X-Git-Tag: v8.23~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=149a3b2c78d9adc35873df60660651605e88edb9;p=thirdparty%2Fcoreutils.git

tests: adapt tests to change in pwd's default

* tests/misc/pwd-option.sh (base): Initialize with -P,
now that -L is the default, to accommodate an initial
working directory with a symlink component.
* tests/misc/readlink-fp-loop.sh: Use $(env pwd -P) to get the
absolute working directory.  Using "env" ensures we do not invoke
any shell built-in, and PATH ensures we invoke the one from coreutils.
* tests/readlink/can-e.sh: Likewise.
* tests/readlink/can-f.sh: Likewise.
* tests/readlink/can-m.sh: Likewise.
---

diff --git a/tests/misc/pwd-option.sh b/tests/misc/pwd-option.sh
index 983726b66a..9b4664d34a 100755
--- a/tests/misc/pwd-option.sh
+++ b/tests/misc/pwd-option.sh
@@ -21,7 +21,7 @@ print_ver_ pwd
 
 mkdir -p a/b || framework_failure_
 ln -s a/b c || framework_failure_
-base=$(env -- pwd)
+base=$(env -- pwd -P)
 
 # Remove any logical paths from $PWD.
 cd "$base" || framework_failure_
diff --git a/tests/misc/readlink-fp-loop.sh b/tests/misc/readlink-fp-loop.sh
index 286da6ffb6..4ae2dc523e 100755
--- a/tests/misc/readlink-fp-loop.sh
+++ b/tests/misc/readlink-fp-loop.sh
@@ -18,7 +18,7 @@
 
 . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
 print_ver_ readlink
-cwd=$("$abs_top_builddir/src/pwd")
+cwd=$(env pwd -P)
 
 # To trigger this bug, we have to construct a name/situation during
 # the resolution of which the code dereferences the same symlink (S)
diff --git a/tests/readlink/can-e.sh b/tests/readlink/can-e.sh
index 7da45f7c10..a6415b94bd 100755
--- a/tests/readlink/can-e.sh
+++ b/tests/readlink/can-e.sh
@@ -20,7 +20,7 @@
 print_ver_ readlink
 
 pwd=$(pwd)
-my_pwd=$("$abs_top_builddir/src/pwd")
+my_pwd=$(env pwd -P)
 tmp=d
 
 mkdir $tmp || framework_failure_
diff --git a/tests/readlink/can-f.sh b/tests/readlink/can-f.sh
index 27fcb78bc7..2a980fa841 100755
--- a/tests/readlink/can-f.sh
+++ b/tests/readlink/can-f.sh
@@ -20,7 +20,7 @@
 print_ver_ readlink
 
 pwd=$(pwd)
-my_pwd=$("$abs_top_builddir/src/pwd")
+my_pwd=$(env pwd -P)
 tmp=d
 
 mkdir $tmp || framework_failure_
diff --git a/tests/readlink/can-m.sh b/tests/readlink/can-m.sh
index 55ab4f2a5c..768c552bbd 100755
--- a/tests/readlink/can-m.sh
+++ b/tests/readlink/can-m.sh
@@ -20,7 +20,7 @@
 print_ver_ readlink
 
 pwd=$(pwd)
-my_pwd=$("$abs_top_builddir/src/pwd")
+my_pwd=$(env pwd -P)
 tmp=d
 
 mkdir $tmp || framework_failure_