From 112efa81f24ead69a3a9b6ae76f601911535352c Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Wed, 23 Jun 2004 15:07:00 +0000
Subject: [PATCH] Replace all occurrences of `(exit N); exit' with `(exit N);
 exit N'.  Otherwise, those many tests could exit with improper exit status
 when exiting via e.g., a trapped interrupt. Thanks to a report from Bob
 Proulx.

---
 tests/chgrp/basic             | 4 ++--
 tests/chgrp/deref             | 6 +++---
 tests/chgrp/recurse           | 4 ++--
 tests/chmod/c-option          | 4 ++--
 tests/chmod/equal-x           | 4 ++--
 tests/chmod/equals            | 4 ++--
 tests/chmod/setgid            | 4 ++--
 tests/chown/basic             | 4 ++--
 tests/cp/backup-1             | 4 ++--
 tests/cp/backup-is-src        | 4 ++--
 tests/cp/cp-HL                | 2 +-
 tests/cp/cp-mv-backup         | 4 ++--
 tests/cp/cp-parents           | 2 +-
 tests/cp/deref-slink          | 4 ++--
 tests/cp/dir-rm-dest          | 2 +-
 tests/cp/dir-slash            | 2 +-
 tests/cp/dir-vs-file          | 4 ++--
 tests/cp/fail-perm            | 2 +-
 tests/cp/into-self            | 4 ++--
 tests/cp/link                 | 2 +-
 tests/cp/link-preserve        | 4 ++--
 tests/cp/no-deref-link1       | 4 ++--
 tests/cp/no-deref-link2       | 4 ++--
 tests/cp/no-deref-link3       | 4 ++--
 tests/cp/perm                 | 2 +-
 tests/cp/r-vs-symlink         | 4 ++--
 tests/cp/same-file            | 2 +-
 tests/cp/slink-2-slink        | 2 +-
 tests/cp/special-bits         | 2 +-
 tests/cp/symlink-slash        | 2 +-
 tests/dd/not-rewound          | 2 +-
 tests/dd/skip-seek2           | 4 ++--
 tests/du/slink                | 4 ++--
 tests/du/two-args             | 4 ++--
 tests/expensive               | 2 +-
 tests/group-names             | 2 +-
 tests/input-tty               | 2 +-
 tests/install/basic-1         | 2 +-
 tests/ls/dired                | 4 ++--
 tests/ls/follow-slink         | 4 ++--
 tests/ls/infloop              | 4 ++--
 tests/ls/no-arg               | 4 ++--
 tests/ls/recursive            | 4 ++--
 tests/ls/rt-1                 | 4 ++--
 tests/ls/time-1               | 2 +-
 tests/misc/csplit             | 4 ++--
 tests/misc/head-c             | 4 ++--
 tests/misc/head-pos           | 4 ++--
 tests/misc/pathchk1           | 4 ++--
 tests/misc/split-a            | 4 ++--
 tests/mkdir/parents           | 4 ++--
 tests/mkdir/perm              | 4 ++--
 tests/mkdir/t-slash           | 4 ++--
 tests/mv/childproof           | 4 ++--
 tests/mv/dup-source           | 4 ++--
 tests/mv/i-3                  | 4 ++--
 tests/mv/i-link-no            | 4 ++--
 tests/mv/into-self-4          | 4 ++--
 tests/mv/mv-special-1         | 6 +++---
 tests/mv/part-fail            | 6 +++---
 tests/mv/part-hardlink        | 6 +++---
 tests/mv/part-rename          | 6 +++---
 tests/mv/part-symlink         | 4 ++--
 tests/mv/perm-1               | 4 ++--
 tests/mv/trailing-slash       | 2 +-
 tests/mv/update               | 4 ++--
 tests/od/od-N                 | 4 ++--
 tests/priv-check              | 8 ++++----
 tests/rm/dangling-symlink     | 4 ++--
 tests/rm/deep-1               | 2 +-
 tests/rm/f-1                  | 2 +-
 tests/rm/hash                 | 2 +-
 tests/rm/i-1                  | 2 +-
 tests/rm/ir-1                 | 2 +-
 tests/rm/isatty               | 4 ++--
 tests/rm/r-1                  | 4 ++--
 tests/rm/r-2                  | 2 +-
 tests/rm/r-3                  | 4 ++--
 tests/rm/rm1                  | 4 ++--
 tests/rm/rm2                  | 4 ++--
 tests/rm/rm3                  | 4 ++--
 tests/rm/rm4                  | 4 ++--
 tests/rm/rm5                  | 4 ++--
 tests/rm/sunos-1              | 4 ++--
 tests/rm/unread2              | 4 ++--
 tests/setgid-check            | 2 +-
 tests/shred/exact             | 4 ++--
 tests/sum/sysv                | 4 ++--
 tests/tail-2/proc-ksyms       | 2 +-
 tests/tail-2/start-middle     | 4 ++--
 tests/touch/fail-diag         | 4 ++--
 tests/touch/no-create-missing | 4 ++--
 tests/touch/not-owner         | 2 +-
 tests/touch/obsolescent       | 4 ++--
 94 files changed, 168 insertions(+), 168 deletions(-)

