tests: use "Exit $fail", not (exit $fail); exit $fail
authorJim Meyering <meyering@redhat.com>
Sun, 7 Sep 2008 08:31:27 +0000 (10:31 +0200)
committerJim Meyering <meyering@redhat.com>
Wed, 10 Sep 2008 11:20:10 +0000 (13:20 +0200)
* 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/'

300 files changed:
maint.mk
tests/chgrp/basic
tests/chgrp/default-no-deref
tests/chgrp/deref
tests/chgrp/no-x
tests/chgrp/posix-H
tests/chgrp/recurse
tests/chmod/c-option
tests/chmod/equal-x
tests/chmod/equals
tests/chmod/inaccessible
tests/chmod/no-x
tests/chmod/octal
tests/chmod/setgid
tests/chmod/thru-dangling
tests/chmod/umask-x
tests/chmod/usage
tests/chown/basic
tests/chown/deref
tests/chown/preserve-root
tests/chown/separator
tests/cp/abuse
tests/cp/acl
tests/cp/backup-1
tests/cp/backup-dir
tests/cp/backup-is-src
tests/cp/cp-HL
tests/cp/cp-a-selinux
tests/cp/cp-deref
tests/cp/cp-i
tests/cp/cp-mv-backup
tests/cp/cp-parents
tests/cp/deref-slink
tests/cp/dir-rm-dest
tests/cp/dir-slash
tests/cp/dir-vs-file
tests/cp/existing-perm-race
tests/cp/fail-perm
tests/cp/file-perm-race
tests/cp/into-self
tests/cp/link
tests/cp/link-no-deref
tests/cp/link-preserve
tests/cp/no-deref-link1
tests/cp/no-deref-link2
tests/cp/no-deref-link3
tests/cp/parent-perm
tests/cp/parent-perm-race
tests/cp/perm
tests/cp/preserve-2
tests/cp/preserve-gid
tests/cp/proc-zero-len
tests/cp/r-vs-symlink
tests/cp/same-file
tests/cp/slink-2-slink
tests/cp/sparse
tests/cp/special-bits
tests/cp/special-f
tests/cp/src-base-dot
tests/cp/symlink-slash
tests/cp/thru-dangling
tests/dd/misc
tests/dd/not-rewound
tests/dd/skip-seek2
tests/dd/unblock-sync
tests/df/total
tests/df/total-awk
tests/du/2g
tests/du/8gb
tests/du/basic
tests/du/deref
tests/du/deref-args
tests/du/exclude
tests/du/fd-leak
tests/du/hard-link
tests/du/inacc-dest
tests/du/inacc-dir
tests/du/inaccessible-cwd
tests/du/long-from-unreadable
tests/du/long-sloop
tests/du/no-deref
tests/du/no-x
tests/du/one-file-system
tests/du/restore-wd
tests/du/slash
tests/du/slink
tests/du/trailing-slash
tests/du/two-args
tests/install/basic-1
tests/install/create-leading
tests/install/d-slashdot
tests/install/strip-program
tests/install/trap
tests/ln/backup-1
tests/ln/hard-backup
tests/ln/misc
tests/ln/sf-1
tests/ln/target-1
tests/ls/capability
tests/ls/color-dtype-dir
tests/ls/dangle
tests/ls/dired
tests/ls/file-type
tests/ls/follow-slink
tests/ls/infloop
tests/ls/inode
tests/ls/m-option
tests/ls/nameless-uid
tests/ls/no-arg
tests/ls/proc-selinux-segfault
tests/ls/recursive
tests/ls/rt-1
tests/ls/stat-dtype
tests/ls/stat-failed
tests/ls/stat-free-symlinks
tests/ls/stat-vs-dirent
tests/ls/symlink-slash
tests/ls/x-option
tests/misc/arch
tests/misc/cat-proc
tests/misc/chcon
tests/misc/chcon-fail
tests/misc/close-stdout
tests/misc/csplit
tests/misc/date-sec
tests/misc/df
tests/misc/df-P
tests/misc/false-status
tests/misc/fmt-long-line
tests/misc/groups-dash
tests/misc/groups-version
tests/misc/head-c
tests/misc/head-pos
tests/misc/help-version
tests/misc/id-context
tests/misc/ls-time
tests/misc/mknod
tests/misc/nice
tests/misc/nl
tests/misc/nohup
tests/misc/od-N
tests/misc/od-multiple-t
tests/misc/od-x8
tests/misc/pathchk1
tests/misc/printf
tests/misc/printf-hex
tests/misc/printf-surprise
tests/misc/ptx-overrun
tests/misc/pwd-long
tests/misc/pwd-unreadable-parent
tests/misc/readlink-fp-loop
tests/misc/runcon-no-reorder
tests/misc/selinux
tests/misc/shred-exact
tests/misc/shred-remove
tests/misc/shuf
tests/misc/sort-compress
tests/misc/sort-rand
tests/misc/sort-version
tests/misc/split-a
tests/misc/split-fail
tests/misc/split-l
tests/misc/stat-fmt
tests/misc/stty
tests/misc/stty-invalid
tests/misc/stty-row-col
tests/misc/sum-sysv
tests/misc/tac-continue
tests/misc/tee
tests/misc/tee-dash
tests/misc/timeout
tests/misc/timeout-parameters
tests/misc/truncate-dangling-symlink
tests/misc/truncate-dir-fail
tests/misc/truncate-fail-diag
tests/misc/truncate-fifo
tests/misc/truncate-no-create-missing
tests/misc/truncate-overflow
tests/misc/truncate-owned-by-other
tests/misc/truncate-parameters
tests/misc/truncate-relative
tests/misc/wc-files0
tests/mkdir/p-1
tests/mkdir/p-2
tests/mkdir/p-3
tests/mkdir/p-slashdot
tests/mkdir/p-thru-slink
tests/mkdir/p-v
tests/mkdir/parents
tests/mkdir/perm
tests/mkdir/selinux
tests/mkdir/special-1
tests/mkdir/t-slash
tests/mkdir/writable-under-readonly
tests/mv/acl
tests/mv/atomic
tests/mv/atomic2
tests/mv/backup-dir
tests/mv/backup-is-src
tests/mv/childproof
tests/mv/diag
tests/mv/dir-file
tests/mv/dir2dir
tests/mv/dup-source
tests/mv/force
tests/mv/hard-2
tests/mv/hard-3
tests/mv/hard-4
tests/mv/hard-link-1
tests/mv/hard-verbose
tests/mv/i-2
tests/mv/i-3
tests/mv/i-4
tests/mv/i-5
tests/mv/i-link-no
tests/mv/into-self
tests/mv/into-self-2
tests/mv/into-self-3
tests/mv/into-self-4
tests/mv/leak-fd
tests/mv/mv-special-1
tests/mv/no-target-dir
tests/mv/part-fail
tests/mv/part-hardlink
tests/mv/part-rename
tests/mv/part-symlink
tests/mv/partition-perm
tests/mv/perm-1
tests/mv/reply-no
tests/mv/sticky-to-xpart
tests/mv/to-symlink
tests/mv/trailing-slash
tests/mv/update
tests/readlink/can-e
tests/readlink/can-f
tests/readlink/can-m
tests/readlink/rl-1
tests/require-perl
tests/rm/cycle
tests/rm/dangling-symlink
tests/rm/deep-1
tests/rm/deep-2
tests/rm/dir-no-w
tests/rm/dir-nonrecur
tests/rm/dot-rel
tests/rm/empty-inacc
tests/rm/f-1
tests/rm/fail-2eperm
tests/rm/fail-eacces
tests/rm/hash
tests/rm/i-1
tests/rm/i-never
tests/rm/i-no-r
tests/rm/ignorable
tests/rm/inaccessible
tests/rm/interactive-always
tests/rm/interactive-once
tests/rm/ir-1
tests/rm/isatty
tests/rm/no-give-up
tests/rm/one-file-system
tests/rm/r-1
tests/rm/r-2
tests/rm/r-3
tests/rm/r-4
tests/rm/readdir-bug
tests/rm/rm1
tests/rm/rm2
tests/rm/rm3
tests/rm/rm4
tests/rm/rm5
tests/rm/sunos-1
tests/rm/unread2
tests/rm/unread3
tests/rm/v-slash
tests/rmdir/fail-perm
tests/rmdir/ignore
tests/rmdir/t-slash
tests/sample-test
tests/tail-2/append-only
tests/tail-2/assert
tests/tail-2/assert-2
tests/tail-2/big-4gb
tests/tail-2/infloop-1
tests/tail-2/proc-ksyms
tests/tail-2/start-middle
tests/tail-2/tail-n0f
tests/test-lib.sh
tests/touch/dangling-symlink
tests/touch/dir-1
tests/touch/empty-file
tests/touch/fail-diag
tests/touch/fifo
tests/touch/no-create-missing
tests/touch/no-rights
tests/touch/not-owner
tests/touch/now-owned-by-other
tests/touch/obsolescent
tests/touch/read-only
tests/touch/relative

