From: Jim Meyering <meyering@redhat.com>
Date: Sun, 7 Sep 2008 08:31:27 +0000 (+0200)
Subject: tests: use "Exit $fail", not (exit $fail); exit $fail
X-Git-Tag: v7.0~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68561594ca022703e255b3ef5686f176317e5fd4;p=thirdparty%2Fcoreutils.git

tests: use "Exit $fail", not (exit $fail); exit $fail

* tests/test-lib.sh (Exit): New function by Ralf Wildenhues in automake
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=20594c08f63
* tests/**: Convert all uses:

This restrictive change converted the vast majority:

  git grep -l '^(exit \$fail); exit \$fail$' \
    | xargs perl -pi -e 's/'^\(exit \$fail\); exit \$fail$/Exit \$fail/'

And this did the rest, plus a few undesirable ones, so I manually
backed out the changes to ChangeLog-* and build-aux/check.mk:

  git grep -l -E '\(exit [^)]+\); exit ' \
    | xargs perl -pi -e 's/\(exit (.+?)\); exit \1/Exit $1/'
---

diff --git a/maint.mk b/maint.mk
index eb241b60bd..492fb0f60c 100644
--- a/maint.mk
+++ b/maint.mk
@@ -377,18 +377,18 @@ sc_program_name:
 	fi
 
 # Require that the final line of each test-lib.sh-using test be this one:
-# (exit $fail); exit $fail
+# Exit $fail
 # Note: this test requires GNU grep's --label= option.
 sc_require_test_exit_idiom:
 	@if test -f $(srcdir)/tests/test-lib.sh; then			\
 	  die=0;							\
 	  for i in $$(grep -l -F /../test-lib.sh $$($(VC_LIST) tests)); do \
-	    tail -n1 $$i | grep '^(exit \$$fail); exit \$$fail$$' > /dev/null \
+	    tail -n1 $$i | grep '^Exit \$$fail$$' > /dev/null \
 	      && : || { die=1; echo $$i; }				\
 	  done;								\
 	  test $$die = 1 &&						\
 	    { echo 1>&2 '$(ME): the final line in each of the above is not:'; \
-	      echo 1>&2 '(exit $$fail); exit $$fail';			\
+	      echo 1>&2 'Exit $$fail';			\
 	      exit 1; } || :;						\
 	fi
 
diff --git a/tests/chgrp/basic b/tests/chgrp/basic
index cd74978717..94297ea5a0 100755
--- a/tests/chgrp/basic
+++ b/tests/chgrp/basic
@@ -112,4 +112,4 @@ test "`ls -C -c -t f g`" = 'f  g' || \
     esac
   }
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/chgrp/default-no-deref b/tests/chgrp/default-no-deref
index f7ffc94b8a..aac16fe6f8 100755
--- a/tests/chgrp/default-no-deref
+++ b/tests/chgrp/default-no-deref
@@ -35,4 +35,4 @@ g_init=`stat --printf=%g f`
 chgrp -R $g2 d || fail=1
 test `stat --printf=%g f` = $g_init || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/chgrp/deref b/tests/chgrp/deref
index e63a142282..08aa141acc 100755
--- a/tests/chgrp/deref
+++ b/tests/chgrp/deref
@@ -62,4 +62,4 @@ chgrp --dereference $g1 symlink
 set _ `ls -ln f`; g=$5; test "$g" = $g1 || fail=1
 set _ `ls -ln symlink`; g=$5; test "$g" = $g2 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/chgrp/no-x b/tests/chgrp/no-x
index 4cf1685604..f133ad6c88 100755
--- a/tests/chgrp/no-x
+++ b/tests/chgrp/no-x
@@ -56,4 +56,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/chgrp/posix-H b/tests/chgrp/posix-H
index b376e4ac54..a1db5655ac 100755
--- a/tests/chgrp/posix-H
+++ b/tests/chgrp/posix-H
@@ -72,4 +72,4 @@ for i in $not_changed; do
   test $group = $g1 || fail=1
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/chgrp/recurse b/tests/chgrp/recurse
index e4f90a6b75..a1f3712885 100755
--- a/tests/chgrp/recurse
+++ b/tests/chgrp/recurse
@@ -55,4 +55,4 @@ set _ `ls -ln e/ee`; g=$5; test "$g" = $g2 || fail=1
 # But it *should* change d/dd.
 set _ `ls -ln d/dd`; g=$5; test "$g" = $g1 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/chmod/c-option b/tests/chmod/c-option
index 42da4b2096..eb8530a52d 100755
--- a/tests/chmod/c-option
+++ b/tests/chmod/c-option
@@ -42,4 +42,4 @@ case "`cat out`" in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/chmod/equal-x b/tests/chmod/equal-x
index 06c53c6698..8d9dafe0f5 100755
--- a/tests/chmod/equal-x
+++ b/tests/chmod/equal-x
@@ -36,4 +36,4 @@ for mode in =x =xX =Xx =x,=X =X,=x; do
   esac
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/chmod/equals b/tests/chmod/equals
index 9aca394c49..a748a606c1 100755
--- a/tests/chmod/equals
+++ b/tests/chmod/equals
@@ -48,4 +48,4 @@ chmod a=,u=rwx,=u f || fail=1
 actual_perms=`ls -l f|cut -b-10`
 test "$actual_perms" = "-rwxr-x---" || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/chmod/inaccessible b/tests/chmod/inaccessible
index 70cdc9bff1..6dd1b6a97f 100755
--- a/tests/chmod/inaccessible
+++ b/tests/chmod/inaccessible
@@ -30,4 +30,4 @@ fail=0
 
 chmod u+rwx d d/e || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/chmod/no-x b/tests/chmod/no-x
index b65295bd85..55bbe9896b 100755
--- a/tests/chmod/no-x
+++ b/tests/chmod/no-x
@@ -59,4 +59,4 @@ chmod a-x . b 2> /dev/null && fail=1
 # an abort (exit with status 134) on recent glibc-based systems.
 test $? = 1 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/chmod/octal b/tests/chmod/octal
index a7ddb4503a..a86d0bd75f 100755
--- a/tests/chmod/octal
+++ b/tests/chmod/octal
@@ -31,4 +31,4 @@ chmod 0-followed-by-anything . 2> /dev/null && fail=1
 chmod 7-followed-by-anything . 2> /dev/null && fail=1
 chmod 8                      . 2> /dev/null && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/chmod/setgid b/tests/chmod/setgid
index 30e92f05a9..d3cbbd3681 100755
--- a/tests/chmod/setgid
+++ b/tests/chmod/setgid
@@ -50,4 +50,4 @@ chmod 755 d
 
 case `ls -ld d` in drwxr-sr-x*);; *) fail=1;; esac
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/chmod/thru-dangling b/tests/chmod/thru-dangling
index 055f9c59c8..ecb6d3685e 100755
--- a/tests/chmod/thru-dangling
+++ b/tests/chmod/thru-dangling
@@ -33,4 +33,4 @@ chmod 644 dangle 2> out && fail=1
 echo "chmod: cannot operate on dangling symlink \`dangle'" > exp
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/chmod/umask-x b/tests/chmod/umask-x
index 13b6e9ac22..2526991e89 100755
--- a/tests/chmod/umask-x
+++ b/tests/chmod/umask-x
@@ -28,4 +28,4 @@ touch file
 chmod 755 file
 (umask 77 && chmod -x file) 2>/dev/null && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/chmod/usage b/tests/chmod/usage
index ba0ea73138..008cfee86f 100755
--- a/tests/chmod/usage
+++ b/tests/chmod/usage
@@ -88,4 +88,4 @@ for case in $cases; do
   esac
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/chown/basic b/tests/chown/basic
index 434a6bac2c..5c7c4d2876 100755
--- a/tests/chown/basic
+++ b/tests/chown/basic
@@ -50,4 +50,4 @@ chown --no-dereference --from=0:1 2:010 slink || fail=1
 # owner/group on the symlink should be changed
 set _ `ls -n slink`; shift; test "$3:$4" = 2:10 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/chown/deref b/tests/chown/deref
index 4a46827c25..33ba946655 100755
--- a/tests/chown/deref
+++ b/tests/chown/deref
@@ -40,4 +40,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/chown/preserve-root b/tests/chown/preserve-root
index 8e2923bf0e..0dfcdc2118 100755
--- a/tests/chown/preserve-root
+++ b/tests/chown/preserve-root
@@ -68,4 +68,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/chown/separator b/tests/chown/separator
index cfd5f0c7ea..a8a6600c81 100755
--- a/tests/chown/separator
+++ b/tests/chown/separator
@@ -65,4 +65,4 @@ for u in $id_u "$id_un" ''; do
   done
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/abuse b/tests/cp/abuse
index d0faba4ddc..8187392b56 100755
--- a/tests/cp/abuse
+++ b/tests/cp/abuse
@@ -52,4 +52,4 @@ for i in dangling-dest existing-dest; do
     && case $(cat t) in i);; *) fail=1;; esac
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/acl b/tests/cp/acl
index 21a7742ef5..b212d0de2d 100755
--- a/tests/cp/acl
+++ b/tests/cp/acl
@@ -60,4 +60,4 @@ cp -p a/file b/ || fail=1
 acl2=`cd b && getfacl file` || framework_failure
 test "$acl1" = "$acl2" || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/backup-1 b/tests/cp/backup-1
index 7fc1658705..830e4abb55 100755
--- a/tests/cp/backup-1
+++ b/tests/cp/backup-1
@@ -41,4 +41,4 @@ test -f $file || fail=1
 test -f $file_backup || fail=1
 compare $file $file_backup > /dev/null || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/backup-dir b/tests/cp/backup-dir
index 88de81adf2..313ec40a78 100755
--- a/tests/cp/backup-dir
+++ b/tests/cp/backup-dir
@@ -34,4 +34,4 @@ cp -ab x y || fail=1
 test -d y/x || fail=1
 test -d y/x~ && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/backup-is-src b/tests/cp/backup-is-src
index 3703350ad3..bc91d6666d 100755
--- a/tests/cp/backup-is-src
+++ b/tests/cp/backup-is-src
@@ -37,4 +37,4 @@ EOF
 
 compare out2 exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/cp-HL b/tests/cp/cp-HL
index bdc34d9a5e..09257fb00e 100755
--- a/tests/cp/cp-HL
+++ b/tests/cp/cp-HL
@@ -42,4 +42,4 @@ cat dest-dir/src-dir/slink > /dev/null 2>&1 && fail=1
 
 # FIXME: test -L, too.
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/cp-a-selinux b/tests/cp/cp-a-selinux
index 03d515399a..2f4af35938 100755
--- a/tests/cp/cp-a-selinux
+++ b/tests/cp/cp-a-selinux
@@ -80,4 +80,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/cp-deref b/tests/cp/cp-deref
index 89584502ce..1f7edd8ea0 100755
--- a/tests/cp/cp-deref
+++ b/tests/cp/cp-deref
@@ -36,4 +36,4 @@ cp -RL a b d || fail=1
 test -d a/c || fail=1
 test -d b/c || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/cp-i b/tests/cp/cp-i
index a248eaa9e2..94284bee7a 100755
--- a/tests/cp/cp-i
+++ b/tests/cp/cp-i
@@ -31,4 +31,4 @@ fail=0
 # coreutils 6.2 cp would neglect to prompt in this case.
 echo n | cp -iR a b 2>/dev/null || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/cp-mv-backup b/tests/cp/cp-mv-backup
index 4280e481af..a8c55c9b3b 100755
--- a/tests/cp/cp-mv-backup
+++ b/tests/cp/cp-mv-backup
@@ -94,4 +94,4 @@ sed 's/: x/:/' $expected-tmp |cat $expected-tmp - > $expected
 
 compare $expected $actual || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/cp-parents b/tests/cp/cp-parents
index e936f59be2..bfaf747a0c 100755
--- a/tests/cp/cp-parents
+++ b/tests/cp/cp-parents
@@ -61,4 +61,4 @@ p=`ls -ld g/sym|cut -b-10`; case $p in drwx-w--w-);; *) fail=1;; esac
 p=`ls -ld e/d/a/b/c|cut -b-10`; case $p in drwxr-xr-x);; *) fail=1;; esac
 p=`ls -ld g/sym/b/c|cut -b-10`; case $p in drwxr-xr-x);; *) fail=1;; esac
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/deref-slink b/tests/cp/deref-slink
index d2e953752e..112802745f 100755
--- a/tests/cp/deref-slink
+++ b/tests/cp/deref-slink
@@ -30,4 +30,4 @@ ln -s slink-target slink || framework_failure
 fail=0
 cp -d f slink || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/dir-rm-dest b/tests/cp/dir-rm-dest
index c97e709f20..4e540bc7a7 100755
--- a/tests/cp/dir-rm-dest
+++ b/tests/cp/dir-rm-dest
@@ -32,4 +32,4 @@ cp -R --remove-destination d e || fail=1
 # ...and again, with an existing destination.
 cp -R --remove-destination d e || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/dir-slash b/tests/cp/dir-slash
index 0e591cedbe..db6e17cb95 100755
--- a/tests/cp/dir-slash
+++ b/tests/cp/dir-slash
@@ -37,4 +37,4 @@ test -r dir2/file && fail=1
 test -r dir2/dir1/file || fail=1
 test -r dir1/file || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/dir-vs-file b/tests/cp/dir-vs-file
index 317c69a9c2..50b940a43f 100755
--- a/tests/cp/dir-vs-file
+++ b/tests/cp/dir-vs-file
@@ -35,4 +35,4 @@ cp -R dir file 2>/dev/null && fail=1
 # In 4.0.35, it was.
 test -f file || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/existing-perm-race b/tests/cp/existing-perm-race
index d428e99bf3..d1bc76845a 100755
--- a/tests/cp/existing-perm-race
+++ b/tests/cp/existing-perm-race
@@ -89,4 +89,4 @@ case $mode in
   *) fail=1;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/fail-perm b/tests/cp/fail-perm
index f2dabd155d..bf37ee8d15 100755
--- a/tests/cp/fail-perm
+++ b/tests/cp/fail-perm
@@ -61,4 +61,4 @@ compare out exp || fail=1
 
 chmod 700 D
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/file-perm-race b/tests/cp/file-perm-race
index 1b6eff6bfe..9745a1476a 100755
--- a/tests/cp/file-perm-race
+++ b/tests/cp/file-perm-race
@@ -57,4 +57,4 @@ esac
 
 wait $cp_pid || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/into-self b/tests/cp/into-self
index 53dfe5697e..ee3fcf5fd5 100755
--- a/tests/cp/into-self
+++ b/tests/cp/into-self
@@ -42,4 +42,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/link b/tests/cp/link
index a1cf92622c..20b2eed0dd 100755
--- a/tests/cp/link
+++ b/tests/cp/link
@@ -33,4 +33,4 @@ fail=0
 cp -f --link src dest || fail=1
 cp -f --symbolic-link src dest2 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/link-no-deref b/tests/cp/link-no-deref
index 3ff16e036d..561aa6a2b1 100755
--- a/tests/cp/link-no-deref
+++ b/tests/cp/link-no-deref
@@ -31,4 +31,4 @@ fail=0
 # with link being applied to the dangling symlink.
 cp --link --no-dereference dangling-slink d2 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/link-preserve b/tests/cp/link-preserve
index 0dd96f05e7..309c051217 100755
--- a/tests/cp/link-preserve
+++ b/tests/cp/link-preserve
@@ -87,4 +87,4 @@ test "$mode" = "-rwx------" || fail=1
 umask 022
 # --------------------------------------
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/no-deref-link1 b/tests/cp/no-deref-link1
index e92c40cc34..f18ae03743 100755
--- a/tests/cp/no-deref-link1
+++ b/tests/cp/no-deref-link1
@@ -41,4 +41,4 @@ test $? = 1 || fail=1
 
 test "`cat a/foo`" = $msg || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/no-deref-link2 b/tests/cp/no-deref-link2
index 20b87fc988..8fbf9bff85 100755
--- a/tests/cp/no-deref-link2
+++ b/tests/cp/no-deref-link2
@@ -41,4 +41,4 @@ test $? = 1 || fail=1
 
 test "`cat a`" = $msg || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/no-deref-link3 b/tests/cp/no-deref-link3
index 32966ca0ec..a177bacf28 100755
--- a/tests/cp/no-deref-link3
+++ b/tests/cp/no-deref-link3
@@ -38,4 +38,4 @@ test $? = 1 || fail=1
 
 test "`cat a`" = $msg || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/parent-perm b/tests/cp/parent-perm
index a7da5e2e03..01ca2b8112 100755
--- a/tests/cp/parent-perm
+++ b/tests/cp/parent-perm
@@ -53,4 +53,4 @@ for dir in a a/b a/b/d; do
   fail=1
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/parent-perm-race b/tests/cp/parent-perm-race
index c84f2e9f32..196a405492 100755
--- a/tests/cp/parent-perm-race
+++ b/tests/cp/parent-perm-race
@@ -64,4 +64,4 @@ do
   wait $cp_pid || fail=1
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/perm b/tests/cp/perm
index aed3a722bb..8073ac005b 100755
--- a/tests/cp/perm
+++ b/tests/cp/perm
@@ -75,4 +75,4 @@ for u in 31 37 2; do
   done
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/preserve-2 b/tests/cp/preserve-2
index 667b503920..19cb5fd9c3 100755
--- a/tests/cp/preserve-2
+++ b/tests/cp/preserve-2
@@ -29,4 +29,4 @@ fail=0
 
 cp --preserve=mode,links f g || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/preserve-gid b/tests/cp/preserve-gid
index d7f86e0304..2fb738438d 100755
--- a/tests/cp/preserve-gid
+++ b/tests/cp/preserve-gid
@@ -42,7 +42,7 @@ t0() {
       :
     else
       echo "$0: $* $f b: $u $g != $s" 1>&2
-      (exit 1); exit 1
+      Exit 1
     fi
   fi
 }
@@ -103,4 +103,4 @@ t1 c0 "$nameless_uid" "$nameless_gid1" cp -p
 t1 c1 "$nameless_uid" "$nameless_gid2" cp -p
 
 fail=0
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/proc-zero-len b/tests/cp/proc-zero-len
index 33e5802a54..586720a68e 100755
--- a/tests/cp/proc-zero-len
+++ b/tests/cp/proc-zero-len
@@ -42,4 +42,4 @@ test -s exp && { rm -f exp; echo nonempty > exp; }
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/r-vs-symlink b/tests/cp/r-vs-symlink
index 08070f7d98..8596bb729c 100755
--- a/tests/cp/r-vs-symlink
+++ b/tests/cp/r-vs-symlink
@@ -43,4 +43,4 @@ case $mode in
   *) fail=1;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/same-file b/tests/cp/same-file
index e5cc8237e9..32bdc2a6ec 100755
--- a/tests/cp/same-file
+++ b/tests/cp/same-file
@@ -225,4 +225,4 @@ fail=0;
 
 compare $expected $actual 1>&2 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/slink-2-slink b/tests/cp/slink-2-slink
index c86a251dd7..4fc0ef50ac 100755
--- a/tests/cp/slink-2-slink
+++ b/tests/cp/slink-2-slink
@@ -34,4 +34,4 @@ fail=0
 cp --update --no-dereference a b || fail=1
 cp --update --no-dereference c d || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/sparse b/tests/cp/sparse
index 2c2024ce32..e07f051307 100755
--- a/tests/cp/sparse
+++ b/tests/cp/sparse
@@ -38,4 +38,4 @@ cp --sparse=always sparse copy || fail=1
 # Ensure that the copy has the same block count as the original.
 test `stat --printf %b copy` -le `stat --printf %b sparse` || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/special-bits b/tests/cp/special-bits
index c75fb50149..ef7755bd48 100755
--- a/tests/cp/special-bits
+++ b/tests/cp/special-bits
@@ -52,4 +52,4 @@ set _ `ls -l c`; shift; p1=$1
 set _ `ls -l c2`; shift; p2=$1
 test $p1 = $p2 && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/special-f b/tests/cp/special-f
index 054ad70b48..0556f01a76 100755
--- a/tests/cp/special-f
+++ b/tests/cp/special-f
@@ -37,4 +37,4 @@ cp -R fifo e || fail=1
 cp -Rf fifo e || fail=1
 test -p fifo || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/src-base-dot b/tests/cp/src-base-dot
index 09aedb21fa..5552944bb2 100755
--- a/tests/cp/src-base-dot
+++ b/tests/cp/src-base-dot
@@ -34,4 +34,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/symlink-slash b/tests/cp/symlink-slash
index 893a413e71..16b1c2669e 100755
--- a/tests/cp/symlink-slash
+++ b/tests/cp/symlink-slash
@@ -38,4 +38,4 @@ set `ls -l s`
 # call and so cp ends up dereferencing the symlink and copying the directory.
 test "$*" = 'total 0' && : || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/cp/thru-dangling b/tests/cp/thru-dangling
index 7caeed33b4..d7bffd8e01 100755
--- a/tests/cp/thru-dangling
+++ b/tests/cp/thru-dangling
@@ -43,4 +43,4 @@ cat no-such >> out || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/dd/misc b/tests/dd/misc
index 04318f08a0..4fdebc2cd5 100755
--- a/tests/dd/misc
+++ b/tests/dd/misc
@@ -98,4 +98,4 @@ compare err_ok err || fail=1
 
 test $fail -eq 0 && fail=$warn
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/dd/not-rewound b/tests/dd/not-rewound
index b0bdf120e4..8c811811ef 100755
--- a/tests/dd/not-rewound
+++ b/tests/dd/not-rewound
@@ -33,4 +33,4 @@ case `cat out` in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/dd/skip-seek2 b/tests/dd/skip-seek2
index 1381305f9f..c831c85aa3 100755
--- a/tests/dd/skip-seek2
+++ b/tests/dd/skip-seek2
@@ -40,4 +40,4 @@ case `cat out` in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/dd/unblock-sync b/tests/dd/unblock-sync
index b66653340d..2adcbb7fd7 100755
--- a/tests/dd/unblock-sync
+++ b/tests/dd/unblock-sync
@@ -37,4 +37,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/df/total b/tests/df/total
index 186bf8de3c..6d82663865 100755
--- a/tests/df/total
+++ b/tests/df/total
@@ -39,4 +39,4 @@ $EGREP "$RE_TOTAL" tmp && fail=1
 df --total | $EGREP "$RE_TOTAL" || fail=1
 df -i --total | $EGREP "$RE_TOTAL" || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/df/total-awk b/tests/df/total-awk
index d569f26df0..a10a03dafb 100755
--- a/tests/df/total-awk
+++ b/tests/df/total-awk
@@ -77,4 +77,4 @@ $AWK -f compute_sum.awk tmp > out1 || fail=1
 $AWK -f parse_total.awk tmp > out2 || fail=1
 compare out1 out2 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/2g b/tests/du/2g
index 6a7463c02e..44592f9427 100755
--- a/tests/du/2g
+++ b/tests/du/2g
@@ -70,4 +70,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/8gb b/tests/du/8gb
index 49989d1f2d..bdeeb070f4 100755
--- a/tests/du/8gb
+++ b/tests/du/8gb
@@ -55,4 +55,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/basic b/tests/du/basic
index 837ec92d57..94e62a8384 100755
--- a/tests/du/basic
+++ b/tests/du/basic
@@ -91,4 +91,4 @@ EOF
   compare out exp || fail=1
 fi
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/deref b/tests/du/deref
index facdf426bb..08606c0e3b 100755
--- a/tests/du/deref
+++ b/tests/du/deref
@@ -34,4 +34,4 @@ fail=0
 # du: `b': No such file or directory
 du -sD slink b > /dev/null 2>&1 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/deref-args b/tests/du/deref-args
index 02bdf7d55e..ee5499ccfd 100755
--- a/tests/du/deref-args
+++ b/tests/du/deref-args
@@ -50,4 +50,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/exclude b/tests/du/exclude
index 1e32b60f33..e6fd68f48f 100755
--- a/tests/du/exclude
+++ b/tests/du/exclude
@@ -60,4 +60,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/fd-leak b/tests/du/fd-leak
index 14df938d3a..a35ee24b89 100755
--- a/tests/du/fd-leak
+++ b/tests/du/fd-leak
@@ -45,4 +45,4 @@ fail=0
 # With coreutils-5.0, this would fail due to a file descriptor leak.
 du $f > out || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/hard-link b/tests/du/hard-link
index f4fdf26167..d58adbe44f 100755
--- a/tests/du/hard-link
+++ b/tests/du/hard-link
@@ -50,4 +50,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/inacc-dest b/tests/du/inacc-dest
index b0ea4d677e..4f66f8be2e 100755
--- a/tests/du/inacc-dest
+++ b/tests/du/inacc-dest
@@ -58,4 +58,4 @@ sed 's,cannot access,cannot read directory,' out > t && mv t out
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/inacc-dir b/tests/du/inacc-dir
index 3b5fa5088f..f3b0a46c61 100755
--- a/tests/du/inacc-dir
+++ b/tests/du/inacc-dir
@@ -44,4 +44,4 @@ du -k a > out 2> /dev/null && fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/inaccessible-cwd b/tests/du/inaccessible-cwd
index 70e83a1f9a..9ee6478382 100755
--- a/tests/du/inaccessible-cwd
+++ b/tests/du/inaccessible-cwd
@@ -37,4 +37,4 @@ fail=0
 
 du "$cwd/a" > /dev/null || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/long-from-unreadable b/tests/du/long-from-unreadable
index fdaf91ab4c..5d9ce7c8e1 100755
--- a/tests/du/long-from-unreadable
+++ b/tests/du/long-from-unreadable
@@ -68,4 +68,4 @@ chmod 0 . || framework_failure
 fail=0
 du -s "$cwd/$dir" > /dev/null || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/long-sloop b/tests/du/long-sloop
index 31aac1fe5f..5d430252e0 100755
--- a/tests/du/long-sloop
+++ b/tests/du/long-sloop
@@ -74,4 +74,4 @@ echo "du: cannot access: $too_many" > exp || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/no-deref b/tests/du/no-deref
index 8d8bc6c688..d1ce5931d5 100755
--- a/tests/du/no-deref
+++ b/tests/du/no-deref
@@ -35,4 +35,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/no-x b/tests/du/no-x
index 5569b5d19e..b4d6fad770 100755
--- a/tests/du/no-x
+++ b/tests/du/no-x
@@ -51,4 +51,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/one-file-system b/tests/du/one-file-system
index 82081c6daf..e944d1d061 100755
--- a/tests/du/one-file-system
+++ b/tests/du/one-file-system
@@ -42,4 +42,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/restore-wd b/tests/du/restore-wd
index b716b4112f..07c648c375 100755
--- a/tests/du/restore-wd
+++ b/tests/du/restore-wd
@@ -33,4 +33,4 @@ fail=0
 
 du a b > out || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/slash b/tests/du/slash
index d433a92351..c2d2cc3826 100755
--- a/tests/du/slash
+++ b/tests/du/slash
@@ -35,4 +35,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/slink b/tests/du/slink
index 588c4df32a..5bf0349cbb 100755
--- a/tests/du/slink
+++ b/tests/du/slink
@@ -59,4 +59,4 @@ du -a $symlinks > out || fail=1
 # Require that at least one of these symlinks has a non-zero size.
 grep '^[1-9]' out > /dev/null || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/trailing-slash b/tests/du/trailing-slash
index 92de5d45ce..296ad7d4ee 100755
--- a/tests/du/trailing-slash
+++ b/tests/du/trailing-slash
@@ -49,4 +49,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/du/two-args b/tests/du/two-args
index 2b25bf5355..b5d67b4b8a 100755
--- a/tests/du/two-args
+++ b/tests/du/two-args
@@ -42,4 +42,4 @@ du $t/1 $t/2 > /dev/null || fail=1
 du . $t > /dev/null || fail=1
 du .. $t > /dev/null || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/install/basic-1 b/tests/install/basic-1
index 31f3215456..09c8d4437b 100755
--- a/tests/install/basic-1
+++ b/tests/install/basic-1
@@ -126,4 +126,4 @@ ginstall: creating directory `sub3/a/b/c'
 `file' -> `sub3/a/b/c/file'
 EOF
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/install/create-leading b/tests/install/create-leading
index 3e6079245a..55d20eb2e9 100755
--- a/tests/install/create-leading
+++ b/tests/install/create-leading
@@ -37,4 +37,4 @@ ginstall -D $file no-dir1/no-dir2/dest || fail=1
 test -d no-dir1/no-dir2 || fail=1
 test -r no-dir1/no-dir2/dest || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/install/d-slashdot b/tests/install/d-slashdot
index 057c7bef20..e02e2c6b11 100755
--- a/tests/install/d-slashdot
+++ b/tests/install/d-slashdot
@@ -31,4 +31,4 @@ test -d d1 || fail=1
 ginstall -d d2/.. || fail=1
 test -d d2 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/install/strip-program b/tests/install/strip-program
index 57597fcd38..98f7febea6 100755
--- a/tests/install/strip-program
+++ b/tests/install/strip-program
@@ -38,4 +38,4 @@ echo aBc > exp || fail=1
 ginstall src dest -s --strip-program=./b || fail=1
 compare dest exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/install/trap b/tests/install/trap
index 5b2b115e1a..f03899fe95 100755
--- a/tests/install/trap
+++ b/tests/install/trap
@@ -35,4 +35,4 @@ fail=0
   exec ginstall -s "$abs_top_builddir/src/ginstall$EXEEXT" .
 )
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ln/backup-1 b/tests/ln/backup-1
index f796f3abfa..0aff4f3d94 100755
--- a/tests/ln/backup-1
+++ b/tests/ln/backup-1
@@ -31,4 +31,4 @@ touch a b || framework_failure
 ln b b~ || fail=1
 ln -f --b=simple a b || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ln/hard-backup b/tests/ln/hard-backup
index 90f8cd85ba..c02b265b64 100755
--- a/tests/ln/hard-backup
+++ b/tests/ln/hard-backup
@@ -34,4 +34,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ln/misc b/tests/ln/misc
index f8ec46fcab..a4a925407e 100755
--- a/tests/ln/misc
+++ b/tests/ln/misc
@@ -149,4 +149,4 @@ ln foo '' 2> /dev/null
 
 # ===================================================
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ln/sf-1 b/tests/ln/sf-1
index 2dd3d8c2ed..d00df6e021 100755
--- a/tests/ln/sf-1
+++ b/tests/ln/sf-1
@@ -34,4 +34,4 @@ case `cat err` in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ln/target-1 b/tests/ln/target-1
index e60106c7f5..d088e2417f 100755
--- a/tests/ln/target-1
+++ b/tests/ln/target-1
@@ -32,4 +32,4 @@ mkdir d || framework_failure
 fail=0
 ln -s --target-dir=d ../f || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/capability b/tests/ls/capability
index fcd3c2ad3a..f064348ef7 100755
--- a/tests/ls/capability
+++ b/tests/ls/capability
@@ -40,4 +40,4 @@ LS_COLORS="ca=$code" \
 printf "\033[0m\033[${code}mtest\033[0m\n\033[m" > out_ok || fail=1
 compare out out_ok || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/color-dtype-dir b/tests/ls/color-dtype-dir
index 37b40c459d..6664d3bee5 100755
--- a/tests/ls/color-dtype-dir
+++ b/tests/ls/color-dtype-dir
@@ -50,4 +50,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/dangle b/tests/ls/dangle
index 942b45a8b8..08a73b9f56 100755
--- a/tests/ls/dangle
+++ b/tests/ls/dangle
@@ -50,4 +50,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/dired b/tests/ls/dired
index 3d96852c08..57b67b9c1e 100755
--- a/tests/ls/dired
+++ b/tests/ls/dired
@@ -37,4 +37,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/file-type b/tests/ls/file-type
index 1dfc303f4c..01daeafeba 100755
--- a/tests/ls/file-type
+++ b/tests/ls/file-type
@@ -67,4 +67,4 @@ compare out3 exp3 || fail=1
 ls --color=auto -F sub > out || fail=1
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/follow-slink b/tests/ls/follow-slink
index e0468de235..651ad8a500 100755
--- a/tests/ls/follow-slink
+++ b/tests/ls/follow-slink
@@ -63,4 +63,4 @@ EOF
 compare out-L exp-L || fail=1
 compare out-FLR-sub exp-FLR-sub || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/infloop b/tests/ls/infloop
index 6476e25c33..8ce145d93d 100755
--- a/tests/ls/infloop
+++ b/tests/ls/infloop
@@ -44,4 +44,4 @@ EOF
 # Make sure we don't get the "bad" output.
 compare out bad > /dev/null 2>&1 && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/inode b/tests/ls/inode
index dea2b28498..b5ddc8c9a8 100755
--- a/tests/ls/inode
+++ b/tests/ls/inode
@@ -67,4 +67,4 @@ test $# = 4 || fail=1
 # With -H, they must be different from inside a directory.
 test "$1" != "$3" || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/m-option b/tests/ls/m-option
index 15495879e2..cd0bc8a454 100755
--- a/tests/ls/m-option
+++ b/tests/ls/m-option
@@ -42,4 +42,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/nameless-uid b/tests/ls/nameless-uid
index d5fa7f129f..3cfc5880f2 100755
--- a/tests/ls/nameless-uid
+++ b/tests/ls/nameless-uid
@@ -41,4 +41,4 @@ fail=0
 set -- `ls -o f` || fail=1
 test $3 = $nameless_uid || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/no-arg b/tests/ls/no-arg
index cd9dd380ca..e3ccb99107 100755
--- a/tests/ls/no-arg
+++ b/tests/ls/no-arg
@@ -58,4 +58,4 @@ ls -R1 > out || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/proc-selinux-segfault b/tests/ls/proc-selinux-segfault
index 1a31ece301..a37275788f 100755
--- a/tests/ls/proc-selinux-segfault
+++ b/tests/ls/proc-selinux-segfault
@@ -29,4 +29,4 @@ test -r $f || f=.
 fail=0
 ls -l $f > out || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/recursive b/tests/ls/recursive
index 158b9ced39..e6f1e58b3f 100755
--- a/tests/ls/recursive
+++ b/tests/ls/recursive
@@ -64,4 +64,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/rt-1 b/tests/ls/rt-1
index 1a131761c2..d4fd2ca11e 100755
--- a/tests/ls/rt-1
+++ b/tests/ls/rt-1
@@ -50,4 +50,4 @@ a
 EOF
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/stat-dtype b/tests/ls/stat-dtype
index 7e7dcb9c79..bca2bfc10c 100755
--- a/tests/ls/stat-dtype
+++ b/tests/ls/stat-dtype
@@ -63,4 +63,4 @@ printf 'a2345/\tb/\n' > exp || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/stat-failed b/tests/ls/stat-failed
index be9a780949..949fa24c67 100755
--- a/tests/ls/stat-failed
+++ b/tests/ls/stat-failed
@@ -54,4 +54,4 @@ EOF
 
 sed 's/^  l/  ?/' out | compare - exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/stat-free-symlinks b/tests/ls/stat-free-symlinks
index be4d490486..e5ad6dcf13 100755
--- a/tests/ls/stat-free-symlinks
+++ b/tests/ls/stat-free-symlinks
@@ -52,4 +52,4 @@ grep '^stat("x"' err && fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/stat-vs-dirent b/tests/ls/stat-vs-dirent
index f105e2f3ba..2c3b064db3 100755
--- a/tests/ls/stat-vs-dirent
+++ b/tests/ls/stat-vs-dirent
@@ -64,4 +64,4 @@ while :; do
   test $dev_ino = $root_dev_ino && break
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/symlink-slash b/tests/ls/symlink-slash
index 4315b063b3..6b18bfe703 100755
--- a/tests/ls/symlink-slash
+++ b/tests/ls/symlink-slash
@@ -32,4 +32,4 @@ set `ls -l symlink/`
 # Prior to fileutils-4.0k, the following would have output `... symlink -> dir'.
 test "$*" = 'total 0' && : || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/ls/x-option b/tests/ls/x-option
index b47960007b..7f479d0c8a 100755
--- a/tests/ls/x-option
+++ b/tests/ls/x-option
@@ -39,4 +39,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/arch b/tests/misc/arch
index 1661d6c606..781cca6e4a 100755
--- a/tests/misc/arch
+++ b/tests/misc/arch
@@ -36,4 +36,4 @@ uname -m > exp || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/cat-proc b/tests/misc/cat-proc
index 8fa3f56ac9..791b7d403f 100755
--- a/tests/misc/cat-proc
+++ b/tests/misc/cat-proc
@@ -40,4 +40,4 @@ cat    $f | sed 's/[0-9][0-9]*/D/g' | tr -d '$' > exp || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/chcon b/tests/misc/chcon
index fefe0ec46b..723bfd0f36 100755
--- a/tests/misc/chcon
+++ b/tests/misc/chcon
@@ -64,4 +64,4 @@ chcon --verbose -u$u1 f > out || fail=1
 echo 'changing security context of `f'\' > exp
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/chcon-fail b/tests/misc/chcon-fail
index d9bac7c851..a9efbff751 100755
--- a/tests/misc/chcon-fail
+++ b/tests/misc/chcon-fail
@@ -24,4 +24,4 @@ chcon --reference=f 2> /dev/null && fail=1
 # No file
 chcon -u anyone 2> /dev/null && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/close-stdout b/tests/misc/close-stdout
