diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Test/B13whence.ztst | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 0d81ea3b9..5a3d6c252 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2020-03-28 Daniel Shahaf <d.s@daniel.shahaf.name> + + * 45640: Test/B13whence.ztst: Fix new test when ${PWD}'s value + contains symlinks. + 2020-03-26 Daniel Shahaf <d.s@daniel.shahaf.name> * 45627: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: diff --git a/Test/B13whence.ztst b/Test/B13whence.ztst index ea0a4dae5..3b35835fe 100644 --- a/Test/B13whence.ztst +++ b/Test/B13whence.ztst @@ -1,7 +1,10 @@ %prep mkdir whence.tmp - pushd whence.tmp + ln -s . whence.tmp/cwd + # cd through the symlink in order to test the case that ${prefix} and + # ${prefix:P} are different + pushd whence.tmp/cwd ln -s real step3 ln -s step3 step2 ln -s step2 step1 @@ -16,13 +19,13 @@ %test ( - path=( $PWD/whence.tmp $path ) + path=( ${PWD:P}/whence.tmp $path ) whence -S step1 whence -s step1 ) 0q:whence symlink resolution ->$prefix/step1 -> $prefix/step2 -> $prefix/step3 -> $prefix/real ->$prefix/step1 -> $prefix/real +>${prefix:P}/step1 -> ${prefix:P}/step2 -> ${prefix:P}/step3 -> ${prefix:P}/real +>${prefix:P}/step1 -> ${prefix:P}/real ( path=( $PWD/whence.tmp $path ) |