index eb241b6..492fb0f 100644 (file)
--- 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
 
index cd74978..94297ea 100755 (executable)
@@ -112,4 +112,4 @@ test "`ls -C -c -t f g`" = 'f  g' || \
     esac
   }
 
-(exit $fail); exit $fail
+Exit $fail
index f7ffc94..aac16fe 100755 (executable)
@@ -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
index e63a142..08aa141 100755 (executable)
@@ -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
index 4cf1685..f133ad6 100755 (executable)
@@ -56,4 +56,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index b376e4a..a1db565 100755 (executable)
@@ -72,4 +72,4 @@ for i in $not_changed; do
   test $group = $g1 || fail=1
 done
 
-(exit $fail); exit $fail
+Exit $fail
index e4f90a6..a1f3712 100755 (executable)
@@ -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
index 42da4b2..eb8530a 100755 (executable)
@@ -42,4 +42,4 @@ case "`cat out`" in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
index 06c53c6..8d9dafe 100755 (executable)
@@ -36,4 +36,4 @@ for mode in =x =xX =Xx =x,=X =X,=x; do
   esac
 done
 
-(exit $fail); exit $fail
+Exit $fail
index 9aca394..a748a60 100755 (executable)
@@ -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
index 70cdc9b..6dd1b6a 100755 (executable)
@@ -30,4 +30,4 @@ fail=0
 
 chmod u+rwx d d/e || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index b65295b..55bbe98 100755 (executable)
@@ -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
index a7ddb45..a86d0bd 100755 (executable)
@@ -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
index 30e92f0..d3cbbd3 100755 (executable)
@@ -50,4 +50,4 @@ chmod 755 d
 
 case `ls -ld d` in drwxr-sr-x*);; *) fail=1;; esac
 
-(exit $fail); exit $fail
+Exit $fail
index 055f9c5..ecb6d36 100755 (executable)
@@ -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
index 13b6e9a..2526991 100755 (executable)
@@ -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
index ba0ea73..008cfee 100755 (executable)
@@ -88,4 +88,4 @@ for case in $cases; do
   esac
 done
 