index ede75205fc..261a3834d7 100755
--- a/tests/misc/close-stdout
+++ b/tests/misc/close-stdout
@@ -59,4 +59,4 @@ if test -w /dev/full && test -c /dev/full; then
   cp --verbose a b >/dev/full 2>/dev/null && fail=1
 fi
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/csplit b/tests/misc/csplit
index 9997860e17..2d27daa074 100755
--- a/tests/misc/csplit
+++ b/tests/misc/csplit
@@ -90,4 +90,4 @@ printf 'x%8199s\nx\n%8199s\nx\n' x x > in
 csplit in '/x\{1\}/' '{*}' > /dev/null || fail=1
 cat xx?? | compare - in || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/date-sec b/tests/misc/date-sec
index dea183513c..2bb69cfb8b 100755
--- a/tests/misc/date-sec
+++ b/tests/misc/date-sec
@@ -51,4 +51,4 @@ case "$s" in
   *) fail=1;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/df b/tests/misc/df
index bb895e7fa0..9f0bfc3000 100755
--- a/tests/misc/df
+++ b/tests/misc/df
@@ -31,4 +31,4 @@ case `df .` in
   fail=1;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/df-P b/tests/misc/df-P
index 8024864cea..a6dcf9c7e5 100755
--- a/tests/misc/df-P
+++ b/tests/misc/df-P
@@ -39,4 +39,4 @@ head -n1 t2 > out || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/false-status b/tests/misc/false-status
index 67191a3fe0..be47e27d9c 100755
--- a/tests/misc/false-status
+++ b/tests/misc/false-status
@@ -27,4 +27,4 @@ fail=0
 false --version > /dev/null && fail=1
 false --help > /dev/null && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/fmt-long-line b/tests/misc/fmt-long-line
