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.

diff --git a/cfg.mk b/cfg.mk
index 70808fd59aa9a1c830b70fd72928ac643db535c2..656035bf5fffc688fead22eecfb6705476e23eb3 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -484,7 +484,7 @@ sc_prohibit_fail_0:
 # independently check its contents and thus detect any crash messages.
 sc_prohibit_and_fail_1:
        @prohibit='&& fail=1'                                           \
-       exclude='(stat|kill|test |EGREP|grep|env|compare|2> *[^/])'     \
+       exclude='(stat|kill|test |EGREP|grep|compare|2> *[^/])'         \
        halt='&& fail=1 detected. Please use: returns_ 1 ... || fail=1' \
        in_vc_files='^tests/'                                           \
          $(_sc_search_regexp)

diff --git a/tests/misc/env.sh b/tests/misc/env.sh
index d7c5a099ae5216d8ce55438a430fb608760f23ab..f03b158b0d08b51100011eb09dd1f2acdc9926f0 100755 (executable)
--- 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 1878ae94da0a8d387d1895e90180cbc32fc1cf7c..a2949336e135ab84fcb26262925ea73d21d0528f 100755 (executable)
--- 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