diff --git a/tests/chgrp/basic b/tests/chgrp/basic
index 6d717fc84d..b0967aae13 100755
--- a/tests/chgrp/basic
+++ b/tests/chgrp/basic
@@ -21,7 +21,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -110,4 +110,4 @@ EOF
 cmp expected actual \
   || { diff expected actual 1>&2; fail=1; }
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/chgrp/deref b/tests/chgrp/deref
index 2b947ae14c..5e605bfa6a 100755
--- a/tests/chgrp/deref
+++ b/tests/chgrp/deref
@@ -19,7 +19,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 set _ $groups; shift
@@ -37,7 +37,7 @@ test "$g" = $g2 || {
 $0: skipping this test; your system doesn't support changing
 the owner or group of a symbolic link.
 EOF
-  (exit 77); exit
+  (exit 77); exit 77
 }
 
 fail=0
@@ -64,4 +64,4 @@ chgrp --dereference $g1 symlink
 set _ `ls -l f`; g=$5; test "$g" = $g1 || fail=1
 set _ `ls -l symlink`; g=$5; test "$g" = $g2 || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/chgrp/recurse b/tests/chgrp/recurse
index 0bd648290c..05aaa08d4a 100755
--- a/tests/chgrp/recurse
+++ b/tests/chgrp/recurse
@@ -19,7 +19,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 set _ $groups; shift
@@ -53,4 +53,4 @@ set _ `ls -l e/ee`; g=$5; test "$g" = $g2 || fail=1
 # But it *should* change d/dd.
 set _ `ls -l d/dd`; g=$5; test "$g" = $g1 || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/chmod/c-option b/tests/chmod/c-option
index 36feb6d2be..167f5bb3a5 100755
--- a/tests/chmod/c-option
+++ b/tests/chmod/c-option
@@ -30,7 +30,7 @@ chmod 444 $file || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework'
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 . $abs_srcdir/../setgid-check
@@ -47,4 +47,4 @@ case "`cat out`" in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/chmod/equal-x b/tests/chmod/equal-x
index 1b1af8aeaa..76030e794b 100755
--- a/tests/chmod/equal-x
+++ b/tests/chmod/equal-x
@@ -20,7 +20,7 @@ chmod 444 $file || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework'
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 umask 005
@@ -30,4 +30,4 @@ case "`ls -l $file`" in
   *) fail=1; ls -l $file ;;
 esac
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/chmod/equals b/tests/chmod/equals
index 2f833bea3a..95a1e65870 100755
--- a/tests/chmod/equals
+++ b/tests/chmod/equals
@@ -19,7 +19,7 @@ touch f || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -38,4 +38,4 @@ for src in u g o; do
   done
 done
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/chmod/setgid b/tests/chmod/setgid
index b7f9ad14c5..bd9c154fd0 100755
--- a/tests/chmod/setgid
+++ b/tests/chmod/setgid
@@ -47,7 +47,7 @@ chmod g+s d 2> /dev/null ||
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -70,4 +70,4 @@ chmod 755 d
 # For now, this test simply confirms the existing behavior.
 p=`ls -ld d|sed 's/ .*//'`; case $p in drwxr-xr-x);; *) fail=1;; esac
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/chown/basic b/tests/chown/basic
index db270ea94c..908ef119c3 100755
--- a/tests/chown/basic
+++ b/tests/chown/basic
@@ -22,7 +22,7 @@ touch f || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -36,4 +36,4 @@ chown --from=0:1 2:3 f || fail=1
 # And now they should be 2 and 3 respectively.
 set _ `ls -n f`; shift; test "$3:$4" = 2:3 || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/backup-1 b/tests/cp/backup-1
index 29e36e58cc..b17e61af8f 100755
--- a/tests/cp/backup-1
+++ b/tests/cp/backup-1
@@ -16,7 +16,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 suffix=.b
@@ -37,4 +37,4 @@ test -f $file || fail=1
 test -f $file_backup || fail=1
 cmp $file $file_backup > /dev/null || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/backup-is-src b/tests/cp/backup-is-src
index 4f25e81b16..7d4c47d643 100755
--- a/tests/cp/backup-is-src
+++ b/tests/cp/backup-is-src
@@ -22,7 +22,7 @@ echo a-tilde > a~ || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 # This cp command should exit nonzero.
@@ -36,4 +36,4 @@ EOF
 
 cmp out2 exp || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/cp-HL b/tests/cp/cp-HL
index 239ecebcb9..afe2369366 100755
--- a/tests/cp/cp-HL
+++ b/tests/cp/cp-HL
@@ -41,4 +41,4 @@ cat dest-dir/src-dir/slink > /dev/null 2>&1 && fail=1
 
 # FIXME: test -L, too.
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/cp-mv-backup b/tests/cp/cp-mv-backup
index f8186df46c..d90b87cc9a 100755
--- a/tests/cp/cp-mv-backup
+++ b/tests/cp/cp-mv-backup
@@ -28,7 +28,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 actual=actual
@@ -97,4 +97,4 @@ cmp $expected $actual || fail=1
 # Uncomment this if you see a failure and want to try to diagnose it.
 test $fail = 1 && diff -c $expected $actual 1>&2
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/cp-parents b/tests/cp/cp-parents
index 7c693cf16b..8f5182213b 100755
--- a/tests/cp/cp-parents
+++ b/tests/cp/cp-parents
@@ -54,4 +54,4 @@ p=`ls -ld e/d|sed 's/ .*//'`; case $p in drwxr-xr-x);; *) fail=1;; esac
 p=`ls -ld e/d/a|sed 's/ .*//'`; case $p in drwx-w--w-);; *) fail=1;; esac
 p=`ls -ld e/d/a/b/c|sed 's/ .*//'`; case $p in drwxr-xr-x);; *) fail=1;; esac
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/deref-slink b/tests/cp/deref-slink
index 99181e5b98..641406fa44 100755
--- a/tests/cp/deref-slink
+++ b/tests/cp/deref-slink
@@ -23,10 +23,10 @@ ln -s slink-target slink || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
 cp -d f slink || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/dir-rm-dest b/tests/cp/dir-rm-dest