-(exit $fail); exit $fail
+Exit $fail
index 434a6ba..5c7c4d2 100755 (executable)
@@ -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
index 4a46827..33ba946 100755 (executable)
@@ -40,4 +40,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 8e2923b..0dfcdc2 100755 (executable)
@@ -68,4 +68,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index cfd5f0c..a8a6600 100755 (executable)
@@ -65,4 +65,4 @@ for u in $id_u "$id_un" ''; do
   done
 done
 
-(exit $fail); exit $fail
+Exit $fail
index d0faba4..8187392 100755 (executable)
@@ -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
index 21a7742..b212d0d 100755 (executable)
@@ -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
index 7fc1658..830e4ab 100755 (executable)
@@ -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
index 88de81a..313ec40 100755 (executable)
@@ -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
index 3703350..bc91d66 100755 (executable)
@@ -37,4 +37,4 @@ EOF
 
 compare out2 exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index bdc34d9..09257fb 100755 (executable)
@@ -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
index 03d5153..2f4af35 100755 (executable)
@@ -80,4 +80,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 8958450..1f7edd8 100755 (executable)
@@ -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
index a248eaa..94284be 100755 (executable)
@@ -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
index 4280e48..a8c55c9 100755 (executable)
@@ -94,4 +94,4 @@ sed 's/: x/:/' $expected-tmp |cat $expected-tmp - > $expected
 
 compare $expected $actual || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index e936f59..bfaf747 100755 (executable)
@@ -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
index d2e9537..1128027 100755 (executable)
@@ -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
index c97e709..4e540bc 100755 (executable)
@@ -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
index 0e591ce..db6e17c 100755 (executable)
@@ -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
index 317c69a..50b940a 100755 (executable)
@@ -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
index d428e99..d1bc768 100755 (executable)
@@ -89,4 +89,4 @@ case $mode in
   *) fail=1;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
index f2dabd1..bf37ee8 100755 (executable)
@@ -61,4 +61,4 @@ compare out exp || fail=1
 
 chmod 700 D
 
-(exit $fail); exit $fail
+Exit $fail
index 1b6eff6..9745a14 100755 (executable)
@@ -57,4 +57,4 @@ esac
 
 wait $cp_pid || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 53dfe56..ee3fcf5 100755 (executable)
@@ -42,4 +42,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index a1cf926..20b2eed 100755 (executable)
@@ -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
index 3ff16e0..561aa6a 100755 (executable)
@@ -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
index 0dd96f0..309c051 100755 (executable)
@@ -87,4 +87,4 @@ test "$mode" = "-rwx------" || fail=1
 umask 022
 # --------------------------------------
 
-(exit $fail); exit $fail
+Exit $fail
index e92c40c..f18ae03 100755 (executable)
@@ -41,4 +41,4 @@ test $? = 1 || fail=1
 
 test "`cat a/foo`" = $msg || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 20b87fc..8fbf9bf 100755 (executable)
@@ -41,4 +41,4 @@ test $? = 1 || fail=1
 
 test "`cat a`" = $msg || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 32966ca..a177bac 100755 (executable)
@@ -38,4 +38,4 @@ test $? = 1 || fail=1
 
 test "`cat a`" = $msg || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index a7da5e2..01ca2b8 100755 (executable)
@@ -53,4 +53,4 @@ for dir in a a/b a/b/d; do
   fail=1
 done
 
-(exit $fail); exit $fail
+Exit $fail
index c84f2e9..196a405 100755 (executable)
@@ -64,4 +64,4 @@ do
   wait $cp_pid || fail=1
 done
 
-(exit $fail); exit $fail
+Exit $fail
index aed3a72..8073ac0 100755 (executable)
@@ -75,4 +75,4 @@ for u in 31 37 2; do
   done
 done
 
-(exit $fail); exit $fail
+Exit $fail
index 667b503..19cb5fd 100755 (executable)
@@ -29,4 +29,4 @@ fail=0
 
 cp --preserve=mode,links f g || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index d7f86e0..2fb7384 100755 (executable)
@@ -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
index 33e5802..586720a 100755 (executable)
@@ -42,4 +42,4 @@ test -s exp && { rm -f exp; echo nonempty > exp; }
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 08070f7..8596bb7 100755 (executable)
@@ -43,4 +43,4 @@ case $mode in
   *) fail=1;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
index e5cc823..32bdc2a 100755 (executable)
@@ -225,4 +225,4 @@ fail=0;
 
 compare $expected $actual 1>&2 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index c86a251..4fc0ef5 100755 (executable)
@@ -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
index 2c2024c..e07f051 100755 (executable)
@@ -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
index c75fb50..ef7755b 100755 (executable)
@@ -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
index 054ad70..0556f01 100755 (executable)
@@ -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
index 09aedb2..5552944 100755 (executable)
@@ -34,4 +34,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 893a413..16b1c26 100755 (executable)
@@ -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
index 7caeed3..d7bffd8 100755 (executable)
@@ -43,4 +43,4 @@ cat no-such >> out || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 04318f0..4fdebc2 100755 (executable)
@@ -98,4 +98,4 @@ compare err_ok err || fail=1
 
 test $fail -eq 0 && fail=$warn
 
