diff options
author | Pádraig Brady <P@draigBrady.com> | 2015-05-19 12:36:29 +0100 |
---|---|---|
committer | Pádraig Brady <P@draigBrady.com> | 2015-05-19 15:00:57 +0100 |
commit | edc5bc5020e67c0835b6e4cf8fd9fef81055c148 (patch) | |
tree | f183f1fd495cbc1d459d6133681d7c665c09dbb5 /tests/df | |
parent | 719c15a6f2ae6bf5d17021c6f138d6378ed06c50 (diff) | |
download | coreutils-edc5bc5020e67c0835b6e4cf8fd9fef81055c148.tar.xz |
tests: fix non POSIX constructs causing failures with dash
* tests/cp/no-ctx.sh: Scope of `var=val func` is inconsistent
across shells, so avoid that construct with functions.
* tests/df/no-mtab-status.sh: Likewise.
* tests/tail-2/inotify-race.sh: `read` needs an argument.
* tests/tail-2/inotify-race2.sh: Likewise.
Diffstat (limited to 'tests/df')
-rwxr-xr-x | tests/df/no-mtab-status.sh | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/tests/df/no-mtab-status.sh b/tests/df/no-mtab-status.sh index 58a1852a2..41d1b521b 100755 --- a/tests/df/no-mtab-status.sh +++ b/tests/df/no-mtab-status.sh @@ -88,34 +88,38 @@ EOF gcc_shared_ k.c k.so \ || framework_failure_ 'failed to build shared library' +cleanup_() { unset LD_PRELOAD; } + +export LD_PRELOAD=./k.so + # Test if LD_PRELOAD works: -LD_PRELOAD=./k.so df +df 2>/dev/null test -f x || skip_ "internal test failure: maybe LD_PRELOAD doesn't work?" # These tests are supposed to succeed: -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 +df '.' || fail=1 +df -i '.' || fail=1 +df -T '.' || fail=1 +df -Ti '.' || fail=1 +df --total '.' || fail=1 # These tests are supposed to fail: -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 +returns_ 1 df || fail=1 +returns_ 1 df -i || fail=1 +returns_ 1 df -T || fail=1 +returns_ 1 df -Ti || fail=1 +returns_ 1 df --total || fail=1 -LD_PRELOAD=./k.so returns_ 1 df -a || fail=1 -LD_PRELOAD=./k.so returns_ 1 df -a '.' || fail=1 +returns_ 1 df -a || fail=1 +returns_ 1 df -a '.' || fail=1 -LD_PRELOAD=./k.so returns_ 1 df -l || fail=1 -LD_PRELOAD=./k.so returns_ 1 df -l '.' || fail=1 +returns_ 1 df -l || fail=1 +returns_ 1 df -l '.' || fail=1 -LD_PRELOAD=./k.so returns_ 1 df -t hello || fail=1 -LD_PRELOAD=./k.so returns_ 1 df -t hello '.' || fail=1 +returns_ 1 df -t hello || fail=1 +returns_ 1 df -t 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 +returns_ 1 df -x hello || fail=1 +returns_ 1 df -x hello '.' || fail=1 Exit $fail |