index b602f2f178..c6c8229e53 100755
--- a/tests/cp/dir-rm-dest
+++ b/tests/cp/dir-rm-dest
@@ -29,4 +29,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
+(exit $fail); exit $fail
diff --git a/tests/cp/dir-slash b/tests/cp/dir-slash
index bdaa12042f..2fc10b2306 100755
--- a/tests/cp/dir-slash
+++ b/tests/cp/dir-slash
@@ -34,4 +34,4 @@ test -r dir2/file && fail=1
 test -r dir2/dir1/file || fail=1
 test -r dir1/file || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/dir-vs-file b/tests/cp/dir-vs-file
index 9ac6bd0d69..b024c213a8 100755
--- a/tests/cp/dir-vs-file
+++ b/tests/cp/dir-vs-file
@@ -22,7 +22,7 @@ touch file || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -34,4 +34,4 @@ cp -R dir file 2>/dev/null && fail=1
 # In 4.0.35, it was.
 test -f file || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/fail-perm b/tests/cp/fail-perm
index 9ba355a19d..c2b18801b2 100755
--- a/tests/cp/fail-perm
+++ b/tests/cp/fail-perm
@@ -38,4 +38,4 @@ shift
 test "$1" = dr-x------ || fail=1
 chmod 700 D
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/into-self b/tests/cp/into-self
index 0ca8bb92a4..9a6a528511 100755
--- a/tests/cp/into-self
+++ b/tests/cp/into-self
@@ -26,7 +26,7 @@ mkdir dir || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -42,4 +42,4 @@ EOF
 cmp out exp || fail=1
 test $fail = 1 && diff out exp 2> /dev/null
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/link b/tests/cp/link
index be8d2acea1..84902ba06f 100755
--- a/tests/cp/link
+++ b/tests/cp/link
@@ -30,4 +30,4 @@ fail=0
 cp -f --link src dest || fail=1
 cp -f --symbolic-link src dest2 || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/link-preserve b/tests/cp/link-preserve
index bb1dda6d65..6db88249c2 100755
--- a/tests/cp/link-preserve
+++ b/tests/cp/link-preserve
@@ -27,7 +27,7 @@ test -f c/b || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -86,4 +86,4 @@ test "$mode" = "-rwx------" || fail=1
 umask 022
 # --------------------------------------
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/no-deref-link1 b/tests/cp/no-deref-link1
index 780ad20b75..a7df22c26e 100755
--- a/tests/cp/no-deref-link1
+++ b/tests/cp/no-deref-link1
@@ -18,7 +18,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 mkdir a b
@@ -39,4 +39,4 @@ test $? = 1 || fail=1
 
 test "`cat a/foo`" = $msg || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/no-deref-link2 b/tests/cp/no-deref-link2
index 21f2867ba8..ff0d0692a9 100755
--- a/tests/cp/no-deref-link2
+++ b/tests/cp/no-deref-link2
@@ -18,7 +18,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 mkdir b
@@ -39,4 +39,4 @@ test $? = 1 || fail=1
 
 test "`cat a`" = $msg || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/no-deref-link3 b/tests/cp/no-deref-link3
index c71691726e..d60d9630b4 100755
--- a/tests/cp/no-deref-link3
+++ b/tests/cp/no-deref-link3
@@ -18,7 +18,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 msg=bar
@@ -36,4 +36,4 @@ test $? = 1 || fail=1
 
 test "`cat a`" = $msg || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/perm b/tests/cp/perm
index cb295c17e8..e39b8d6b03 100755
--- a/tests/cp/perm
+++ b/tests/cp/perm
@@ -78,4 +78,4 @@ for u in 31 37 2; do
   done
 done
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/r-vs-symlink b/tests/cp/r-vs-symlink
index 22ea7caf62..da50602ad9 100755
--- a/tests/cp/r-vs-symlink
+++ b/tests/cp/r-vs-symlink
@@ -25,7 +25,7 @@ ln -s no-such-file no-file || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -40,4 +40,4 @@ case $mode in
   *) fail=1;;
 esac
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/same-file b/tests/cp/same-file
index de5cf61ca5..47db0cd154 100755
--- a/tests/cp/same-file
+++ b/tests/cp/same-file
@@ -191,4 +191,4 @@ fail=0;
 cmp $expected $actual \
   || { diff -c $expected $actual 1>&2; fail=1; }
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/slink-2-slink b/tests/cp/slink-2-slink
index 837edd512f..3e540fe6b6 100755
--- a/tests/cp/slink-2-slink
+++ b/tests/cp/slink-2-slink
@@ -36,4 +36,4 @@ fail=0
 cp --update --no-dereference a b || fail=1
 cp --update --no-dereference c d || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/special-bits b/tests/cp/special-bits
index 5b31fda0d2..007ce938cb 100755
--- a/tests/cp/special-bits
+++ b/tests/cp/special-bits
@@ -42,4 +42,4 @@ set _ `ls -l b`; shift; p1=$1
 set _ `ls -l b2`; shift; p2=$1
 test $p1 = $p2 || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/cp/symlink-slash b/tests/cp/symlink-slash
