diff options
| author | Pádraig Brady <P@draigBrady.com> | 2015-12-15 17:29:13 +0000 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2015-12-15 17:44:45 +0000 |
| commit | 070cec3234aeba6e5456b71ce25a34687b0dd6fc (patch) | |
| tree | 48a6d80069805131154ea4c152f689c045e84730 /tests | |
| parent | d3ddf7bce45ac73c9d5180bed5ad2f10192b28f3 (diff) | |
| download | coreutils-070cec3234aeba6e5456b71ce25a34687b0dd6fc.tar.xz | |
maint: include 'env' commands in returns_ syntax check
* cfg.mk (sc_prohibit_and_fail_1): Remove 'env' from
the exclusion list.
* tests/misc/env.sh: Adjust accordingly.
* tests/misc/help-version.sh: Likewise.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/misc/env.sh | 6 | ||||
| -rwxr-xr-x | tests/misc/help-version.sh | 14 |
2 files changed, 9 insertions, 11 deletions
diff --git a/tests/misc/env.sh b/tests/misc/env.sh index d7c5a099a..f03b158b0 100755 --- a/tests/misc/env.sh +++ b/tests/misc/env.sh @@ -153,9 +153,7 @@ test "x$(sh -c '\c=d echo fail')" = xpass && #dash 0.5.4 fails so check first { test "x$(env sh -c '\c=d echo fail')" = xpass || fail=1; } # catch unsetenv failure, broken through coreutils 8.0 -env -u a=b true && fail=1 -test $? = 125 || fail=1 -env -u '' true && fail=1 -test $? = 125 || fail=1 +returns_ 125 env -u a=b true || fail=1 +returns_ 125 env -u '' true || fail=1 Exit $fail diff --git a/tests/misc/help-version.sh b/tests/misc/help-version.sh index 1878ae94d..a2949336e 100755 --- a/tests/misc/help-version.sh +++ b/tests/misc/help-version.sh @@ -85,19 +85,19 @@ for i in $built_programs; do # Make sure they fail upon 'disk full' error. if test -w /dev/full && test -c /dev/full; then - env $i --help >/dev/full 2>/dev/null && fail=1 - env $i --version >/dev/full 2>/dev/null && fail=1 - status=$? test $i = [ && prog=lbracket || prog=$(echo $i|sed "s/$EXEEXT$//") eval "expected=\$expected_failure_status_$prog" test x$expected = x && expected=1 - if test $status = $expected; then - : # ok - else + + returns_ $expected env $i --help >/dev/full 2>/dev/null && + returns_ $expected env $i --version >/dev/full 2>/dev/null || + { fail=1 + env $i --help >/dev/full 2>/dev/null + status=$? echo "*** $i: bad exit status '$status' (expected $expected)," 1>&2 echo " with --help or --version output redirected to /dev/full" 1>&2 - fi + } fi done |