-(exit $fail); exit $fail
+Exit $fail
index b0bdf12..8c81181 100755 (executable)
@@ -33,4 +33,4 @@ case `cat out` in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
index 1381305..c831c85 100755 (executable)
@@ -40,4 +40,4 @@ case `cat out` in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
index b666533..2adcbb7 100755 (executable)
@@ -37,4 +37,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 186bf8d..6d82663 100755 (executable)
@@ -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
index d569f26..a10a03d 100755 (executable)
@@ -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
index 6a7463c..44592f9 100755 (executable)
@@ -70,4 +70,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 49989d1..bdeeb07 100755 (executable)
@@ -55,4 +55,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 837ec92..94e62a8 100755 (executable)
@@ -91,4 +91,4 @@ EOF
   compare out exp || fail=1
 fi
 
-(exit $fail); exit $fail
+Exit $fail
index facdf42..08606c0 100755 (executable)
@@ -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
index 02bdf7d..ee5499c 100755 (executable)
@@ -50,4 +50,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 1e32b60..e6fd68f 100755 (executable)
@@ -60,4 +60,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 14df938..a35ee24 100755 (executable)
@@ -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
index f4fdf26..d58adbe 100755 (executable)
@@ -50,4 +50,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index b0ea4d6..4f66f8b 100755 (executable)
@@ -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
index 3b5fa50..f3b0a46 100755 (executable)
@@ -44,4 +44,4 @@ du -k a > out 2> /dev/null && fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 70e83a1..9ee6478 100755 (executable)
@@ -37,4 +37,4 @@ fail=0
 
 du "$cwd/a" > /dev/null || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index fdaf91a..5d9ce7c 100755 (executable)
@@ -68,4 +68,4 @@ chmod 0 . || framework_failure
 fail=0
 du -s "$cwd/$dir" > /dev/null || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 31aac1f..5d43025 100755 (executable)
@@ -74,4 +74,4 @@ echo "du: cannot access: $too_many" > exp || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 8d8bc6c..d1ce593 100755 (executable)
@@ -35,4 +35,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 5569b5d..b4d6fad 100755 (executable)
@@ -51,4 +51,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 82081c6..e944d1d 100755 (executable)
@@ -42,4 +42,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index b716b41..07c648c 100755 (executable)
@@ -33,4 +33,4 @@ fail=0
 
 du a b > out || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index d433a92..c2d2cc3 100755 (executable)
@@ -35,4 +35,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 588c4df..5bf0349 100755 (executable)
@@ -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
index 92de5d4..296ad7d 100755 (executable)
@@ -49,4 +49,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 2b25bf5..b5d67b4 100755 (executable)
@@ -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
index 31f3215..09c8d44 100755 (executable)
@@ -126,4 +126,4 @@ ginstall: creating directory `sub3/a/b/c'
 `file' -> `sub3/a/b/c/file'
 EOF
 
-(exit $fail); exit $fail
+Exit $fail
index 3e60792..55d20eb 100755 (executable)
@@ -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
index 057c7be..e02e2c6 100755 (executable)
@@ -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
index 57597fc..98f7feb 100755 (executable)
@@ -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
index 5b2b115..f03899f 100755 (executable)
@@ -35,4 +35,4 @@ fail=0
   exec ginstall -s "$abs_top_builddir/src/ginstall$EXEEXT" .
 )
 
-(exit $fail); exit $fail
+Exit $fail
index f796f3a..0aff4f3 100755 (executable)
@@ -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
index 90f8cd8..c02b265 100755 (executable)
@@ -34,4 +34,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index f8ec46f..a4a9254 100755 (executable)
@@ -149,4 +149,4 @@ ln foo '' 2> /dev/null
 
 # ===================================================
 
-(exit $fail); exit $fail
+Exit $fail
index 2dd3d8c..d00df6e 100755 (executable)
@@ -34,4 +34,4 @@ case `cat err` in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
index e60106c..d088e24 100755 (executable)
@@ -32,4 +32,4 @@ mkdir d || framework_failure
 fail=0
 ln -s --target-dir=d ../f || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index fcd3c2a..f064348 100755 (executable)
@@ -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
index 37b40c4..6664d3b 100755 (executable)
@@ -50,4 +50,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 942b45a..08a73b9 100755 (executable)
@@ -50,4 +50,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 3d96852..57b67b9 100755 (executable)
@@ -37,4 +37,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 1dfc303..01daeaf 100755 (executable)
@@ -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
index e0468de..651ad8a 100755 (executable)
@@ -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
index 6476e25..8ce145d 100755 (executable)
@@ -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
index dea2b28..b5ddc8c 100755 (executable)
@@ -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
index 1549587..cd0bc8a 100755 (executable)
@@ -42,4 +42,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index d5fa7f1..3cfc588 100755 (executable)
@@ -41,4 +41,4 @@ fail=0
 set -- `ls -o f` || fail=1
 test $3 = $nameless_uid || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index cd9dd38..e3ccb99 100755 (executable)
@@ -58,4 +58,4 @@ ls -R1 > out || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 1a31ece..a372757 100755 (executable)
@@ -29,4 +29,4 @@ test -r $f || f=.
 fail=0
 ls -l $f > out || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 158b9ce..e6f1e58 100755 (executable)
@@ -64,4 +64,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 1a13176..d4fd2ca 100755 (executable)
@@ -50,4 +50,4 @@ a
 EOF
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 7e7dcb9..bca2bfc 100755 (executable)
@@ -63,4 +63,4 @@ printf 'a2345/\tb/\n' > exp || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index be9a780..949fa24 100755 (executable)
@@ -54,4 +54,4 @@ EOF
 
 sed 's/^  l/  ?/' out | compare - exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index be4d490..e5ad6dc 100755 (executable)
