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

@@ -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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

tests/cp/perm

@@ -78,4 +78,4 @@ for u in 31 37 2; do
   done
 done
 
-(exit $fail); exit
+(exit $fail); exit $fail

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

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

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

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

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

tests/dd/not-rewound

@@ -30,4 +30,4 @@ case `cat out` in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit
+(exit $fail); exit $fail

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

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

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

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

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

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

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

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

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

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

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

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

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

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
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

tests/mv/trailing-slash

@@ -28,4 +28,4 @@ fail=0
 
 mv foo/ bar || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail

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

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

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
 }

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

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

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

tests/rm/hash

@@ -37,4 +37,4 @@ fail=0
 
 rm -r t || fail=1
 
-(exit $fail); exit
+(exit $fail); exit $fail

tests/rm/i-1

@@ -36,4 +36,4 @@ test -f $tmp/a && fail=1
 
 rm -rf $tmp
 
-(exit $fail); exit
+(exit $fail); exit $fail

tests/rm/ir-1

@@ -54,4 +54,4 @@ esac
 
 rm -rf $tmp $test.I
 
-(exit $fail); exit
+(exit $fail); exit $fail

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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