index 6902023388..ae7acf36f3 100755
--- a/tests/misc/fmt-long-line
+++ b/tests/misc/fmt-long-line
@@ -63,4 +63,4 @@ fmt -s in > out || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/groups-dash b/tests/misc/groups-dash
index bc132d8049..01a507df1c 100755
--- a/tests/misc/groups-dash
+++ b/tests/misc/groups-dash
@@ -33,4 +33,4 @@ echo $? >> exp
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/groups-version b/tests/misc/groups-version
index 34dbd33079..1862045f27 100755
--- a/tests/misc/groups-version
+++ b/tests/misc/groups-version
@@ -30,4 +30,4 @@ id --version | sed '/^$/q' > exp || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/head-c b/tests/misc/head-c
index 2b348d2e36..7149028ca7 100755
--- a/tests/misc/head-c
+++ b/tests/misc/head-c
@@ -32,4 +32,4 @@ case "`cat out`" in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/head-pos b/tests/misc/head-pos
index 0c55a879b6..2469d6cf24 100755
--- a/tests/misc/head-pos
+++ b/tests/misc/head-pos
@@ -34,4 +34,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/help-version b/tests/misc/help-version
index 8fa7a0b4a8..c7bec357de 100755
--- a/tests/misc/help-version
+++ b/tests/misc/help-version
@@ -41,7 +41,7 @@ expected_failure_status_vdir=2
 fail=0
 
 test "$built_programs" \