@@ -52,4 +52,4 @@ grep '^stat("x"' err && fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index f105e2f..2c3b064 100755 (executable)
@@ -64,4 +64,4 @@ while :; do
   test $dev_ino = $root_dev_ino && break
 done
 
-(exit $fail); exit $fail
+Exit $fail
index 4315b06..6b18bfe 100755 (executable)
@@ -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
index b479600..7f479d0 100755 (executable)
@@ -39,4 +39,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 1661d6c..781cca6 100755 (executable)
@@ -36,4 +36,4 @@ uname -m > exp || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 8fa3f56..791b7d4 100755 (executable)
@@ -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
index fefe0ec..723bfd0 100755 (executable)
@@ -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
index d9bac7c..a9efbff 100755 (executable)
@@ -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
index ede7520..261a383 100755 (executable)
@@ -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
index 9997860..2d27daa 100755 (executable)
@@ -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
index dea1835..2bb69cf 100755 (executable)
@@ -51,4 +51,4 @@ case "$s" in
   *) fail=1;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
index bb895e7..9f0bfc3 100755 (executable)
@@ -31,4 +31,4 @@ case `df .` in
   fail=1;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
index 8024864..a6dcf9c 100755 (executable)
@@ -39,4 +39,4 @@ head -n1 t2 > out || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 67191a3..be47e27 100755 (executable)
@@ -27,4 +27,4 @@ fail=0
 false --version > /dev/null && fail=1
 false --help > /dev/null && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 6902023..ae7acf3 100755 (executable)
@@ -63,4 +63,4 @@ fmt -s in > out || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index bc132d8..01a507d 100755 (executable)
@@ -33,4 +33,4 @@ echo $? >> exp
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 34dbd33..1862045 100755 (executable)
@@ -30,4 +30,4 @@ id --version | sed '/^$/q' > exp || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 2b348d2..7149028 100755 (executable)
@@ -32,4 +32,4 @@ case "`cat out`" in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
index 0c55a87..2469d6c 100755 (executable)
@@ -34,4 +34,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 8fa7a0b..c7bec35 100755 (executable)
@@ -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
index ea90ec6..0d9e8ca 100755 (executable)
@@ -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
index 07271c6..50c7a47 100755 (executable)
@@ -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
index bb8e024..4cf7d9f 100755 (executable)
@@ -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
index 4fcb80f..90cfb8f 100755 (executable)
@@ -80,4 +80,4 @@ while :; do
   shift; shift; shift
 done
 
-(exit $fail); exit $fail
+Exit $fail
index 572e44a..eefbbb5 100755 (executable)
@@ -45,4 +45,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 1b36dbd..62f87b1 100755 (executable)
@@ -105,4 +105,4 @@ EOF
 nohup >/dev/null 2>&1
 test $? = 127 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 884127c..9a452d0 100755 (executable)
@@ -34,4 +34,4 @@ cat <<EOF > exp || fail=1
 EOF
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 63fb7e4..2865f18 100755 (executable)
@@ -44,4 +44,4 @@ done
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index b52c1ce..5a17b38 100755 (executable)
@@ -45,4 +45,4 @@ od -An -t x1 in \
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 5b20f07..f8f8784 100755 (executable)
@@ -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
index 78084b3..1cc440e 100755 (executable)
@@ -95,4 +95,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 968f667..3668013 100755 (executable)
@@ -35,4 +35,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 3336f12..b24e3be 100755 (executable)
@@ -87,4 +87,4 @@ case $n_out:$diagnostic:$exit in
   *) fail=1;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
index 1859691..3c2e04b 100755 (executable)
@@ -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
index 94d4e4c..4270071 100755 (executable)
@@ -116,4 +116,4 @@ EOF
 
 fail=$?
 
-(exit $fail); exit $fail
+Exit $fail
index 75df827..c79daad 100755 (executable)
@@ -44,4 +44,4 @@ readlink -ev . > out || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 7ac54b9..c03fcb1 100755 (executable)
@@ -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
index c1705e5..a627957 100755 (executable)
@@ -44,4 +44,4 @@ esac
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 8065182..a231fa7 100755 (executable)
@@ -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
index d90a80e..e2917fd 100755 (executable)
@@ -38,4 +38,4 @@ for opt in --exact --zero; do
   test -f c && fail=1
 done
 
-(exit $fail); exit $fail
+Exit $fail
index a5dc6f1..3c304f8 100755 (executable)
@@ -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
index 83530c2..7ec23ca 100755 (executable)
@@ -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
index f3c4735..fa1c05a 100755 (executable)
@@ -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
index f675c95..47d4d85 100755 (executable)
@@ -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
index 3208f2e..262ee95 100755 (executable)
@@ -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
index 19f3f0a..c730635 100755 (executable)
@@ -68,4 +68,4 @@ for f in $files; do
   n=$(expr $n + 1)
 done
 
-(exit $fail); exit $fail
+Exit $fail
index 0334c2d..0680891 100755 (executable)
@@ -75,4 +75,4 @@ EOF
 compare out exp || fail=1
 
 
-(exit $fail); exit $fail
+Exit $fail
index 453f100..48f4352 100755 (executable)
@@ -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
index f169166..354eae2 100755 (executable)
@@ -32,4 +32,4 @@ for i in `seq 50`; do
   test "$out" = "$fmt" || fail=1
 done
 