index 827888c684..3ef527d495 100755
--- a/tests/cp/symlink-slash
+++ b/tests/cp/symlink-slash
@@ -37,4 +37,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
+(exit $fail); exit $fail
diff --git a/tests/dd/not-rewound b/tests/dd/not-rewound
index 814d038153..42780863b0 100755
--- a/tests/dd/not-rewound
+++ b/tests/dd/not-rewound
@@ -30,4 +30,4 @@ case `cat out` in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/dd/skip-seek2 b/tests/dd/skip-seek2
index e5da57ca67..fdaf68dc28 100755
--- a/tests/dd/skip-seek2
+++ b/tests/dd/skip-seek2
@@ -18,7 +18,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework'
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -37,4 +37,4 @@ case `cat out` in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/du/slink b/tests/du/slink
index 787f811abb..4625aa0538 100755
--- a/tests/du/slink
+++ b/tests/du/slink
@@ -23,7 +23,7 @@ if test -s tmp; then
   : # Ok.
 else
   echo "$0: skipping this test, since \`.' is on a non-local file system" 1>&2
-  (exit 77); exit
+  (exit 77); exit 77
 fi
 
 df --type=xfs . | tail -n +2 > tmp
@@ -31,7 +31,7 @@ if test -s tmp; then
   # At least on Irix-6.5.19, when using an xfs file system,
   # each created symlink (name lengths up to 255) would have a size of `0'.
   echo "$0: skipping this test, since \`.' is on an XFS file system" 1>&2
-  (exit 77); exit
+  (exit 77); exit 77
 fi
 
 if test $framework_failure = 1; then
diff --git a/tests/du/two-args b/tests/du/two-args
index 27c78968e5..5e9649933b 100755
--- a/tests/du/two-args
+++ b/tests/du/two-args
@@ -18,7 +18,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework'
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 mkdir -p $tmp/1 $tmp/2
@@ -31,4 +31,4 @@ du $tmp/1 $tmp/2 > /dev/null || fail=1
 du . $tmp > /dev/null || fail=1
 du .. $tmp > /dev/null || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/expensive b/tests/expensive
index aaa69ec17f..d1bbc5a70f 100644
--- a/tests/expensive
+++ b/tests/expensive
@@ -7,5 +7,5 @@ environment variable set to yes.  E.g.,
   env RUN_EXPENSIVE_TESTS=yes make check
 
 EOF
-  (exit 77); exit
+  (exit 77); exit 77
 fi
diff --git a/tests/group-names b/tests/group-names
index 94a7f79e26..5dae7943a3 100644
--- a/tests/group-names
+++ b/tests/group-names
@@ -14,6 +14,6 @@ set in your environment to the space-separated list of names.  E.g.,
   env FETISH_GROUPS='users cdrom' make check
 
 EOF
-     (exit 77); exit
+     (exit 77); exit 77
      ;;
 esac
diff --git a/tests/input-tty b/tests/input-tty
index 95a3c37ca5..7df151523f 100644
--- a/tests/input-tty
+++ b/tests/input-tty
@@ -6,5 +6,5 @@ if test "$have_input_tty" = no; then
   echo "$0: This test must have a controlling input \`terminal'," 1>&2
   echo "  so it may not be run via \`batch', \`at', or \`rsh'." 1>&2
   echo "  On some systems, it may not even be run in the background." 1>&2
-  (exit 77; exit); exit
+  (exit 77); exit 77
 fi
diff --git a/tests/install/basic-1 b/tests/install/basic-1
index 4262f0e909..484bf2a28f 100755
--- a/tests/install/basic-1
+++ b/tests/install/basic-1
@@ -58,4 +58,4 @@ set X `ls -l $dir/dd`
 shift
 test "$1" = -r-xr-xr-x || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/ls/dired b/tests/ls/dired
index 82f90fe043..8126e0a45a 100755
--- a/tests/ls/dired
+++ b/tests/ls/dired
@@ -20,7 +20,7 @@ mkdir dir || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -36,4 +36,4 @@ EOF
 cmp out exp || fail=1
 test $fail = 1 && diff out exp 2> /dev/null
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/ls/follow-slink b/tests/ls/follow-slink
index 05d5227181..ede278ee56 100755
--- a/tests/ls/follow-slink
+++ b/tests/ls/follow-slink
@@ -23,11 +23,11 @@ ls -F link > /dev/null || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework'
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
 
 ls -L link 2> /dev/null && fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/ls/infloop b/tests/ls/infloop
index 1842c5bc4b..9e2ad79fcf 100755
--- a/tests/ls/infloop
+++ b/tests/ls/infloop
@@ -22,7 +22,7 @@ ln -s ../loop loop/sub || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -41,4 +41,4 @@ EOF
 
 cmp out bad 2>/dev/null && fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/ls/no-arg b/tests/ls/no-arg