-  || { echo "$this_test: no programs built!?!" 1>&2; (exit $fail); exit $fail; }
+  || { echo "$this_test: no programs built!?!" 1>&2; Exit $fail; }
 
 for lang in C fr da; do
   for i in $built_programs; do
@@ -199,4 +199,4 @@ for i in $built_programs; do
   rm -rf $tmp_in $tmp_in2 $tmp_out $tmp_dir
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/id-context b/tests/misc/id-context
index ea90ec676b..0d9e8caa33 100755
--- a/tests/misc/id-context
+++ b/tests/misc/id-context
@@ -34,4 +34,4 @@ id | grep context= >/dev/null || fail=1
 id -nu > /dev/null \
   && id $(id -nu) | grep context= >/dev/null && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/ls-time b/tests/misc/ls-time
index 07271c601d..50c7a4743a 100755
--- a/tests/misc/ls-time
+++ b/tests/misc/ls-time
@@ -92,7 +92,7 @@ In the output below, the date of last access for \`a' should
 have been $u1.
 EOF
   ls --full -lu a
-  (exit 77); exit 77
+  Exit 77
   ;;
 esac
 
@@ -123,4 +123,4 @@ EOF
   fail=1
 fi
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/mknod b/tests/misc/mknod
index bb8e024803..4cf7d9fdbf 100755
--- a/tests/misc/mknod
+++ b/tests/misc/mknod
@@ -39,4 +39,4 @@ mkdir -m 734 f3   || fail=1
 mode=`ls -dgo f3|cut -b-10`
 test $mode = drwx-wxr-- || test $mode = drwx-wsr-- || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/nice b/tests/misc/nice
index 4fcb80fadd..90cfb8f2e5 100755
--- a/tests/misc/nice
+++ b/tests/misc/nice
@@ -80,4 +80,4 @@ while :; do
   shift; shift; shift
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/nl b/tests/misc/nl
index 572e44a33f..eefbbb5d77 100755
--- a/tests/misc/nl
+++ b/tests/misc/nl
@@ -45,4 +45,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/nohup b/tests/misc/nohup
index 1b36dbd290..62f87b13f3 100755
--- a/tests/misc/nohup
+++ b/tests/misc/nohup
@@ -105,4 +105,4 @@ EOF
 nohup >/dev/null 2>&1
 test $? = 127 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/od-N b/tests/misc/od-N
index 884127ceb7..9a452d0ffb 100755
--- a/tests/misc/od-N
+++ b/tests/misc/od-N
@@ -34,4 +34,4 @@ cat <<EOF > exp || fail=1
 EOF
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/od-multiple-t b/tests/misc/od-multiple-t
index 63fb7e4246..2865f18368 100755
--- a/tests/misc/od-multiple-t
+++ b/tests/misc/od-multiple-t
@@ -44,4 +44,4 @@ done
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/od-x8 b/tests/misc/od-x8
index b52c1ce387..5a17b38fae 100755
--- a/tests/misc/od-x8
+++ b/tests/misc/od-x8
@@ -45,4 +45,4 @@ od -An -t x1 in \
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/pathchk1 b/tests/misc/pathchk1
index 5b20f077ae..f8f8784a06 100755
--- a/tests/misc/pathchk1
+++ b/tests/misc/pathchk1
@@ -40,4 +40,4 @@ pathchk -P '' > /dev/null 2>&1 && fail=1
 pathchk -P -- - > /dev/null 2>&1 && fail=1
 pathchk -p -P x/- > /dev/null 2>&1 && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/printf b/tests/misc/printf
index 78084b3b01..1cc440e2e0 100755
--- a/tests/misc/printf
+++ b/tests/misc/printf
@@ -95,4 +95,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/printf-hex b/tests/misc/printf-hex
index 968f66726d..3668013c25 100755
--- a/tests/misc/printf-hex
+++ b/tests/misc/printf-hex
@@ -35,4 +35,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/printf-surprise b/tests/misc/printf-surprise
index 3336f12a5d..b24e3bef96 100755
--- a/tests/misc/printf-surprise
+++ b/tests/misc/printf-surprise
@@ -87,4 +87,4 @@ case $n_out:$diagnostic:$exit in
   *) fail=1;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/ptx-overrun b/tests/misc/ptx-overrun
index 1859691182..3c2e04b9da 100755
--- a/tests/misc/ptx-overrun
+++ b/tests/misc/ptx-overrun
@@ -37,4 +37,4 @@ ptx -S 'foo\'   $f < /dev/null >> out || fail=1
 ptx -W 'bar\\\' $f < /dev/null >> out || fail=1
 compare out empty || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/pwd-long b/tests/misc/pwd-long
index 94d4e4c03b..4270071595 100755
--- a/tests/misc/pwd-long
+++ b/tests/misc/pwd-long
@@ -116,4 +116,4 @@ EOF
 
 fail=$?
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/pwd-unreadable-parent b/tests/misc/pwd-unreadable-parent
index 75df827f29..c79daad0c4 100755
--- a/tests/misc/pwd-unreadable-parent
+++ b/tests/misc/pwd-unreadable-parent
@@ -44,4 +44,4 @@ readlink -ev . > out || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/readlink-fp-loop b/tests/misc/readlink-fp-loop
index 7ac54b9a9a..c03fcb1aa8 100755
--- a/tests/misc/readlink-fp-loop
+++ b/tests/misc/readlink-fp-loop
@@ -70,4 +70,4 @@ readlink -v -e loop 2> out && fail=1
 echo "readlink: loop: $symlink_loop_msg" > exp || framework_failure
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/runcon-no-reorder b/tests/misc/runcon-no-reorder
index c1705e524a..a627957244 100755
--- a/tests/misc/runcon-no-reorder
+++ b/tests/misc/runcon-no-reorder
@@ -44,4 +44,4 @@ esac
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/selinux b/tests/misc/selinux
index 8065182f5b..a231fa78f6 100755
--- a/tests/misc/selinux
+++ b/tests/misc/selinux
@@ -49,4 +49,4 @@ for i in d f p; do
   c=`stat --printf %C s2/$i`; test x$c = x$ctx || fail=1
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/shred-exact b/tests/misc/shred-exact
index d90a80e038..e2917fda99 100755
--- a/tests/misc/shred-exact
+++ b/tests/misc/shred-exact
@@ -38,4 +38,4 @@ for opt in --exact --zero; do
   test -f c && fail=1
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/shred-remove b/tests/misc/shred-remove
index a5dc6f12d6..3c304f8a3d 100755
--- a/tests/misc/shred-remove
+++ b/tests/misc/shred-remove
@@ -38,4 +38,4 @@ fail=0
 # When the command completes, expect it to fail.
 shred -u $file > /dev/null 2>&1 && fail=1 || :
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/shuf b/tests/misc/shuf
index 83530c2074..7ec23ca19c 100755
--- a/tests/misc/shuf
+++ b/tests/misc/shuf
@@ -56,4 +56,4 @@ shuf --zero-terminated -i 1-1 > out || fail=1
 printf '1\0' > exp || framework_failure
 cmp out exp || { fail=1; echo "missing NUL terminator?" 1>&2; }
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/sort-compress b/tests/misc/sort-compress
index f3c4735972..fa1c05a1af 100755
--- a/tests/misc/sort-compress
+++ b/tests/misc/sort-compress
@@ -73,4 +73,4 @@ rm -f dzip ok
 PATH=. "$SORT" -S 1k in > out || fail=1
 compare exp out || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/sort-rand b/tests/misc/sort-rand
index f675c956cd..47d4d85274 100755
--- a/tests/misc/sort-rand
+++ b/tests/misc/sort-rand
@@ -52,4 +52,4 @@ if (locale --version) > /dev/null 2>&1; then
   compare in out1 || { fail=1; echo "not a permutation with LC_ALL=$locale" 1>&2; }
 fi
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/sort-version b/tests/misc/sort-version
index 3208f2eead..262ee95ceb 100755
--- a/tests/misc/sort-version
+++ b/tests/misc/sort-version
@@ -72,4 +72,4 @@ cat > exp <<- _EOF_
 fail=0
 sort --sort=version -o out in || fail=1
 compare exp out || fail=1
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/split-a b/tests/misc/split-a
index 19f3f0aede..c73063587b 100755
--- a/tests/misc/split-a
+++ b/tests/misc/split-a
@@ -68,4 +68,4 @@ for f in $files; do
   n=$(expr $n + 1)
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/split-fail b/tests/misc/split-fail
index 0334c2d14d..0680891b64 100755
--- a/tests/misc/split-fail
+++ b/tests/misc/split-fail
@@ -75,4 +75,4 @@ EOF
 compare out exp || fail=1
 
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/split-l b/tests/misc/split-l
index 453f1008f8..48f4352e6d 100755
--- a/tests/misc/split-l
+++ b/tests/misc/split-l
@@ -44,4 +44,4 @@ compare xab exp-2 || fail=1
 compare xac exp-3 || fail=1
 test -f xad && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/stat-fmt b/tests/misc/stat-fmt
index f169166b1a..354eae2ea9 100755
--- a/tests/misc/stat-fmt
+++ b/tests/misc/stat-fmt
@@ -32,4 +32,4 @@ for i in `seq 50`; do
   test "$out" = "$fmt" || fail=1
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/stty b/tests/misc/stty
index 8216c8e815..c53f6c40ae 100755
--- a/tests/misc/stty
+++ b/tests/misc/stty
@@ -100,4 +100,4 @@ fi
 
 stty `cat $saved_state`
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/stty-invalid b/tests/misc/stty-invalid
index 302dbe0ecf..47531c533b 100755
--- a/tests/misc/stty-invalid
+++ b/tests/misc/stty-invalid
@@ -45,4 +45,4 @@ stty `echo $saved_state |sed 's/:[0-9a-f]*$/:'$hex_2_64/` 2>/dev/null && fail=1
 # the state of our tty), try to restore the initial state.
 stty $saved_state || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/stty-row-col b/tests/misc/stty-row-col
index 8ac1143367..987e0d5973 100755
--- a/tests/misc/stty-row-col
+++ b/tests/misc/stty-row-col
@@ -81,4 +81,4 @@ done
 set x $saved_size
 stty rows $2 columns $3 || exit 1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/sum-sysv b/tests/misc/sum-sysv
index 8766449ef5..1d337c76fe 100755
--- a/tests/misc/sum-sysv
+++ b/tests/misc/sum-sysv
@@ -54,4 +54,4 @@ cat > exp <<\EOF
 EOF
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/tac-continue b/tests/misc/tac-continue
index ce41a525c6..ea2a3eaeb7 100755
--- a/tests/misc/tac-continue
+++ b/tests/misc/tac-continue
@@ -33,7 +33,7 @@ fi
 if ! test -d "$FULL_PARTITION_TMPDIR"; then
   echo "$0: $FULL_PARTITION_TMPDIR:" \
     "\$FULL_PARTITION_TMPDIR does not specify a directory" 1>&2
-  (exit 1); exit 1
+  Exit 1
 fi
 
 fp_tmp="$FULL_PARTITION_TMPDIR/tac-cont-$$"
@@ -42,14 +42,14 @@ cleanup_() { rm -f "$fp_tmp"; }
 # Make sure we can create an empty file there (i.e. no shortage of inodes).
 if ! touch $fp_tmp; then
   echo "$0: $fp_tmp: cannot create empty file" 1>&2
-  (exit 1); exit 1
+  Exit 1
 fi
 
 # Make sure that we fail when trying to create a file large enough
 # to consume a non-inode block.
 if seq 1000 > $fp_tmp 2>/dev/null; then
   echo "$0: $FULL_PARTITION_TMPDIR: not a full partition" 1>&2
-  (exit 1); exit 1
+  Exit 1
 fi
 
 seq 5 > in
@@ -72,4 +72,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/tee b/tests/misc/tee
index adf0caa0b8..ccdf12272a 100755
--- a/tests/misc/tee
+++ b/tests/misc/tee
@@ -36,4 +36,4 @@ for n in 0 $nums; do
 	done
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/tee-dash b/tests/misc/tee-dash
index 2564117f13..e57b225a5f 100755
--- a/tests/misc/tee-dash
+++ b/tests/misc/tee-dash
@@ -26,4 +26,4 @@ fi
 fail=0
 tee - </dev/null || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/timeout b/tests/misc/timeout
index 8996fbce39..fa964a37e5 100755
--- a/tests/misc/timeout
+++ b/tests/misc/timeout
@@ -41,4 +41,4 @@ timeout 1 false && fail=1
 timeout 1 sleep 2
 test $? = 124 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/timeout-parameters b/tests/misc/timeout-parameters
index e44ff98088..27d6b570a9 100755
--- a/tests/misc/timeout-parameters
+++ b/tests/misc/timeout-parameters
@@ -49,4 +49,4 @@ timeout 1 . && fail=1
 # non existant command
 timeout 1 ... && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/truncate-dangling-symlink b/tests/misc/truncate-dangling-symlink
index e16da95def..b71e2bad6a 100755
--- a/tests/misc/truncate-dangling-symlink
+++ b/tests/misc/truncate-dangling-symlink
@@ -30,4 +30,4 @@ truncate -s0 t-symlink || fail=1
 
 test -f truncate-target || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/truncate-dir-fail b/tests/misc/truncate-dir-fail
index 3ae918e76e..942c6b4ccb 100755
--- a/tests/misc/truncate-dir-fail
+++ b/tests/misc/truncate-dir-fail
@@ -11,4 +11,4 @@ fi
 # truncate on dir not allowed
 truncate -s+0 . && fail=1 || fail=0
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/truncate-fail-diag b/tests/misc/truncate-fail-diag
index 0c6bb1c578..39091d9339 100755
--- a/tests/misc/truncate-fail-diag
+++ b/tests/misc/truncate-fail-diag
@@ -46,4 +46,4 @@ truncate -s0 $dir > out 2>&1 && fail=1
 #truncate: cannot open \`$dir' for writing: Not a directory
 #truncate: cannot open \`$dir' for writing: Is a directory
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/truncate-fifo b/tests/misc/truncate-fifo
index f2decc6aae..d5802c0ca9 100755
--- a/tests/misc/truncate-fifo
+++ b/tests/misc/truncate-fifo
@@ -29,4 +29,4 @@ fail=0
 
 truncate -s0 "fifo" || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/truncate-no-create-missing b/tests/misc/truncate-no-create-missing
index bbe8e85594..a5d0e72bbe 100755
--- a/tests/misc/truncate-no-create-missing
+++ b/tests/misc/truncate-no-create-missing
@@ -28,4 +28,4 @@ fail=0
 # truncate -c no-such-file should not fail.
 truncate -s0 -c no-such-file || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/truncate-overflow b/tests/misc/truncate-overflow
index 5dbbf38cdb..b903244e62 100755
--- a/tests/misc/truncate-overflow
+++ b/tests/misc/truncate-overflow
@@ -52,4 +52,4 @@ else
     truncate -s+2147483647 non-empty-file && fail=1
 fi
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/truncate-owned-by-other b/tests/misc/truncate-owned-by-other
index a7ad278644..708138d75d 100755
--- a/tests/misc/truncate-owned-by-other
+++ b/tests/misc/truncate-owned-by-other
@@ -37,4 +37,4 @@ chmod g+x .
 
 setuidgid $NON_ROOT_USERNAME env PATH="$PATH" truncate -s0 root-owned || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/truncate-parameters b/tests/misc/truncate-parameters
index 27a22a91f4..4489ed4057 100755
--- a/tests/misc/truncate-parameters
+++ b/tests/misc/truncate-parameters
@@ -46,4 +46,4 @@ truncate --size=" >1" file || fail=1 #file now 1
 truncate --size=" +1" file || fail=1 #file now 2
 test $(stat --format %s file) = 2 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/truncate-relative b/tests/misc/truncate-relative
index dedb76fd83..cee49b4f47 100755
--- a/tests/misc/truncate-relative
+++ b/tests/misc/truncate-relative
@@ -37,4 +37,4 @@ truncate --size="/0" file && fail=1
 # division by zero
 truncate --size="%0" file && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/misc/wc-files0 b/tests/misc/wc-files0
index aa2221e867..1150121908 100755
--- a/tests/misc/wc-files0
+++ b/tests/misc/wc-files0
@@ -45,4 +45,4 @@ if test "$fail" = ''; then
   compare out exp || fail=1
 fi
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mkdir/p-1 b/tests/mkdir/p-1
index 85a2458e6b..2039513f58 100755
--- a/tests/mkdir/p-1
+++ b/tests/mkdir/p-1
@@ -27,4 +27,4 @@ fail=0
 mkdir --parents "`pwd`/t" || fail=1
 test -d t || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mkdir/p-2 b/tests/mkdir/p-2
index 7daf0b5fa9..22b7615db9 100755
--- a/tests/mkdir/p-2
+++ b/tests/mkdir/p-2
@@ -27,4 +27,4 @@ fail=0
 mkdir --parents "`pwd`/t/u" || fail=1
 test -d t/u || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mkdir/p-3 b/tests/mkdir/p-3
index 54052f1719..45e1a0a59c 100755
--- a/tests/mkdir/p-3
+++ b/tests/mkdir/p-3
@@ -52,4 +52,4 @@ b=`ls "$p/a" | tr -d '\n'`
 # With coreutils-5.3.0, this would fail with $b=bu.
 test "x$b" = xb || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mkdir/p-slashdot b/tests/mkdir/p-slashdot
index d2c3f983c4..d7b5dfa91d 100755
--- a/tests/mkdir/p-slashdot
+++ b/tests/mkdir/p-slashdot
@@ -31,4 +31,4 @@ test -d d1 || fail=1
 mkdir -p d2/.. || fail=1
 test -d d2 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mkdir/p-thru-slink b/tests/mkdir/p-thru-slink
index accdc7985b..6321fc9ee6 100755
--- a/tests/mkdir/p-thru-slink
+++ b/tests/mkdir/p-thru-slink
@@ -29,4 +29,4 @@ fail=0
 mkdir -p slink/x || fail=1
 test -d x || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mkdir/p-v b/tests/mkdir/p-v
index 27696b52dc..8e085949ca 100755
--- a/tests/mkdir/p-v
+++ b/tests/mkdir/p-v
@@ -34,4 +34,4 @@ mkdir: created directory `foo/a/b/c'
 mkdir: created directory `foo/a/b/c/d'
 EOF
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mkdir/parents b/tests/mkdir/parents
index 5433ee0b8e..46f5867d38 100755
--- a/tests/mkdir/parents
+++ b/tests/mkdir/parents
@@ -53,4 +53,4 @@ p=`ls -ld a/b/c|cut -b-10`; case $p in drwx------);; *) fail=1;; esac
 # `d's perms are determined by the -m argument.
 p=`ls -ld a/b/c/d|cut -b-10`; case $p in $d_mode_str);; *) fail=1;; esac
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mkdir/perm b/tests/mkdir/perm
index 4fa9b5604d..2f8715b478 100755
--- a/tests/mkdir/perm
+++ b/tests/mkdir/perm
@@ -85,4 +85,4 @@ for p in empty -p; do
   done
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mkdir/selinux b/tests/mkdir/selinux
index 4a01a43300..a81689a801 100755
--- a/tests/mkdir/selinux
+++ b/tests/mkdir/selinux
@@ -56,4 +56,4 @@ for cmd_w_arg in 'mkdir dir' 'mknod b p' 'mkfifo f'; do
   compare out exp || fail=1
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mkdir/special-1 b/tests/mkdir/special-1
index 9d13cbad91..7a1c185c43 100755
--- a/tests/mkdir/special-1
+++ b/tests/mkdir/special-1
@@ -52,4 +52,4 @@ case "$mode" in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mkdir/t-slash b/tests/mkdir/t-slash
index e95b0529b2..4de4459ee8 100755
--- a/tests/mkdir/t-slash
+++ b/tests/mkdir/t-slash
@@ -33,4 +33,4 @@ test -d dir || fail=1
 mkdir d2/ || fail=1
 test -d d2 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mkdir/writable-under-readonly b/tests/mkdir/writable-under-readonly