-(exit $fail); exit $fail
+Exit $fail
index 8216c8e..c53f6c4 100755 (executable)
@@ -100,4 +100,4 @@ fi
 
 stty `cat $saved_state`
 
-(exit $fail); exit $fail
+Exit $fail
index 302dbe0..47531c5 100755 (executable)
@@ -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
index 8ac1143..987e0d5 100755 (executable)
@@ -81,4 +81,4 @@ done
 set x $saved_size
 stty rows $2 columns $3 || exit 1
 
-(exit $fail); exit $fail
+Exit $fail
index 8766449..1d337c7 100755 (executable)
@@ -54,4 +54,4 @@ cat > exp <<\EOF
 EOF
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index ce41a52..ea2a3ea 100755 (executable)
@@ -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
index adf0caa..ccdf122 100755 (executable)
@@ -36,4 +36,4 @@ for n in 0 $nums; do
        done
 done
 
-(exit $fail); exit $fail
+Exit $fail
index 2564117..e57b225 100755 (executable)
@@ -26,4 +26,4 @@ fi
 fail=0
 tee - </dev/null || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 8996fbc..fa964a3 100755 (executable)
@@ -41,4 +41,4 @@ timeout 1 false && fail=1
 timeout 1 sleep 2
 test $? = 124 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index e44ff98..27d6b57 100755 (executable)
@@ -49,4 +49,4 @@ timeout 1 . && fail=1
 # non existant command
 timeout 1 ... && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index e16da95..b71e2ba 100755 (executable)
@@ -30,4 +30,4 @@ truncate -s0 t-symlink || fail=1
 
 test -f truncate-target || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 3ae918e..942c6b4 100755 (executable)
@@ -11,4 +11,4 @@ fi
 # truncate on dir not allowed
 truncate -s+0 . && fail=1 || fail=0
 
-(exit $fail); exit $fail
+Exit $fail
index 0c6bb1c..39091d9 100755 (executable)
@@ -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
index f2decc6..d5802c0 100755 (executable)
@@ -29,4 +29,4 @@ fail=0
 
 truncate -s0 "fifo" || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index bbe8e85..a5d0e72 100755 (executable)
@@ -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
index 5dbbf38..b903244 100755 (executable)
@@ -52,4 +52,4 @@ else
     truncate -s+2147483647 non-empty-file && fail=1
 fi
 
-(exit $fail); exit $fail
+Exit $fail
index a7ad278..708138d 100755 (executable)
@@ -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
index 27a22a9..4489ed4 100755 (executable)
@@ -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
index dedb76f..cee49b4 100755 (executable)
@@ -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
index aa2221e..1150121 100755 (executable)
@@ -45,4 +45,4 @@ if test "$fail" = ''; then
   compare out exp || fail=1
 fi
 
-(exit $fail); exit $fail
+Exit $fail
index 85a2458..2039513 100755 (executable)
@@ -27,4 +27,4 @@ fail=0
 mkdir --parents "`pwd`/t" || fail=1
 test -d t || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 7daf0b5..22b7615 100755 (executable)
@@ -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
index 54052f1..45e1a0a 100755 (executable)
@@ -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
index d2c3f98..d7b5dfa 100755 (executable)
@@ -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
index accdc79..6321fc9 100755 (executable)
@@ -29,4 +29,4 @@ fail=0
 mkdir -p slink/x || fail=1
 test -d x || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 27696b5..8e08594 100755 (executable)
@@ -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
index 5433ee0..46f5867 100755 (executable)
@@ -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
index 4fa9b56..2f8715b 100755 (executable)
@@ -85,4 +85,4 @@ for p in empty -p; do
   done
 done
 
-(exit $fail); exit $fail
+Exit $fail
index 4a01a43..a81689a 100755 (executable)
@@ -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
index 9d13cba..7a1c185 100755 (executable)
@@ -52,4 +52,4 @@ case "$mode" in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
index e95b052..4de4459 100755 (executable)
@@ -33,4 +33,4 @@ test -d dir || fail=1
 mkdir d2/ || fail=1
 test -d d2 || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 1057b44..f6de621 100755 (executable)
@@ -54,4 +54,4 @@ mkdir -p mnt-ro/rw/sub || fail=1
 umount /tmp/2
 umount /tmp/1
 
-(exit $fail); exit $fail
+Exit $fail
index e9121a5..f596ff7 100755 (executable)
@@ -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
index b360e13..3f731a5 100755 (executable)
@@ -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
index 796d9c4..3a4ee76 100755 (executable)
@@ -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
index 28876a0..36c4bb0 100755 (executable)
@@ -36,4 +36,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index eee4fd9..70b1e96 100755 (executable)
@@ -47,4 +47,4 @@ EOF
 
 compare out2 exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index dffdf40..2067bd8 100755 (executable)
@@ -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
index ef25d80..446fc34 100755 (executable)
@@ -50,4 +50,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 38217e0..82c0c21 100755 (executable)
@@ -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
index 9a03881..8e260a7 100755 (executable)
@@ -44,4 +44,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index d7b56e8..398d877 100755 (executable)
@@ -68,4 +68,4 @@ EOF
   compare out exp || fail=1
 done
 
