diff options
Diffstat (limited to 'tests/rm')
| -rwxr-xr-x | tests/rm/fail-2eperm | 5 | ||||
| -rwxr-xr-x | tests/rm/interactive-always | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/tests/rm/fail-2eperm b/tests/rm/fail-2eperm index 416c97e98..49cd44169 100755 --- a/tests/rm/fail-2eperm +++ b/tests/rm/fail-2eperm @@ -31,7 +31,10 @@ touch a/b || framework_failure # Try to ensure that $NON_ROOT_USERNAME can access # the required version of rm. -rm_version=`setuidgid $NON_ROOT_USERNAME env PATH="$PATH" rm --version|sed -n '1s/.* //p'` +rm_version=` + setuidgid $NON_ROOT_USERNAME env PATH="$PATH" rm --version | + sed -n '1s/.* //p' +` case $rm_version in $PACKAGE_VERSION) ;; *) skip_test_ "cannot access just-built rm as user $NON_ROOT_USERNAME";; diff --git a/tests/rm/interactive-always b/tests/rm/interactive-always index 7a1297046..6c11255c3 100755 --- a/tests/rm/interactive-always +++ b/tests/rm/interactive-always @@ -68,15 +68,15 @@ test -f file4-1 || fail=1 cat <<\EOF > expout || fail=1 EOF -cat <<\EOF > experr || fail=1 +sed 's/@remove_empty/rm: remove regular empty file/g' <<\EOF > experr || fail=1 no WHEN -rm: remove regular empty file `file1-1'? rm: remove regular empty file `file1-2'? . +@remove_empty `file1-1'? @remove_empty `file1-2'? . WHEN=never . WHEN=once rm: remove all arguments recursively? . WHEN=always -rm: remove regular empty file `file4-1'? rm: remove regular empty file `file4-2'? . +@remove_empty `file4-1'? @remove_empty `file4-2'? . -f overrides --interactive . --interactive overrides -f |