index 1057b445bb..f6de621448 100755
--- a/tests/mkdir/writable-under-readonly
+++ b/tests/mkdir/writable-under-readonly
@@ -54,4 +54,4 @@ mkdir -p mnt-ro/rw/sub || fail=1
 umount /tmp/2
 umount /tmp/1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/acl b/tests/mv/acl
index e9121a59bb..f596ff7dcb 100755
--- a/tests/mv/acl
+++ b/tests/mv/acl
@@ -69,4 +69,4 @@ mv dir2 $other_partition_tmpdir || fail=1
 acl2=`cd $other_partition_tmpdir && getfacl dir2` || framework_failure
 test "$acl1" = "$acl2" || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/atomic b/tests/mv/atomic
index b360e13eb2..3f731a5cb1 100755
--- a/tests/mv/atomic
+++ b/tests/mv/atomic
@@ -46,4 +46,4 @@ ls -dl s1 > /dev/null 2>&1 && fail=1
 # Ensure that the destination, s2, contains the link from s1.
 test "`readlink s2`" = t1 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/atomic2 b/tests/mv/atomic2
index 796d9c4993..3a4ee7612e 100755
--- a/tests/mv/atomic2
+++ b/tests/mv/atomic2
@@ -47,4 +47,4 @@ ls -dl a > /dev/null 2>&1 && fail=1
 n_links=`stat --printf=%h b` || fail=1
 test "$n_links" = 1 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/backup-dir b/tests/mv/backup-dir