-(exit $fail); exit $fail
+Exit $fail
index f2eaf91..912354e 100755 (executable)
@@ -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
index aaf9349..6451a1c 100755 (executable)
@@ -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
index a2fa4e7..e476c9d 100755 (executable)
@@ -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
index 881cab5..e11914a 100755 (executable)
@@ -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
index 864fd03..08b3c92 100755 (executable)
@@ -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
index 0b4a129..a558d32 100755 (executable)
@@ -35,4 +35,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 1cc1394..959912a 100755 (executable)
@@ -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
index 9d8b03e..b9cd7d9 100755 (executable)
@@ -54,4 +54,4 @@ case "`cat out`" in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
index 5de59b4..fcc38df 100755 (executable)
@@ -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
index da97168..f8fc8e6 100755 (executable)
@@ -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
index b322872..226d5dd 100755 (executable)
@@ -48,4 +48,4 @@ case "`cat b/foo`" in
   *) fail=1;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
index 915194f..428eb17 100755 (executable)
@@ -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
index 13e996a..99763d6 100755 (executable)
@@ -54,4 +54,4 @@ EOF
 
 compare out2 exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 3b96732..d1a0710 100755 (executable)
@@ -42,4 +42,4 @@ EOF
 
 compare out2 exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 9f00113..0a4af7f 100755 (executable)
@@ -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
index 1141b73..993bbdf 100755 (executable)
@@ -57,4 +57,4 @@ rm .dirs
 out=$(ls -A) || fail=1
 test -z "$out" || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index f10dc10..bae203c 100755 (executable)
@@ -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
index 7df1fb9..7094cc7 100755 (executable)
@@ -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
index 60c4210..469880a 100755 (executable)
@@ -56,4 +56,4 @@ else
 fi
 test $fail = 1 && diff out exp 2> /dev/null
 
-(exit $fail); exit $fail
+Exit $fail
index 3eaa083..fa3d54d 100755 (executable)
@@ -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
index 8bff991..e80004b 100755 (executable)
@@ -33,4 +33,4 @@ fail=0
 
 mv foo/ $other_partition_tmpdir/bar || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 9262524..2aed4d8 100755 (executable)
@@ -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
index 03f169e..08236a2 100755 (executable)
@@ -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
index 95bbccb..44a1af2 100755 (executable)
@@ -37,4 +37,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 42967c8..fb7cc2f 100755 (executable)
@@ -39,4 +39,4 @@ EOF
 
 compare out exp_err || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 14cb762..55d8f8f 100755 (executable)
@@ -65,4 +65,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 560d63d..b127722 100755 (executable)
@@ -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
index eea982f..a5932ba 100755 (executable)
@@ -55,4 +55,4 @@ done
 #touch a a2
 #mv a a2/ && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 15e6fa7..29910c8 100755 (executable)
@@ -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
index 72c2c5c..6316ff9 100755 (executable)
@@ -107,4 +107,4 @@ for p in "" "$pwd/$tmp/"; do
   test -z "$v" || fail=1
 done
 
-(exit $fail); exit $fail
+Exit $fail
index 67f84b9..9e19eb0 100755 (executable)
@@ -140,4 +140,4 @@ for p in "" "$pwd/$tmp/"; do
   test -z "$v" || fail=1
 done
 
-(exit $fail); exit $fail
+Exit $fail
index 24f98c9..d20dcd7 100755 (executable)
@@ -144,4 +144,4 @@ for p in "" "$pwd/$tmp/"; do
 
 done
 
-(exit $fail); exit $fail
+Exit $fail
index 91401b0..cdde35b 100755 (executable)
@@ -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
index 1f98edf..a6d9dc9 100644 (file)
@@ -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
 }
index 4c9f04d..20522a0 100755 (executable)
@@ -38,4 +38,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 7581be2..189bafc 100755 (executable)
@@ -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
index 34e9e19..c169678 100755 (executable)
@@ -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
index ed84c66..f01a79e 100755 (executable)
@@ -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
index 35ab185..d5317d7 100755 (executable)
@@ -44,4 +44,4 @@ rm -f out-t
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 064ef5d..1d06b44 100755 (executable)
@@ -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
index 0d0e1a1..6a3ac51 100755 (executable)
@@ -31,4 +31,4 @@ fail=0
 
 rm -r a b || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index e89d103..67af875 100755 (executable)