index f36bb0edf8..46fa6d901b 100755
--- a/tests/ls/no-arg
+++ b/tests/ls/no-arg
@@ -27,7 +27,7 @@ EOF
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework'
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -56,4 +56,4 @@ ls -R1 > out || fail=1
 cmp out exp || fail=1
 test $fail = 1 && diff out exp 2> /dev/null
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/ls/recursive b/tests/ls/recursive
index 3b4cb72552..455db181a3 100755
--- a/tests/ls/recursive
+++ b/tests/ls/recursive
@@ -23,7 +23,7 @@ touch f a/1/I a/1/II || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -65,4 +65,4 @@ EOF
 cmp out exp || fail=1
 test $fail = 1 && diff out exp 2> /dev/null
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/ls/rt-1 b/tests/ls/rt-1
index 66aa3ca0b1..3d89a7b9f6 100755
--- a/tests/ls/rt-1
+++ b/tests/ls/rt-1
@@ -27,7 +27,7 @@ touch -d "$date" b || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -51,4 +51,4 @@ EOF
 cmp out exp || fail=1
 test $fail = 1 && diff out exp 2> /dev/null
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/ls/time-1 b/tests/ls/time-1
index 5c4deb30b2..1d50033cae 100755
--- a/tests/ls/time-1
+++ b/tests/ls/time-1
@@ -85,7 +85,7 @@ In the output below, the date of last access for \`a' should
 have been $u1.
 EOF
   ls --full -lu a
-  (exit 77); exit
+  (exit 77); exit 77
   ;;
 esac
 
diff --git a/tests/misc/csplit b/tests/misc/csplit
index 2d04fee7f6..5ea8a6aef0 100755
--- a/tests/misc/csplit
+++ b/tests/misc/csplit
@@ -19,7 +19,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -86,4 +86,4 @@ EOF
 cmp err experr || fail=1
 test $fail = 1 && diff err experr 2> /dev/null
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/misc/head-c b/tests/misc/head-c
index 14f2a2f09b..bd899aff4b 100755
--- a/tests/misc/head-c
+++ b/tests/misc/head-c
@@ -18,7 +18,7 @@ echo abc > in || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -29,4 +29,4 @@ case "`cat out`" in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/misc/head-pos b/tests/misc/head-pos
index 403dde627d..a8791f2e95 100755
--- a/tests/misc/head-pos
+++ b/tests/misc/head-pos
@@ -19,7 +19,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -31,4 +31,4 @@ EOF
 cmp out exp || fail=1
 test $fail = 1 && diff out exp 2> /dev/null
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/misc/pathchk1 b/tests/misc/pathchk1
index ecc131f4ae..5735b4e676 100755
--- a/tests/misc/pathchk1
+++ b/tests/misc/pathchk1
@@ -20,7 +20,7 @@ touch file || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -29,4 +29,4 @@ fail=0
 # but exited successfully.
 pathchk file/x > /dev/null 2>&1 && fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/misc/split-a b/tests/misc/split-a
index c35cf35e03..a9940b71f9 100755
--- a/tests/misc/split-a
+++ b/tests/misc/split-a
@@ -17,7 +17,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -74,4 +74,4 @@ EOF
 cmp err exp || fail=1
 test $fail = 1 && diff err exp 2> /dev/null
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/mkdir/parents b/tests/mkdir/parents
index cf0e97d4ab..7c37fa9665 100755
--- a/tests/mkdir/parents
+++ b/tests/mkdir/parents
@@ -24,7 +24,7 @@ mkdir -m 700 e-dir || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework'
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 . $abs_srcdir/../setgid-check
@@ -56,4 +56,4 @@ p=`ls -ld a/b/c|sed 's/ .*//'`; case $p in drwx------);; *) fail=1;; esac
 # `d's perms are determined by the -m argument.
 p=`ls -ld a/b/c/d|sed 's/ .*//'`; case $p in $d_mode_str);; *) fail=1;; esac
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/mkdir/perm b/tests/mkdir/perm
index 71998f711f..56c9fcfa5d 100755
--- a/tests/mkdir/perm
+++ b/tests/mkdir/perm
@@ -24,7 +24,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework'
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 . $abs_srcdir/../setgid-check
@@ -83,4 +83,4 @@ for p in empty -p; do
   done
 done
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/mkdir/t-slash b/tests/mkdir/t-slash
index 2383946913..b96bf67dda 100755
--- a/tests/mkdir/t-slash
+++ b/tests/mkdir/t-slash
@@ -18,7 +18,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework'
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -30,4 +30,4 @@ test -d dir || fail=1
 mkdir d2/ || fail=1
 test -d d2 || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/mv/childproof b/tests/mv/childproof
index bdb2215c02..c1e339ac22 100755
--- a/tests/mv/childproof
+++ b/tests/mv/childproof
@@ -26,7 +26,7 @@ echo b > b/f || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -72,4 +72,4 @@ test -f b/g && fail=1  # b/g should have been moved
 test -f c/f || fail=1
 test -f c/g || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/mv/dup-source b/tests/mv/dup-source