index 28876a0071..36c4bb0daf 100755
--- a/tests/mv/backup-dir
+++ b/tests/mv/backup-dir
@@ -36,4 +36,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/backup-is-src b/tests/mv/backup-is-src
index eee4fd9d88..70b1e96aa6 100755
--- a/tests/mv/backup-is-src
+++ b/tests/mv/backup-is-src
@@ -47,4 +47,4 @@ EOF
 
 compare out2 exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/childproof b/tests/mv/childproof
index dffdf40c16..2067bd81cc 100755
--- a/tests/mv/childproof
+++ b/tests/mv/childproof
@@ -86,4 +86,4 @@ test `stat --format %i a/f` = `stat --format %i c/f` || fail=1
 # b/f and c/f must not be linked
 test `stat --format %i b/f` = `stat --format %i c/f` && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/diag b/tests/mv/diag
index ef25d80921..446fc34bf6 100755
--- a/tests/mv/diag
+++ b/tests/mv/diag
@@ -50,4 +50,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/dir-file b/tests/mv/dir-file
index 38217e0f37..82c0c21b48 100755
--- a/tests/mv/dir-file
+++ b/tests/mv/dir-file
@@ -32,4 +32,4 @@ fail=0
 mv dir file > /dev/null 2>&1 && fail=1
 mv file dir > /dev/null 2>&1 && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/dir2dir b/tests/mv/dir2dir
index 9a038814ab..8e260a7775 100755
--- a/tests/mv/dir2dir
+++ b/tests/mv/dir2dir
@@ -44,4 +44,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/dup-source b/tests/mv/dup-source
index d7b56e8547..398d877dcf 100755
--- a/tests/mv/dup-source
+++ b/tests/mv/dup-source
@@ -68,4 +68,4 @@ EOF
   compare out exp || fail=1
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/force b/tests/mv/force
index f2eaf918e3..912354ee8d 100755
--- a/tests/mv/force
+++ b/tests/mv/force
@@ -43,4 +43,4 @@ test `cat $ff` = force-contents || fail=1
 # device and inodes are the same.
 mv $ff $ff2 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/hard-2 b/tests/mv/hard-2
index aaf9349af8..6451a1cae7 100755
--- a/tests/mv/hard-2
+++ b/tests/mv/hard-2
@@ -79,4 +79,4 @@ ic=`ls -i c|sed 's/ c//'`
 test $ia = $ib || fail=1
 test $ia = $ic || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/hard-3 b/tests/mv/hard-3
index a2fa4e759a..e476c9d30d 100755
--- a/tests/mv/hard-3
+++ b/tests/mv/hard-3
@@ -71,4 +71,4 @@ test "$ia" = "$ic" || fail=1
 ib=`ls -i x/b` || fail=1; set x $ib; ib=$2
 test "$ia" = "$ib" && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/hard-4 b/tests/mv/hard-4
index 881cab518d..e11914a1f4 100755
--- a/tests/mv/hard-4
+++ b/tests/mv/hard-4
@@ -40,4 +40,4 @@ test -r a && fail=1
 test -r b || fail=1
 test -r b~ || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/hard-link-1 b/tests/mv/hard-link-1
index 864fd03183..08b3c92523 100755
--- a/tests/mv/hard-link-1
+++ b/tests/mv/hard-link-1
@@ -42,4 +42,4 @@ a=`sed -n 's/ a$//p' out`
 b=`sed -n 's/ b$//p' out`
 test "$a" = "$b" || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/hard-verbose b/tests/mv/hard-verbose
index 0b4a12903a..a558d32bc1 100755
--- a/tests/mv/hard-verbose
+++ b/tests/mv/hard-verbose
@@ -35,4 +35,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/i-2 b/tests/mv/i-2
index 1cc1394974..959912a163 100755
--- a/tests/mv/i-2
+++ b/tests/mv/i-2
@@ -57,4 +57,4 @@ test -f g || fail=1
 test -f h || fail=1
 compare g h || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/i-3 b/tests/mv/i-3
index 9d8b03ecd7..b9cd7d9ed8 100755
--- a/tests/mv/i-3
+++ b/tests/mv/i-3
@@ -54,4 +54,4 @@ case "`cat out`" in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/i-4 b/tests/mv/i-4
index 5de59b43b3..fcc38df533 100755
--- a/tests/mv/i-4
+++ b/tests/mv/i-4
@@ -51,4 +51,4 @@ mv -i a b < y >/dev/null 2>&1 || fail=1
 test -r a && fail=1
 test -r b || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/i-5 b/tests/mv/i-5
index da9716888b..f8fc8e6a78 100755
--- a/tests/mv/i-5
+++ b/tests/mv/i-5
@@ -31,4 +31,4 @@ fail=0
 # coreutils 6.2 mv would neglect to prompt in this case.
 echo n | mv -i a b 2>/dev/null || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/i-link-no b/tests/mv/i-link-no
index b322872590..226d5dd176 100755
--- a/tests/mv/i-link-no
+++ b/tests/mv/i-link-no
@@ -48,4 +48,4 @@ case "`cat b/foo`" in
   *) fail=1;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/into-self b/tests/mv/into-self
index 915194f608..428eb174e2 100755
--- a/tests/mv/into-self
+++ b/tests/mv/into-self
@@ -55,4 +55,4 @@ test -d $dir/$dir && fail=1
 # Make sure the file has been moved to the right place.
 test -f $dir/$file || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/into-self-2 b/tests/mv/into-self-2
index 13e996a226..99763d62d1 100755
--- a/tests/mv/into-self-2
+++ b/tests/mv/into-self-2
@@ -54,4 +54,4 @@ EOF
 
 compare out2 exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/into-self-3 b/tests/mv/into-self-3
index 3b967322f9..d1a0710d47 100755
--- a/tests/mv/into-self-3
+++ b/tests/mv/into-self-3
@@ -42,4 +42,4 @@ EOF
 
 compare out2 exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/into-self-4 b/tests/mv/into-self-4
index 9f001139fd..0a4af7fc9d 100755
--- a/tests/mv/into-self-4
+++ b/tests/mv/into-self-4
@@ -36,4 +36,4 @@ mv s s 2> /dev/null && fail=1
 # Before 4.0.36, `s' would have been removed.
 test -f s || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/leak-fd b/tests/mv/leak-fd
index 1141b7303a..993bbdf0c2 100755
--- a/tests/mv/leak-fd
+++ b/tests/mv/leak-fd
@@ -57,4 +57,4 @@ rm .dirs
 out=$(ls -A) || fail=1
 test -z "$out" || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/mv-special-1 b/tests/mv/mv-special-1
index f10dc10efb..bae203cc81 100755
--- a/tests/mv/mv-special-1
+++ b/tests/mv/mv-special-1
@@ -75,4 +75,4 @@ compare out2 exp || fail=1
 # cd $other_partition_tmpdir
 # ls -l -A -R $other_partition_tmpdir
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/no-target-dir b/tests/mv/no-target-dir
index 7df1fb99f2..7094cc73f7 100755
--- a/tests/mv/no-target-dir
+++ b/tests/mv/no-target-dir
@@ -51,4 +51,4 @@ mv -fT src d2 2> /dev/null && fail=1
 # rename must fail, since the src is not a directory.
 mv -fT f e2 2> /dev/null && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/part-fail b/tests/mv/part-fail
index 60c4210311..469880a89e 100755
--- a/tests/mv/part-fail
+++ b/tests/mv/part-fail
@@ -56,4 +56,4 @@ else
 fi
 test $fail = 1 && diff out exp 2> /dev/null
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/part-hardlink b/tests/mv/part-hardlink
index 3eaa083cd8..fa3d54da6c 100755
--- a/tests/mv/part-hardlink
+++ b/tests/mv/part-hardlink
@@ -45,4 +45,4 @@ test $1 = $3 || fail=1
 set `ls -Ci a/1 b/1`
 test $1 = $3 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/part-rename b/tests/mv/part-rename
