diff options
Diffstat (limited to 'tests/df')
| -rwxr-xr-x | tests/df/no-mtab-status.sh | 26 | ||||
| -rwxr-xr-x | tests/df/skip-rootfs.sh | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/tests/df/no-mtab-status.sh b/tests/df/no-mtab-status.sh index d9899c4ad..0c1bec8ef 100755 --- a/tests/df/no-mtab-status.sh +++ b/tests/df/no-mtab-status.sh @@ -77,22 +77,22 @@ LD_PRELOAD=./k.so df -Ti '.' || fail=1 LD_PRELOAD=./k.so df --total '.' || fail=1 # These tests are supposed to fail: -LD_PRELOAD=./k.so df && fail=1 -LD_PRELOAD=./k.so df -i && fail=1 -LD_PRELOAD=./k.so df -T && fail=1 -LD_PRELOAD=./k.so df -Ti && fail=1 -LD_PRELOAD=./k.so df --total && fail=1 +LD_PRELOAD=./k.so returns_ 1 df || fail=1 +LD_PRELOAD=./k.so returns_ 1 df -i || fail=1 +LD_PRELOAD=./k.so returns_ 1 df -T || fail=1 +LD_PRELOAD=./k.so returns_ 1 df -Ti || fail=1 +LD_PRELOAD=./k.so returns_ 1 df --total || fail=1 -LD_PRELOAD=./k.so df -a && fail=1 -LD_PRELOAD=./k.so df -a '.' && fail=1 +LD_PRELOAD=./k.so returns_ 1 df -a || fail=1 +LD_PRELOAD=./k.so returns_ 1 df -a '.' || fail=1 -LD_PRELOAD=./k.so df -l && fail=1 -LD_PRELOAD=./k.so df -l '.' && fail=1 +LD_PRELOAD=./k.so returns_ 1 df -l || fail=1 +LD_PRELOAD=./k.so returns_ 1 df -l '.' || fail=1 -LD_PRELOAD=./k.so df -t hello && fail=1 -LD_PRELOAD=./k.so df -t hello '.' && fail=1 +LD_PRELOAD=./k.so returns_ 1 df -t hello || fail=1 +LD_PRELOAD=./k.so returns_ 1 df -t hello '.' || fail=1 -LD_PRELOAD=./k.so df -x hello && fail=1 -LD_PRELOAD=./k.so df -x hello '.' && fail=1 +LD_PRELOAD=./k.so returns_ 1 df -x hello || fail=1 +LD_PRELOAD=./k.so returns_ 1 df -x hello '.' || fail=1 Exit $fail diff --git a/tests/df/skip-rootfs.sh b/tests/df/skip-rootfs.sh index ed5364eb3..c42253dc3 100755 --- a/tests/df/skip-rootfs.sh +++ b/tests/df/skip-rootfs.sh @@ -34,7 +34,7 @@ grep '^rootfs' out && { fail=1; cat out; } # Ensure that rootfs is yet skipped when explicitly specifying "-t rootfs". # As df emits "no file systems processed" in this case, it would be a failure # if df exited with status Zero. -df -t rootfs >out && fail=1 +returns_ 1 df -t rootfs >out || fail=1 grep '^rootfs' out && { fail=1; cat out; } # Ensure that the rootfs is shown when explicitly both specifying "-t rootfs" |