index 4028538283..ad2b7eb3f4 100755
--- a/tests/mv/dup-source
+++ b/tests/mv/dup-source
@@ -25,7 +25,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -70,4 +70,4 @@ EOF
   test $fail = 1 && diff out exp 2> /dev/null
 done
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/mv/i-3 b/tests/mv/i-3
index 40704708ac..68207a0bf3 100755
--- a/tests/mv/i-3
+++ b/tests/mv/i-3
@@ -24,7 +24,7 @@ chmod 0 g i || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -52,4 +52,4 @@ case "`cat out`" in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/mv/i-link-no b/tests/mv/i-link-no
index ed72164abe..ab93d9214b 100755
--- a/tests/mv/i-link-no
+++ b/tests/mv/i-link-no
@@ -26,7 +26,7 @@ chmod a-w b/bar || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -49,4 +49,4 @@ case "`cat b/foo`" in
   *) fail=1;;
 esac
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/mv/into-self-4 b/tests/mv/into-self-4
index f0e1de668e..6aaf35d86e 100755
--- a/tests/mv/into-self-4
+++ b/tests/mv/into-self-4
@@ -22,7 +22,7 @@ ln -s file s || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -34,4 +34,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
+(exit $fail); exit $fail
diff --git a/tests/mv/mv-special-1 b/tests/mv/mv-special-1
index 9a860cc226..f7cf403284 100755
--- a/tests/mv/mv-special-1
+++ b/tests/mv/mv-special-1
@@ -16,7 +16,7 @@ trap '(exit $?); exit' 1 2 13 15
 . $srcdir/../lang-default
 
 if test -z "$other_partition_tmpdir"; then
-  (exit 77); exit
+  (exit 77); exit 77
 fi
 
 null=mv-null
@@ -37,7 +37,7 @@ if test $framework_failure = 1; then
   # exit 77 here to indicate that we couldn't run the test.
   # At least running on SunOS 4.1.4, using a directory NFS mounted
   # from an OpenBSD system, the above mknod fails.
-  (exit 77); exit
+  (exit 77); exit 77
 fi
 
 fail=0
@@ -80,4 +80,4 @@ cmp out2 exp || fail=1
 # cd $other_partition_tmpdir
 # ls -l -A -R $other_partition_tmpdir
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/mv/part-fail b/tests/mv/part-fail
index 09d29df507..326d5bc1f4 100755
--- a/tests/mv/part-fail
+++ b/tests/mv/part-fail
@@ -20,7 +20,7 @@ trap 'status=$?; cd $pwd; chmod -R u+rwx $t0; rm -rf $t0 && exit $status' 0
 trap '(exit $?); exit' 1 2 13 15
 
 if test -z "$other_partition_tmpdir"; then
-  (exit 77); exit
+  (exit 77); exit 77
 fi
 t0="$t0 $other_partition_tmpdir"
 
@@ -32,7 +32,7 @@ chmod u-w $other_partition_tmpdir || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -59,4 +59,4 @@ else
 fi
 test $fail = 1 && diff out exp 2> /dev/null
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/mv/part-hardlink b/tests/mv/part-hardlink
index 133fd93543..a6d0654b15 100755
--- a/tests/mv/part-hardlink
+++ b/tests/mv/part-hardlink
@@ -18,7 +18,7 @@ trap 'status=$?; cd $pwd; chmod -R u+rwx $t0; rm -rf $t0 && exit $status' 0
 trap '(exit $?); exit' 1 2 13 15
 
 if test -z "$other_partition_tmpdir"; then
-  (exit 77); exit
+  (exit 77); exit 77
 fi
 t0="$t0 $other_partition_tmpdir"
 
@@ -33,7 +33,7 @@ ln a/1 b/1 || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -47,4 +47,4 @@ test $1 = $3 || fail=1
 set - `ls -Ci a/1 b/1`
 test $1 = $3 || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/mv/part-rename b/tests/mv/part-rename
index e908c55c81..f8a142589e 100755
--- a/tests/mv/part-rename
+++ b/tests/mv/part-rename
@@ -17,7 +17,7 @@ trap 'status=$?; cd $pwd; chmod -R u+rwx $t0; rm -rf $t0 && exit $status' 0
 trap '(exit $?); exit' 1 2 13 15
 
 if test -z "$other_partition_tmpdir"; then
-  (exit 77); exit
+  (exit 77); exit 77
 fi
 t0="$t0 $other_partition_tmpdir"
 
@@ -28,11 +28,11 @@ mkdir foo || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
 
 mv foo/ $other_partition_tmpdir/bar || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/mv/part-symlink b/tests/mv/part-symlink
index e009b84492..b7dbfe67f1 100755
--- a/tests/mv/part-symlink
+++ b/tests/mv/part-symlink
@@ -25,7 +25,7 @@ pwd_tmp=$pwd/$tmp
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test -z "$other_partition_tmpdir"; then
-  (exit 77); exit
+  (exit 77); exit 77
 fi
 
 framework_failure=0
@@ -209,4 +209,4 @@ EOF
 cmp $expected $actual \
   || { diff -c $expected $actual 1>&2; fail=1; }
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/mv/perm-1 b/tests/mv/perm-1
index 4f00690b87..d7afc5f4c6 100755
--- a/tests/mv/perm-1
+++ b/tests/mv/perm-1
@@ -24,7 +24,7 @@ chmod u-w no-write || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -37,4 +37,4 @@ EOF
 cmp out exp || fail=1
 test $fail = 1 && diff out exp 2> /dev/null
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/mv/trailing-slash b/tests/mv/trailing-slash
index 8658e17e7c..a81d178a86 100755
--- a/tests/mv/trailing-slash
+++ b/tests/mv/trailing-slash
@@ -28,4 +28,4 @@ fail=0
 
 mv foo/ bar || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/mv/update b/tests/mv/update