index 8bff9915fe..e80004b6ab 100755
--- a/tests/mv/part-rename
+++ b/tests/mv/part-rename
@@ -33,4 +33,4 @@ fail=0
 
 mv foo/ $other_partition_tmpdir/bar || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/part-symlink b/tests/mv/part-symlink
index 9262524936..2aed4d8540 100755
--- a/tests/mv/part-symlink
+++ b/tests/mv/part-symlink
@@ -204,4 +204,4 @@ EOF
 # Redirect to stderr, since stdout is already taken.
 compare $expected $actual 1>&2 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/partition-perm b/tests/mv/partition-perm
index 03f169ebb3..08236a2a49 100755
--- a/tests/mv/partition-perm
+++ b/tests/mv/partition-perm
@@ -39,4 +39,4 @@ test -f $other_partition_tmpdir/file || fail=1
 mode=`ls -l $other_partition_tmpdir/file|cut -b-10`
 test "$mode" = "-rwxrwxrwx" || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/perm-1 b/tests/mv/perm-1
index 95bbccb8d8..44a1af2b7c 100755
--- a/tests/mv/perm-1
+++ b/tests/mv/perm-1
@@ -37,4 +37,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/reply-no b/tests/mv/reply-no
index 42967c8664..fb7cc2f8d6 100755
--- a/tests/mv/reply-no
+++ b/tests/mv/reply-no
@@ -39,4 +39,4 @@ EOF
 
 compare out exp_err || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/sticky-to-xpart b/tests/mv/sticky-to-xpart
index 14cb76211e..55d8f8f287 100755
--- a/tests/mv/sticky-to-xpart
+++ b/tests/mv/sticky-to-xpart
@@ -65,4 +65,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/to-symlink b/tests/mv/to-symlink
index 560d63de9b..b127722507 100755
--- a/tests/mv/to-symlink
+++ b/tests/mv/to-symlink
@@ -47,4 +47,4 @@ test -f $file && fail=1
 # Make sure $rem_file is unmodified.
 test `cat $rem_file` = remote || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/trailing-slash b/tests/mv/trailing-slash
index eea982f3ec..a5932ba64f 100755
--- a/tests/mv/trailing-slash
+++ b/tests/mv/trailing-slash
@@ -55,4 +55,4 @@ done
 #touch a a2
 #mv a a2/ && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/mv/update b/tests/mv/update
index 15e6fa7620..29910c82bf 100755
--- a/tests/mv/update
+++ b/tests/mv/update
@@ -57,4 +57,4 @@ cp --update new old || fail=1
 case "`cat old`" in new) ;; *) fail=1 ;; esac
 case "`cat new`" in new) ;; *) fail=1 ;; esac
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/readlink/can-e b/tests/readlink/can-e
index 72c2c5cd31..6316ff98f9 100755
--- a/tests/readlink/can-e
+++ b/tests/readlink/can-e
@@ -107,4 +107,4 @@ for p in "" "$pwd/$tmp/"; do
   test -z "$v" || fail=1
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/readlink/can-f b/tests/readlink/can-f
index 67f84b92f0..9e19eb0158 100755
--- a/tests/readlink/can-f
+++ b/tests/readlink/can-f
@@ -140,4 +140,4 @@ for p in "" "$pwd/$tmp/"; do
   test -z "$v" || fail=1
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/readlink/can-m b/tests/readlink/can-m
index 24f98c985d..d20dcd73b8 100755
--- a/tests/readlink/can-m
+++ b/tests/readlink/can-m
@@ -144,4 +144,4 @@ for p in "" "$pwd/$tmp/"; do
 
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/readlink/rl-1 b/tests/readlink/rl-1
index 91401b0f4a..cdde35bae1 100755
--- a/tests/readlink/rl-1
+++ b/tests/readlink/rl-1
@@ -45,4 +45,4 @@ test -z "$v" || fail=1
 v=`readlink missing` && fail=1
 test -z "$v" || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/require-perl b/tests/require-perl
index 1f98edfe4b..a6d9dc9d33 100644
--- a/tests/require-perl
+++ b/tests/require-perl
@@ -2,5 +2,5 @@
 $PERL -e 'use warnings' > /dev/null 2>&1 || {
   echo 1>&2 "$0: configure did not find a usable version of Perl," \
     "so skipping this test"
-  (exit 77); exit 77
+  Exit 77
 }
diff --git a/tests/rm/cycle b/tests/rm/cycle
index 4c9f04d039..20522a052e 100755
--- a/tests/rm/cycle
+++ b/tests/rm/cycle
@@ -38,4 +38,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/dangling-symlink b/tests/rm/dangling-symlink
index 7581be22fd..189bafcfca 100755
--- a/tests/rm/dangling-symlink
+++ b/tests/rm/dangling-symlink
@@ -44,4 +44,4 @@ ls -l symlink > /dev/null 2>&1 && fail=1
 
 kill $pid > /dev/null 2>&1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/deep-1 b/tests/rm/deep-1
index 34e9e1919b..c169678808 100755
--- a/tests/rm/deep-1
+++ b/tests/rm/deep-1
@@ -55,4 +55,4 @@ rm -r $t || fail=1
 # Make sure all of $t was deleted.
 test -d $t && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/deep-2 b/tests/rm/deep-2
index ed84c66ead..f01a79efc2 100755
--- a/tests/rm/deep-2
+++ b/tests/rm/deep-2
@@ -50,4 +50,4 @@ test -s out && fail=1
 # the directory must have been removed
 test -d x && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/dir-no-w b/tests/rm/dir-no-w
index 35ab1852d1..d5317d7b37 100755
--- a/tests/rm/dir-no-w
+++ b/tests/rm/dir-no-w
@@ -44,4 +44,4 @@ rm -f out-t
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/dir-nonrecur b/tests/rm/dir-nonrecur
index 064ef5d439..1d06b4438e 100755
--- a/tests/rm/dir-nonrecur
+++ b/tests/rm/dir-nonrecur
@@ -36,4 +36,4 @@ EOF
 # Before coreutils-5.93 this test would fail on Solaris 9 and newer.
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/dot-rel b/tests/rm/dot-rel
index 0d0e1a1de4..6a3ac5105f 100755
--- a/tests/rm/dot-rel
+++ b/tests/rm/dot-rel
@@ -31,4 +31,4 @@ fail=0
 
 rm -r a b || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/empty-inacc b/tests/rm/empty-inacc
index e89d103f2b..67af8753e1 100755
--- a/tests/rm/empty-inacc
+++ b/tests/rm/empty-inacc
@@ -40,4 +40,4 @@ test -d inacc && fail=1
 rm -rf a || fail=1
 test -d a && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/f-1 b/tests/rm/f-1
index acd241a207..fa008068f2 100755
--- a/tests/rm/f-1
+++ b/tests/rm/f-1
@@ -30,4 +30,4 @@ mkdir -p d || framework_failure
 fail=0
 rm -f d/no-such-file || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/fail-2eperm b/tests/rm/fail-2eperm
