diff options
Diffstat (limited to 'tests/mv')
| -rwxr-xr-x | tests/mv/part-symlink | 12 | ||||
| -rwxr-xr-x | tests/mv/sticky-to-xpart | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/mv/part-symlink b/tests/mv/part-symlink index 2e7cf1b8b..e57de3c96 100755 --- a/tests/mv/part-symlink +++ b/tests/mv/part-symlink @@ -96,18 +96,18 @@ for copy in cp mv; do } # Strip off all but the file names. # Remove any site-dependent part of each file name. - ls=`ls -gG --ignore=.err . \ - | sed \ + ls=$(ls -gG --ignore=.err . \ + | sed \ -e '/^total /d' \ -e "s,$other_partition_tmpdir/,," \ -e "s,$pwd_tmp/,," \ - -e 's/^[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *//'` - ls2=`cd "$other_partition_tmpdir" && ls -gG --ignore=.err . \ - | sed \ + -e 's/^[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *//') + ls2=$(cd "$other_partition_tmpdir" && ls -gG --ignore=.err . \ + | sed \ -e '/^total /d' \ -e "s,$other_partition_tmpdir/,," \ -e "s,$pwd_tmp/,," \ - -e 's/^[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *//'` + -e 's/^[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *[^ ]* *//') echo " ("$ls") ("$ls2")" # If the command failed, then it must not have changed the files. diff --git a/tests/mv/sticky-to-xpart b/tests/mv/sticky-to-xpart index 954cb8f0e..6df65024e 100755 --- a/tests/mv/sticky-to-xpart +++ b/tests/mv/sticky-to-xpart @@ -41,10 +41,10 @@ chmod go+x . || framework_failure_ # Ensure that $NON_ROOT_USERNAME can access the required version of mv. -version=` +version=$( setuidgid $NON_ROOT_USERNAME env PATH="$PATH" mv --version | sed -n '1s/.* //p' -` +) case $version in $PACKAGE_VERSION) ;; *) skip_ "cannot access just-built mv as user $NON_ROOT_USERNAME";; |