From 149a3b2c78d9adc35873df60660651605e88edb9 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 1 Jul 2014 08:32:57 -0700 Subject: 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. --- tests/misc/pwd-option.sh | 2 +- tests/misc/readlink-fp-loop.sh | 2 +- tests/readlink/can-e.sh | 2 +- tests/readlink/can-f.sh | 2 +- tests/readlink/can-m.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/misc/pwd-option.sh b/tests/misc/pwd-option.sh index 983726b66..9b4664d34 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 286da6ffb..4ae2dc523 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 7da45f7c1..a6415b94b 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 27fcb78bc..2a980fa84 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 55ab4f2a5..768c552bb 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_ -- cgit v1.2.3-70-g09d2