index 74cd3a21e4..ba6f8276cb 100755
--- a/tests/mv/update
+++ b/tests/mv/update
@@ -24,7 +24,7 @@ echo new > new || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -51,4 +51,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
+(exit $fail); exit $fail
diff --git a/tests/od/od-N b/tests/od/od-N
index b82d2c12b0..98be066538 100755
--- a/tests/od/od-N
+++ b/tests/od/od-N
@@ -23,7 +23,7 @@ echo abcdefg > in || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -38,4 +38,4 @@ cmp out exp || {
   diff out exp 2> /dev/null
   }
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/priv-check b/tests/priv-check
index 829a2cf376..6de80fe50e 100644
--- a/tests/priv-check
+++ b/tests/priv-check
@@ -13,14 +13,14 @@ esac
 my_uid=`id -u`
 test $? = 0 || {
   echo "$0: cannot run \`id -u'" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 }
 
 # Make sure it gives valid output.
 case $my_uid in
   *[!0-9]*)
     echo "$0: invalid output (\`$my_uid') from \`id -u'" 1>&2
-    (exit 1); exit
+    (exit 1); exit 1
     ;;
   *) ;;
 esac
@@ -58,7 +58,7 @@ case $PRIV_CHECK_ARG:$my_uid in
       {
 	echo "$0: `pwd`: not writable by user \`$NON_ROOT_USERNAME'" 1>&2
 	echo "$0: skipping this test" 1>&2
-	(exit 77); exit
+	(exit 77); exit 77
       }
     exec setuidgid $NON_ROOT_USERNAME env PATH="$PATH" $0
     ;;
@@ -73,5 +73,5 @@ $0: This test is being skipped, since it works only
 when run $who.
 ***************************
 EOF
-  (exit 77); exit
+  (exit 77); exit 77
 }
diff --git a/tests/rm/dangling-symlink b/tests/rm/dangling-symlink
index 35ad93010c..1b1968a859 100755
--- a/tests/rm/dangling-symlink
+++ b/tests/rm/dangling-symlink
@@ -22,7 +22,7 @@ ln -s / symlink
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -40,4 +40,4 @@ ls -l symlink > /dev/null 2>&1 && fail=1
 
 kill $pid > /dev/null 2>&1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/rm/deep-1 b/tests/rm/deep-1
index e995c54c54..b1cb5928d4 100755
--- a/tests/rm/deep-1
+++ b/tests/rm/deep-1
@@ -41,4 +41,4 @@ rm -r $tmp || fail=1
 # Make sure all of $tmp was deleted.
 test -d $tmp && fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/rm/f-1 b/tests/rm/f-1
index fef5f90ced..5c339a0d28 100755
--- a/tests/rm/f-1
+++ b/tests/rm/f-1
@@ -23,4 +23,4 @@ fi
 fail=0
 rm -f $tmp/no-such-file || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/rm/hash b/tests/rm/hash
index f5cc14bd39..8e7f8ce86f 100755
--- a/tests/rm/hash
+++ b/tests/rm/hash
@@ -37,4 +37,4 @@ fail=0
 
 rm -r t || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/rm/i-1 b/tests/rm/i-1
index 4bf48e3261..7d3ac1e1b3 100755
--- a/tests/rm/i-1
+++ b/tests/rm/i-1
@@ -36,4 +36,4 @@ test -f $tmp/a && fail=1
 
 rm -rf $tmp
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/rm/ir-1 b/tests/rm/ir-1
index c5d76cde75..e99c758957 100755
--- a/tests/rm/ir-1
+++ b/tests/rm/ir-1
@@ -54,4 +54,4 @@ esac
 
 rm -rf $tmp $test.I
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/rm/isatty b/tests/rm/isatty
index 31fd0f4957..8916e6ac15 100755
--- a/tests/rm/isatty
+++ b/tests/rm/isatty
@@ -20,7 +20,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -56,4 +56,4 @@ echo x >> out
 cmp out exp || fail=1
 test $fail = 1 && diff out exp 2> /dev/null
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/rm/r-1 b/tests/rm/r-1
index 91560c8cee..30d37b8722 100755
--- a/tests/rm/r-1
+++ b/tests/rm/r-1
@@ -29,7 +29,7 @@ EOF
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -45,4 +45,4 @@ done
 cmp $test.E $test.O || fail=1
 test $fail = 1 && diff $test.E $test.O 2> /dev/null
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/rm/r-2 b/tests/rm/r-2
index 724c459ebb..1273664711 100755
--- a/tests/rm/r-2
+++ b/tests/rm/r-2
@@ -46,4 +46,4 @@ fi
 cmp t/E t/O || fail=1
 test $fail = 1 && diff t/E t/O 2> /dev/null
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/rm/r-3 b/tests/rm/r-3
index a946df93fd..debc80228e 100755
--- a/tests/rm/r-3
+++ b/tests/rm/r-3
@@ -35,11 +35,11 @@ cd $pwd || framework_fail=1
 
 if test $framework_fail = 1; then
   echo 'failure in testing framework'
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
 rm -rf $tmp || fail=1
 test -d $tmp && fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/rm/rm1 b/tests/rm/rm1
index 998a30673a..397f4e8653 100755
--- a/tests/rm/rm1
+++ b/tests/rm/rm1
@@ -23,7 +23,7 @@ chmod u-w b/a || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -49,4 +49,4 @@ test -d b/a/p || fail=1
 test -d b/c && fail=1
 test -d b/d && fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/rm/rm2 b/tests/rm/rm2
index f9622e0d2d..ce46807052 100755
--- a/tests/rm/rm2
+++ b/tests/rm/rm2
@@ -23,7 +23,7 @@ chmod u-x a/1 b || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -44,4 +44,4 @@ test -d a/1 || fail=1
 chmod u+x b
 test -d b/3 || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/rm/rm3 b/tests/rm/rm3