index 6cc66ef80f..14654e9993 100755
--- a/tests/rm/fail-2eperm
+++ b/tests/rm/fail-2eperm
@@ -54,4 +54,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/fail-eacces b/tests/rm/fail-eacces
index 916b2577bc..4722b0f611 100755
--- a/tests/rm/fail-eacces
+++ b/tests/rm/fail-eacces
@@ -56,4 +56,4 @@ rm: cannot remove `e/slink': Permission denied
 EOF
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/hash b/tests/rm/hash
index abb7ffd04b..eaa384a760 100755
--- a/tests/rm/hash
+++ b/tests/rm/hash
@@ -39,4 +39,4 @@ fail=0
 
 rm -r t || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/i-1 b/tests/rm/i-1
index d19ebeaec0..1d4b1dced5 100755
--- a/tests/rm/i-1
+++ b/tests/rm/i-1
@@ -44,4 +44,4 @@ test -f $t/a && fail=1
 
 rm -rf $t
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/i-never b/tests/rm/i-never
index 244054ab77..2bde9ecfa1 100755
--- a/tests/rm/i-never
+++ b/tests/rm/i-never
@@ -35,4 +35,4 @@ rm --interactive=never f > out || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/i-no-r b/tests/rm/i-no-r
index f028b6357d..718b1495db 100755
--- a/tests/rm/i-no-r
+++ b/tests/rm/i-no-r
@@ -36,4 +36,4 @@ rm -i dir < y > /dev/null 2>&1 && fail=1
 # The directory must remain.
 test -d dir || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/ignorable b/tests/rm/ignorable
index 37e0150f43..7b38fb6fd0 100755
--- a/tests/rm/ignorable
+++ b/tests/rm/ignorable
@@ -32,4 +32,4 @@ fail=0
 # Example from Andreas Schwab.
 rm -f existing-non-dir/f > out 2>&1 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/inaccessible b/tests/rm/inaccessible
index 35cddc5992..fc46b021fd 100755
--- a/tests/rm/inaccessible
+++ b/tests/rm/inaccessible
@@ -57,4 +57,4 @@ sed 's/: The file access permissions.*/: Permission denied/'<out>o1;mv o1 out
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/interactive-always b/tests/rm/interactive-always
index 382cc6ff19..88afd75541 100755
--- a/tests/rm/interactive-always
+++ b/tests/rm/interactive-always
@@ -91,4 +91,4 @@ EOF
 compare out expout || fail=1
 compare err experr || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/interactive-once b/tests/rm/interactive-once
index 6238f3fcf4..1590832814 100755
--- a/tests/rm/interactive-once
+++ b/tests/rm/interactive-once
@@ -111,4 +111,4 @@ EOF
 compare out expout || fail=1
 compare err experr || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/ir-1 b/tests/rm/ir-1
index c3cdc0be85..c3cb8b3271 100755
--- a/tests/rm/ir-1
+++ b/tests/rm/ir-1
@@ -61,4 +61,4 @@ case `echo $t/*` in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/isatty b/tests/rm/isatty
index 596887311b..173458d50d 100755
--- a/tests/rm/isatty
+++ b/tests/rm/isatty
@@ -56,4 +56,4 @@ echo x >> out
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/no-give-up b/tests/rm/no-give-up
index b888296c82..c88642037b 100755
--- a/tests/rm/no-give-up
+++ b/tests/rm/no-give-up
@@ -43,4 +43,4 @@ test -d d || fail=1
 # f must have been removed.
 test -f d/f && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/one-file-system b/tests/rm/one-file-system
index 419ada201a..2de7678dda 100755
--- a/tests/rm/one-file-system
+++ b/tests/rm/one-file-system
@@ -45,4 +45,4 @@ umount $t
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/r-1 b/tests/rm/r-1
index ec846fb8d3..187b6642cc 100755
--- a/tests/rm/r-1
+++ b/tests/rm/r-1
@@ -47,4 +47,4 @@ done
 # Compare expected and actual output.
 compare $test.E $test.O || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/r-2 b/tests/rm/r-2
index 0bf6756def..d9614ba928 100755
--- a/tests/rm/r-2
+++ b/tests/rm/r-2
@@ -48,4 +48,4 @@ fi
 # Compare expected and actual output.
 cmp t/E t/O || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/r-3 b/tests/rm/r-3
index 9c31d881f2..e4d8dc961f 100755
--- a/tests/rm/r-3
+++ b/tests/rm/r-3
@@ -50,4 +50,4 @@ fail=0
 rm -rf t || fail=1
 test -d t && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/r-4 b/tests/rm/r-4
index 3d21079145..7cc84b61d3 100755
--- a/tests/rm/r-4
+++ b/tests/rm/r-4
@@ -38,4 +38,4 @@ rm -fr d/../ 2>/dev/null && fail=1
 
 test -f d/a || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/readdir-bug b/tests/rm/readdir-bug
index 15dc741252..2d2e6ebbf9 100755
--- a/tests/rm/readdir-bug
+++ b/tests/rm/readdir-bug
@@ -43,4 +43,4 @@ rm -rf b  || fail=1
 
 test -d b && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/rm1 b/tests/rm/rm1
index 70bc0e8b4a..116bd7bea1 100755
--- a/tests/rm/rm1
+++ b/tests/rm/rm1
@@ -50,4 +50,4 @@ test -d b/a/p || fail=1
 test -d b/c && fail=1
 test -d b/d && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/rm2 b/tests/rm/rm2
index 853f4e2ac8..67402a823e 100755
--- a/tests/rm/rm2
+++ b/tests/rm/rm2
@@ -57,4 +57,4 @@ test -d a/3 && fail=1
 chmod u+x b
 test -d b/3 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/rm3 b/tests/rm/rm3
index c5630a269f..a64bd27977 100755
--- a/tests/rm/rm3
+++ b/tests/rm/rm3
@@ -75,4 +75,4 @@ compare out exp || fail=1
 
 test -d z && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/rm4 b/tests/rm/rm4
index 2fbf317a12..8642a9d235 100755
--- a/tests/rm/rm4
+++ b/tests/rm/rm4
@@ -33,4 +33,4 @@ rm dir > /dev/null 2>&1 && fail=1
 
 test -d dir || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/rm5 b/tests/rm/rm5
index f54d640a0c..e36f08dfa0 100755
--- a/tests/rm/rm5
+++ b/tests/rm/rm5
@@ -54,4 +54,4 @@ test -d d && fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/sunos-1 b/tests/rm/sunos-1
index ce1016e1f4..010c937826 100755
--- a/tests/rm/sunos-1
+++ b/tests/rm/sunos-1
@@ -31,4 +31,4 @@ fi
 fail=0
 rm -r '' > /dev/null 2>&1 && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/unread2 b/tests/rm/unread2
index 005c4255c5..615f24d8d4 100755
--- a/tests/rm/unread2
+++ b/tests/rm/unread2
@@ -37,4 +37,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/unread3 b/tests/rm/unread3
index e79bd60030..db38f900f8 100755
--- a/tests/rm/unread3
+++ b/tests/rm/unread3
@@ -45,4 +45,4 @@ test -d "$t/b" && fail=1
 test -d "$t/d" && fail=1
 test -d "$t/e" && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rm/v-slash b/tests/rm/v-slash
index 3a9d5411a7..71432e6d9c 100755
--- a/tests/rm/v-slash
+++ b/tests/rm/v-slash
@@ -36,4 +36,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rmdir/fail-perm b/tests/rmdir/fail-perm
index 9eeb633eac..bfc7b07681 100755
--- a/tests/rmdir/fail-perm
+++ b/tests/rmdir/fail-perm
@@ -34,4 +34,4 @@ fail=0
 # As of coreutils-5.1.2, it fails, as required.
 rmdir -p d d/e/f 2> /dev/null && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rmdir/ignore b/tests/rmdir/ignore
index e55ae1f648..564b180a26 100755
--- a/tests/rmdir/ignore
+++ b/tests/rmdir/ignore
@@ -34,4 +34,4 @@ test -d "$cwd/a/x" || fail=1
 test -d "$cwd/a/b" && fail=1
 test -d "$cwd/a/b/c" && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/rmdir/t-slash b/tests/rmdir/t-slash
index 923e9c9c97..85e4e7e048 100755
--- a/tests/rmdir/t-slash
+++ b/tests/rmdir/t-slash
@@ -31,4 +31,4 @@ fail=0
 # rmdir: `dir': No such file or directory
 rmdir -p dir/ || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/sample-test b/tests/sample-test
index 67bc0d1fc7..ca1687238a 100644
--- a/tests/sample-test
+++ b/tests/sample-test
@@ -38,4 +38,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/tail-2/append-only b/tests/tail-2/append-only
index fc761006ba..d78a540632 100755
--- a/tests/tail-2/append-only
+++ b/tests/tail-2/append-only
@@ -42,4 +42,4 @@ pid=$!
 tail --pid=$pid -f f > /dev/null 2>&1 || fail=1
 chattr -a f 2>/dev/null
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/tail-2/assert b/tests/tail-2/assert
index 309d12d8d6..65f00d6af0 100755
--- a/tests/tail-2/assert
+++ b/tests/tail-2/assert
@@ -61,4 +61,4 @@ esac
 
 test $fail = 1 && cat err
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/tail-2/assert-2 b/tests/tail-2/assert-2
index 4c6f4a9f3a..d816c7c65d 100755
--- a/tests/tail-2/assert-2
+++ b/tests/tail-2/assert-2
@@ -49,4 +49,4 @@ esac
 
 test $fail = 1 && cat err
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/tail-2/big-4gb b/tests/tail-2/big-4gb
index b362aeb3d9..c8b2a48840 100755
--- a/tests/tail-2/big-4gb
+++ b/tests/tail-2/big-4gb
@@ -52,4 +52,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/tail-2/infloop-1 b/tests/tail-2/infloop-1
index c18c3e670f..bf12a1143f 100755
--- a/tests/tail-2/infloop-1
+++ b/tests/tail-2/infloop-1
@@ -36,4 +36,4 @@ sleep 1
 fail=0
 kill $tail_pid && fail=1 || :
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/tail-2/proc-ksyms b/tests/tail-2/proc-ksyms
index 84566b5428..4766671b26 100755
--- a/tests/tail-2/proc-ksyms
+++ b/tests/tail-2/proc-ksyms
@@ -30,4 +30,4 @@ if test -r $ksyms; then
   tail $ksyms > /dev/null || fail=1
 fi
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/tail-2/start-middle b/tests/tail-2/start-middle
index 3151e9d091..cc8cc8ee91 100755
--- a/tests/tail-2/start-middle
+++ b/tests/tail-2/start-middle
@@ -35,4 +35,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/tail-2/tail-n0f b/tests/tail-2/tail-n0f
index 4a22541d82..bf19cf54c1 100755
--- a/tests/tail-2/tail-n0f
+++ b/tests/tail-2/tail-n0f
@@ -56,4 +56,4 @@ for file in empty nonempty; do
   done
 done
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/test-lib.sh b/tests/test-lib.sh
index f0e1070618..e7ec80e6d4 100644
--- a/tests/test-lib.sh
+++ b/tests/test-lib.sh
@@ -5,13 +5,13 @@ unset function_test
 eval 'function_test() { return 11; }; function_test'
 if test $? != 11; then
   echo "$0: /bin/sh lacks support for functions; skipping this test." 1>&2
-  (exit 77); exit 77
+  Exit 77
 fi
 
 skip_test_()
 {
   echo "$0: skipping test: $@" 1>&2
-  (exit 77); exit 77
+  Exit 77
 }
 
 require_acl_()
@@ -184,7 +184,7 @@ require_root_()
 }
 
 skip_if_root_() { uid_is_privileged_ && skip_test_ "must be run as non-root"; }
-error_() { echo "$0: $@" 1>&2; (exit 1); exit 1; }
+error_() { echo "$0: $@" 1>&2; Exit 1; }
 framework_failure() { error_ 'failure in testing framework'; }
 
 # Set `groups' to a space-separated list of at least two groups
@@ -271,6 +271,18 @@ working_umask_or_skip_()
   esac
 }
 
+# We use a trap below for cleanup.  This requires us to go through
+# hoops to get the right exit status transported through the signal.
+# So use `Exit STATUS' instead of `exit STATUS' inside of the tests.
+# Turn off errexit here so that we don't trip the bug with OSF1/Tru64
+# sh inside this function.
+Exit ()
+{
+  set +e
+  (exit $1)
+  exit $1
+}
+
 test_dir_=$(pwd)
 
 this_test_() { echo "./$0" | sed 's,.*/,,'; }
@@ -294,7 +306,7 @@ remove_tmp_()
 # Run each test from within a temporary sub-directory named after the
 # test itself, and arrange to remove it upon exception or normal exit.
 trap remove_tmp_ 0
-trap '(exit $?); exit $?' 1 2 13 15
+trap 'Exit $?' 1 2 13 15
 
 cd "$t_" || error_ "failed to cd to $t_"
 
diff --git a/tests/touch/dangling-symlink b/tests/touch/dangling-symlink
index aedb4afb22..add6f63f13 100755
--- a/tests/touch/dangling-symlink
+++ b/tests/touch/dangling-symlink
@@ -51,4 +51,4 @@ when operating on dangling symlinks.
   esac
 fi
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/touch/dir-1 b/tests/touch/dir-1
index 34023072f2..1698ab1ca6 100755
--- a/tests/touch/dir-1
+++ b/tests/touch/dir-1
@@ -11,4 +11,4 @@ fi
 
 fail=0
 touch . || fail=1
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/touch/empty-file b/tests/touch/empty-file
index 0f42ba57e8..9c11990dcc 100755
--- a/tests/touch/empty-file
+++ b/tests/touch/empty-file
@@ -82,4 +82,4 @@ if test $fail != 0; then
 EOF
 fi
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/touch/fail-diag b/tests/touch/fail-diag
index b8889121b0..37814fd4d2 100755
--- a/tests/touch/fail-diag
+++ b/tests/touch/fail-diag
@@ -38,4 +38,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/touch/fifo b/tests/touch/fifo
index 9cd2d0171c..8152717ba7 100755
--- a/tests/touch/fifo
+++ b/tests/touch/fifo
@@ -29,4 +29,4 @@ fail=0
 
 touch fifo || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/touch/no-create-missing b/tests/touch/no-create-missing
index be2d0dbf34..48c81d55d4 100755
--- a/tests/touch/no-create-missing
+++ b/tests/touch/no-create-missing
@@ -41,4 +41,4 @@ if "$test" -w /dev/stdout >/dev/null &&
   touch -ca - >&- 2> /dev/null || fail=1
 fi
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/touch/no-rights b/tests/touch/no-rights
index 7550bae5ee..5a662b3df0 100755
--- a/tests/touch/no-rights
+++ b/tests/touch/no-rights
@@ -42,4 +42,4 @@ test "$*" = "x t1 t2" || fail=1
 # Also test the combination of --no-create and -a.
 touch -a --no-create t1 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/touch/not-owner b/tests/touch/not-owner
index adcdaa87aa..b0ad4ac595 100755
--- a/tests/touch/not-owner
+++ b/tests/touch/not-owner
@@ -54,4 +54,4 @@ test "$match" = 1 || fail=1
 
 test $fail = 1 && diff out exp 2> /dev/null
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/touch/now-owned-by-other b/tests/touch/now-owned-by-other
index 2c1faefef4..123df8458e 100755
--- a/tests/touch/now-owned-by-other
+++ b/tests/touch/now-owned-by-other
@@ -36,4 +36,4 @@ chmod g+x .
 
 setuidgid $NON_ROOT_USERNAME env PATH="$PATH" touch -d now root-owned || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/touch/obsolescent b/tests/touch/obsolescent
index 8b558777ea..a5dcd24b6f 100755
--- a/tests/touch/obsolescent
+++ b/tests/touch/obsolescent
@@ -43,4 +43,4 @@ y2000=0101000000
 rm -f $y2000 file || fail=1
 touch $y2000 file && test -f $y2000 && test -f file || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/touch/read-only b/tests/touch/read-only
index e2338c51c4..8b7ebd18f4 100755
--- a/tests/touch/read-only
+++ b/tests/touch/read-only
@@ -33,4 +33,4 @@ touch read-only || fail=1
 
 touch - 1< read-only 2> /dev/null && { test ! -f - || fail=1; }
 
-(exit $fail); exit $fail
+Exit $fail
diff --git a/tests/touch/relative b/tests/touch/relative
index 7c1396f150..db31b16d04 100755
--- a/tests/touch/relative
+++ b/tests/touch/relative
@@ -40,4 +40,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail