diff options
Diffstat (limited to 'tests/chmod')
| -rwxr-xr-x | tests/chmod/c-option | 4 | ||||
| -rwxr-xr-x | tests/chmod/equal-x | 2 | ||||
| -rwxr-xr-x | tests/chmod/equals | 2 | ||||
| -rwxr-xr-x | tests/chmod/inaccessible | 4 | ||||
| -rwxr-xr-x | tests/chmod/no-x | 4 | ||||
| -rwxr-xr-x | tests/chmod/setgid | 4 | ||||
| -rwxr-xr-x | tests/chmod/thru-dangling | 2 | ||||
| -rwxr-xr-x | tests/chmod/usage | 6 |
8 files changed, 14 insertions, 14 deletions
diff --git a/tests/chmod/c-option b/tests/chmod/c-option index d80038c3d..d5002a27f 100755 --- a/tests/chmod/c-option +++ b/tests/chmod/c-option @@ -21,8 +21,8 @@ print_ver_ chmod umask 0 file=f -touch $file || framework_failure -chmod 444 $file || framework_failure +touch $file || framework_failure_ +chmod 444 $file || framework_failure_ skip_if_setgid_ diff --git a/tests/chmod/equal-x b/tests/chmod/equal-x index fc4a8f5ef..3505696ae 100755 --- a/tests/chmod/equal-x +++ b/tests/chmod/equal-x @@ -20,7 +20,7 @@ print_ver_ chmod file=f -touch $file || framework_failure +touch $file || framework_failure_ umask 005 for mode in =x =xX =Xx =x,=X =X,=x; do diff --git a/tests/chmod/equals b/tests/chmod/equals index 39d2d62a0..249412cf6 100755 --- a/tests/chmod/equals +++ b/tests/chmod/equals @@ -21,7 +21,7 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ chmod -touch f || framework_failure +touch f || framework_failure_ expected_u=-rwx------ diff --git a/tests/chmod/inaccessible b/tests/chmod/inaccessible index 90126a86c..7c0518017 100755 --- a/tests/chmod/inaccessible +++ b/tests/chmod/inaccessible @@ -19,8 +19,8 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ chmod -mkdir -p d/e || framework_failure -chmod 0 d/e d || framework_failure +mkdir -p d/e || framework_failure_ +chmod 0 d/e d || framework_failure_ chmod u+rwx d d/e || fail=1 diff --git a/tests/chmod/no-x b/tests/chmod/no-x index 0fb70f967..f45c4466e 100755 --- a/tests/chmod/no-x +++ b/tests/chmod/no-x @@ -21,8 +21,8 @@ print_ver_ chmod skip_if_root_ -mkdir -p d/no-x/y a/b || framework_failure -chmod u=rw d/no-x || framework_failure +mkdir -p d/no-x/y a/b || framework_failure_ +chmod u=rw d/no-x || framework_failure_ # This must exit nonzero. diff --git a/tests/chmod/setgid b/tests/chmod/setgid index 364d25d5f..23278dec2 100755 --- a/tests/chmod/setgid +++ b/tests/chmod/setgid @@ -21,7 +21,7 @@ print_ver_ chmod umask 0 -mkdir d || framework_failure +mkdir d || framework_failure_ chmod g+s d 2> /dev/null && env -- test -g d || { @@ -33,7 +33,7 @@ chmod g+s d 2> /dev/null && env -- test -g d || id_g=`id -g` && test -n "$id_g" && chgrp "$id_g" d && - chmod g+s d || framework_failure + chmod g+s d || framework_failure_ } # "chmod g+s d" does nothing on some NFS file systems. diff --git a/tests/chmod/thru-dangling b/tests/chmod/thru-dangling index e967eb929..38187d002 100755 --- a/tests/chmod/thru-dangling +++ b/tests/chmod/thru-dangling @@ -19,7 +19,7 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ chmod -ln -s non-existent dangle || framework_failure +ln -s non-existent dangle || framework_failure_ # This operation cannot succeed since the symbolic link dangles. diff --git a/tests/chmod/usage b/tests/chmod/usage index 0566db49d..b840c1109 100755 --- a/tests/chmod/usage +++ b/tests/chmod/usage @@ -66,17 +66,17 @@ for case in $cases; do case $files in '') - touch -- $all_files || framework_failure + touch -- $all_files || framework_failure_ chmod $args 2>/dev/null && fail=1 ;; ?*) - touch -- $files || framework_failure + touch -- $files || framework_failure_ chmod $args || fail=1 for file in $files; do # Test for misparsing args by creating all $files but $file. # chmod has a bug if it succeeds even though $file is absent. rm -f -- $all_files && touch -- $files && rm -- $file \ - || framework_failure + || framework_failure_ chmod $args 2>/dev/null && fail=1 done ;; |