index 98b7ff9bf2..f27fd6cf5e 100755
--- a/tests/rm/rm3
+++ b/tests/rm/rm3
@@ -30,7 +30,7 @@ cd ..
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -75,4 +75,4 @@ test $fail = 1 && diff -u out exp 2> /dev/null
 
 test -d z && fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/rm/rm4 b/tests/rm/rm4
index 289f3e7ab9..28af0d9d9f 100755
--- a/tests/rm/rm4
+++ b/tests/rm/rm4
@@ -22,7 +22,7 @@ mkdir dir || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -32,4 +32,4 @@ rm dir > /dev/null 2>&1 && fail=1
 
 test -d dir || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/rm/rm5 b/tests/rm/rm5
index a1f3231af7..7868e903ab 100755
--- a/tests/rm/rm5
+++ b/tests/rm/rm5
@@ -33,7 +33,7 @@ EOF
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -54,4 +54,4 @@ test -d d && fail=1
 cmp out exp || fail=1
 test $fail = 1 && diff -u out exp 2> /dev/null
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/rm/sunos-1 b/tests/rm/sunos-1
index c5f10fd454..c54a6db5d4 100755
--- a/tests/rm/sunos-1
+++ b/tests/rm/sunos-1
@@ -20,10 +20,10 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
 rm -r '' > /dev/null 2>&1 && fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/rm/unread2 b/tests/rm/unread2
index e9be46e856..f7acf05dba 100755
--- a/tests/rm/unread2
+++ b/tests/rm/unread2
@@ -23,7 +23,7 @@ chmod u-r a
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -37,4 +37,4 @@ EOF
 cmp out exp || fail=1
 test $fail = 1 && diff out exp 2> /dev/null
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/setgid-check b/tests/setgid-check
index 2b6936c974..7c82fd51fe 100644
--- a/tests/setgid-check
+++ b/tests/setgid-check
@@ -21,5 +21,5 @@ if test $cwd_is_setgid = yes; then
 $0: Since it looks like you're running this test in a directory with
 the setgid bit set, we're skipping this test.
 EOF
-  (exit 77); exit
+  (exit 77); exit 77
 fi
diff --git a/tests/shred/exact b/tests/shred/exact
index 2c978e1e9e..6ed1ca5dbf 100755
--- a/tests/shred/exact
+++ b/tests/shred/exact
@@ -17,7 +17,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework'
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -35,4 +35,4 @@ for opt in --exact --zero; do
   test -f c && fail=1
 done
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/sum/sysv b/tests/sum/sysv
index cda557018f..4c90142459 100755
--- a/tests/sum/sysv
+++ b/tests/sum/sysv
@@ -29,7 +29,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -56,4 +56,4 @@ EOF
 cmp out exp || fail=1
 test $fail = 1 && diff out exp 2> /dev/null
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/tail-2/proc-ksyms b/tests/tail-2/proc-ksyms
index a3d47f030a..52e2a6fc3a 100755
--- a/tests/tail-2/proc-ksyms
+++ b/tests/tail-2/proc-ksyms
@@ -18,4 +18,4 @@ if test -f $ksyms; then
   tail $ksyms > /dev/null || fail=1
 fi
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/tail-2/start-middle b/tests/tail-2/start-middle
index 143c4538ad..4dbe18900f 100755
--- a/tests/tail-2/start-middle
+++ b/tests/tail-2/start-middle
@@ -20,7 +20,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -33,4 +33,4 @@ EOF
 cmp out exp || fail=1
 test $fail = 1 && diff out exp 2> /dev/null
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/touch/fail-diag b/tests/touch/fail-diag
index f050f57987..f6dba8ee31 100755
--- a/tests/touch/fail-diag
+++ b/tests/touch/fail-diag
@@ -26,7 +26,7 @@ ls -d $d1 2> /dev/null && framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -39,4 +39,4 @@ EOF
 cmp out exp || fail=1
 test $fail = 1 && diff out exp 2> /dev/null
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/touch/no-create-missing b/tests/touch/no-create-missing
index 24745fa2d6..d752574206 100755
--- a/tests/touch/no-create-missing
+++ b/tests/touch/no-create-missing
@@ -17,7 +17,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -26,4 +26,4 @@ touch -c no-file > /dev/null 2>&1 || fail=1
 touch -cm no-file > /dev/null 2>&1 || fail=1
 touch -ca no-file > /dev/null 2>&1 || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/touch/not-owner b/tests/touch/not-owner
index b053c06d74..49af6941b5 100755
--- a/tests/touch/not-owner
+++ b/tests/touch/not-owner
@@ -45,4 +45,4 @@ test "$match" = 1 || fail=1
 
 test $fail = 1 && diff out exp 2> /dev/null
 
-(exit $fail); exit
+(exit $fail); exit $fail
diff --git a/tests/touch/obsolescent b/tests/touch/obsolescent
index 31f32658ef..b7242ed20e 100755
--- a/tests/touch/obsolescent
+++ b/tests/touch/obsolescent
@@ -17,7 +17,7 @@ cd $tmp || framework_failure=1
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework'
-  (exit 1); exit
+  (exit 1); exit 1
 fi
 
 fail=0
@@ -27,4 +27,4 @@ for ones in 11111111 1111111111; do
   test -f $ones || fail=1
 done
 
-(exit $fail); exit
+(exit $fail); exit $fail
-- 
2.47.2