@@ -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
index acd241a..fa00806 100755 (executable)
@@ -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
index 6cc66ef..14654e9 100755 (executable)
@@ -54,4 +54,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 916b257..4722b0f 100755 (executable)
@@ -56,4 +56,4 @@ rm: cannot remove `e/slink': Permission denied
 EOF
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index abb7ffd..eaa384a 100755 (executable)
@@ -39,4 +39,4 @@ fail=0
 
 rm -r t || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index d19ebea..1d4b1dc 100755 (executable)
@@ -44,4 +44,4 @@ test -f $t/a && fail=1
 
 rm -rf $t
 
-(exit $fail); exit $fail
+Exit $fail
index 244054a..2bde9ec 100755 (executable)
@@ -35,4 +35,4 @@ rm --interactive=never f > out || fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index f028b63..718b149 100755 (executable)
@@ -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
index 37e0150..7b38fb6 100755 (executable)
@@ -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
index 35cddc5..fc46b02 100755 (executable)
@@ -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
index 382cc6f..88afd75 100755 (executable)
@@ -91,4 +91,4 @@ EOF
 compare out expout || fail=1
 compare err experr || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 6238f3f..1590832 100755 (executable)
@@ -111,4 +111,4 @@ EOF
 compare out expout || fail=1
 compare err experr || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index c3cdc0b..c3cb8b3 100755 (executable)
@@ -61,4 +61,4 @@ case `echo $t/*` in
   *) fail=1 ;;
 esac
 
-(exit $fail); exit $fail
+Exit $fail
index 5968873..173458d 100755 (executable)
@@ -56,4 +56,4 @@ echo x >> out
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index b888296..c886420 100755 (executable)
@@ -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
index 419ada2..2de7678 100755 (executable)
@@ -45,4 +45,4 @@ umount $t
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index ec846fb..187b664 100755 (executable)
@@ -47,4 +47,4 @@ done
 # Compare expected and actual output.
 compare $test.E $test.O || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 0bf6756..d9614ba 100755 (executable)
@@ -48,4 +48,4 @@ fi
 # Compare expected and actual output.
 cmp t/E t/O || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 9c31d88..e4d8dc9 100755 (executable)
@@ -50,4 +50,4 @@ fail=0
 rm -rf t || fail=1
 test -d t && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 3d21079..7cc84b6 100755 (executable)
@@ -38,4 +38,4 @@ rm -fr d/../ 2>/dev/null && fail=1
 
 test -f d/a || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 15dc741..2d2e6eb 100755 (executable)
@@ -43,4 +43,4 @@ rm -rf b  || fail=1
 
 test -d b && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 70bc0e8..116bd7b 100755 (executable)
@@ -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
index 853f4e2..67402a8 100755 (executable)
@@ -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
index c5630a2..a64bd27 100755 (executable)
@@ -75,4 +75,4 @@ compare out exp || fail=1
 
 test -d z && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 2fbf317..8642a9d 100755 (executable)
@@ -33,4 +33,4 @@ rm dir > /dev/null 2>&1 && fail=1
 
 test -d dir || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index f54d640..e36f08d 100755 (executable)
@@ -54,4 +54,4 @@ test -d d && fail=1
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index ce1016e..010c937 100755 (executable)
@@ -31,4 +31,4 @@ fi
 fail=0
 rm -r '' > /dev/null 2>&1 && fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 005c425..615f24d 100755 (executable)
@@ -37,4 +37,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index e79bd60..db38f90 100755 (executable)
@@ -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
index 3a9d541..71432e6 100755 (executable)
@@ -36,4 +36,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 9eeb633..bfc7b07 100755 (executable)
@@ -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
index e55ae1f..564b180 100755 (executable)
@@ -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
index 923e9c9..85e4e7e 100755 (executable)
@@ -31,4 +31,4 @@ fail=0
 # rmdir: `dir': No such file or directory
 rmdir -p dir/ || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 67bc0d1..ca16872 100644 (file)
@@ -38,4 +38,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index fc76100..d78a540 100755 (executable)
@@ -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
index 309d12d..65f00d6 100755 (executable)
@@ -61,4 +61,4 @@ esac
 
 test $fail = 1 && cat err
 
-(exit $fail); exit $fail
+Exit $fail
index 4c6f4a9..d816c7c 100755 (executable)
@@ -49,4 +49,4 @@ esac
 
 test $fail = 1 && cat err
 
-(exit $fail); exit $fail
+Exit $fail
index b362aeb..c8b2a48 100755 (executable)
@@ -52,4 +52,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index c18c3e6..bf12a11 100755 (executable)
@@ -36,4 +36,4 @@ sleep 1
 fail=0
 kill $tail_pid && fail=1 || :
 
-(exit $fail); exit $fail
+Exit $fail
index 84566b5..4766671 100755 (executable)
@@ -30,4 +30,4 @@ if test -r $ksyms; then
   tail $ksyms > /dev/null || fail=1
 fi
 
-(exit $fail); exit $fail
+Exit $fail
index 3151e9d..cc8cc8e 100755 (executable)
@@ -35,4 +35,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 4a22541..bf19cf5 100755 (executable)
@@ -56,4 +56,4 @@ for file in empty nonempty; do
   done
 done
 
-(exit $fail); exit $fail
+Exit $fail
index f0e1070..e7ec80e 100644 (file)
@@ -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_"
 
index aedb4af..add6f63 100755 (executable)
@@ -51,4 +51,4 @@ when operating on dangling symlinks.
   esac
 fi
 
-(exit $fail); exit $fail
+Exit $fail
index 3402307..1698ab1 100755 (executable)
@@ -11,4 +11,4 @@ fi
 
 fail=0
 touch . || fail=1
-(exit $fail); exit $fail
+Exit $fail
index 0f42ba5..9c11990 100755 (executable)
@@ -82,4 +82,4 @@ if test $fail != 0; then
 EOF
 fi
 
-(exit $fail); exit $fail
+Exit $fail
index b888912..37814fd 100755 (executable)
@@ -38,4 +38,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index 9cd2d01..8152717 100755 (executable)
@@ -29,4 +29,4 @@ fail=0
 
 touch fifo || fail=1
 
-(exit $fail); exit $fail
+Exit $fail
index be2d0db..48c81d5 100755 (executable)
@@ -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
index 7550bae..5a662b3 100755 (executable)
@@ -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
index adcdaa8..b0ad4ac 100755 (executable)
@@ -54,4 +54,4 @@ test "$match" = 1 || fail=1
 
 test $fail = 1 && diff out exp 2> /dev/null
 
-(exit $fail); exit $fail
+Exit $fail
index 2c1faef..123df84 100755 (executable)
@@ -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
index 8b55877..a5dcd24 100755 (executable)
@@ -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
index e2338c5..8b7ebd1 100755 (executable)
@@ -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
index 7c1396f..db31b16 100755 (executable)
@@ -40,4 +40,4 @@ EOF
 
 compare out exp || fail=1
 
-(exit $fail); exit $fail
+Exit $fail