diff options
| author | Jim Meyering <meyering@redhat.com> | 2008-09-07 10:31:27 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2008-09-10 13:20:10 +0200 |
| commit | 68561594ca022703e255b3ef5686f176317e5fd4 (patch) | |
| tree | 2bb17f465ad51bb9bf212b871a95b877e558d2e0 /tests | |
| parent | 22e5102f1961c5552d20c3791cbc99b6b001e83f (diff) | |
| download | coreutils-68561594ca022703e255b3ef5686f176317e5fd4.tar.xz | |
tests: use "Exit $fail", not (exit $fail); exit $fail
* tests/test-lib.sh (Exit): New function by Ralf Wildenhues in automake
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=20594c08f63
* tests/**: Convert all uses:
This restrictive change converted the vast majority:
git grep -l '^(exit \$fail); exit \$fail$' \
| xargs perl -pi -e 's/'^\(exit \$fail\); exit \$fail$/Exit \$fail/'
And this did the rest, plus a few undesirable ones, so I manually
backed out the changes to ChangeLog-* and build-aux/check.mk:
git grep -l -E '\(exit [^)]+\); exit ' \
| xargs perl -pi -e 's/\(exit (.+?)\); exit \1/Exit $1/'
Diffstat (limited to 'tests')
299 files changed, 320 insertions, 308 deletions
diff --git a/tests/chgrp/basic b/tests/chgrp/basic index cd7497871..94297ea5a 100755 --- a/tests/chgrp/basic +++ b/tests/chgrp/basic @@ -112,4 +112,4 @@ test "`ls -C -c -t f g`" = 'f g' || \ esac } -(exit $fail); exit $fail +Exit $fail diff --git a/tests/chgrp/default-no-deref b/tests/chgrp/default-no-deref index f7ffc94b8..aac16fe6f 100755 --- a/tests/chgrp/default-no-deref +++ b/tests/chgrp/default-no-deref @@ -35,4 +35,4 @@ g_init=`stat --printf=%g f` chgrp -R $g2 d || fail=1 test `stat --printf=%g f` = $g_init || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/chgrp/deref b/tests/chgrp/deref index e63a14228..08aa141ac 100755 --- a/tests/chgrp/deref +++ b/tests/chgrp/deref @@ -62,4 +62,4 @@ chgrp --dereference $g1 symlink set _ `ls -ln f`; g=$5; test "$g" = $g1 || fail=1 set _ `ls -ln symlink`; g=$5; test "$g" = $g2 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/chgrp/no-x b/tests/chgrp/no-x index 4cf168560..f133ad6c8 100755 --- a/tests/chgrp/no-x +++ b/tests/chgrp/no-x @@ -56,4 +56,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/chgrp/posix-H b/tests/chgrp/posix-H index b376e4ac5..a1db5655a 100755 --- a/tests/chgrp/posix-H +++ b/tests/chgrp/posix-H @@ -72,4 +72,4 @@ for i in $not_changed; do test $group = $g1 || fail=1 done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/chgrp/recurse b/tests/chgrp/recurse index e4f90a6b7..a1f371288 100755 --- a/tests/chgrp/recurse +++ b/tests/chgrp/recurse @@ -55,4 +55,4 @@ set _ `ls -ln e/ee`; g=$5; test "$g" = $g2 || fail=1 # But it *should* change d/dd. set _ `ls -ln d/dd`; g=$5; test "$g" = $g1 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/chmod/c-option b/tests/chmod/c-option index 42da4b209..eb8530a52 100755 --- a/tests/chmod/c-option +++ b/tests/chmod/c-option @@ -42,4 +42,4 @@ case "`cat out`" in *) fail=1 ;; esac -(exit $fail); exit $fail +Exit $fail diff --git a/tests/chmod/equal-x b/tests/chmod/equal-x index 06c53c669..8d9dafe0f 100755 --- a/tests/chmod/equal-x +++ b/tests/chmod/equal-x @@ -36,4 +36,4 @@ for mode in =x =xX =Xx =x,=X =X,=x; do esac done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/chmod/equals b/tests/chmod/equals index 9aca394c4..a748a606c 100755 --- a/tests/chmod/equals +++ b/tests/chmod/equals @@ -48,4 +48,4 @@ chmod a=,u=rwx,=u f || fail=1 actual_perms=`ls -l f|cut -b-10` test "$actual_perms" = "-rwxr-x---" || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/chmod/inaccessible b/tests/chmod/inaccessible index 70cdc9bff..6dd1b6a97 100755 --- a/tests/chmod/inaccessible +++ b/tests/chmod/inaccessible @@ -30,4 +30,4 @@ fail=0 chmod u+rwx d d/e || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/chmod/no-x b/tests/chmod/no-x index b65295bd8..55bbe9896 100755 --- a/tests/chmod/no-x +++ b/tests/chmod/no-x @@ -59,4 +59,4 @@ chmod a-x . b 2> /dev/null && fail=1 # an abort (exit with status 134) on recent glibc-based systems. test $? = 1 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/chmod/octal b/tests/chmod/octal index a7ddb4503..a86d0bd75 100755 --- a/tests/chmod/octal +++ b/tests/chmod/octal @@ -31,4 +31,4 @@ chmod 0-followed-by-anything . 2> /dev/null && fail=1 chmod 7-followed-by-anything . 2> /dev/null && fail=1 chmod 8 . 2> /dev/null && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/chmod/setgid b/tests/chmod/setgid index 30e92f05a..d3cbbd368 100755 --- a/tests/chmod/setgid +++ b/tests/chmod/setgid @@ -50,4 +50,4 @@ chmod 755 d case `ls -ld d` in drwxr-sr-x*);; *) fail=1;; esac -(exit $fail); exit $fail +Exit $fail diff --git a/tests/chmod/thru-dangling b/tests/chmod/thru-dangling index 055f9c59c..ecb6d3685 100755 --- a/tests/chmod/thru-dangling +++ b/tests/chmod/thru-dangling @@ -33,4 +33,4 @@ chmod 644 dangle 2> out && fail=1 echo "chmod: cannot operate on dangling symlink \`dangle'" > exp compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/chmod/umask-x b/tests/chmod/umask-x index 13b6e9ac2..2526991e8 100755 --- a/tests/chmod/umask-x +++ b/tests/chmod/umask-x @@ -28,4 +28,4 @@ touch file chmod 755 file (umask 77 && chmod -x file) 2>/dev/null && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/chmod/usage b/tests/chmod/usage index ba0ea7313..008cfee86 100755 --- a/tests/chmod/usage +++ b/tests/chmod/usage @@ -88,4 +88,4 @@ for case in $cases; do esac done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/chown/basic b/tests/chown/basic index 434a6bac2..5c7c4d287 100755 --- a/tests/chown/basic +++ b/tests/chown/basic @@ -50,4 +50,4 @@ chown --no-dereference --from=0:1 2:010 slink || fail=1 # owner/group on the symlink should be changed set _ `ls -n slink`; shift; test "$3:$4" = 2:10 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/chown/deref b/tests/chown/deref index 4a46827c2..33ba94665 100755 --- a/tests/chown/deref +++ b/tests/chown/deref @@ -40,4 +40,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/chown/preserve-root b/tests/chown/preserve-root index 8e2923bf0..0dfcdc211 100755 --- a/tests/chown/preserve-root +++ b/tests/chown/preserve-root @@ -68,4 +68,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/chown/separator b/tests/chown/separator index cfd5f0c7e..a8a6600c8 100755 --- a/tests/chown/separator +++ b/tests/chown/separator @@ -65,4 +65,4 @@ for u in $id_u "$id_un" ''; do done done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/abuse b/tests/cp/abuse index d0faba4dd..8187392b5 100755 --- a/tests/cp/abuse +++ b/tests/cp/abuse @@ -52,4 +52,4 @@ for i in dangling-dest existing-dest; do && case $(cat t) in i);; *) fail=1;; esac done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/acl b/tests/cp/acl index 21a7742ef..b212d0de2 100755 --- a/tests/cp/acl +++ b/tests/cp/acl @@ -60,4 +60,4 @@ cp -p a/file b/ || fail=1 acl2=`cd b && getfacl file` || framework_failure test "$acl1" = "$acl2" || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/backup-1 b/tests/cp/backup-1 index 7fc165870..830e4abb5 100755 --- a/tests/cp/backup-1 +++ b/tests/cp/backup-1 @@ -41,4 +41,4 @@ test -f $file || fail=1 test -f $file_backup || fail=1 compare $file $file_backup > /dev/null || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/backup-dir b/tests/cp/backup-dir index 88de81adf..313ec40a7 100755 --- a/tests/cp/backup-dir +++ b/tests/cp/backup-dir @@ -34,4 +34,4 @@ cp -ab x y || fail=1 test -d y/x || fail=1 test -d y/x~ && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/backup-is-src b/tests/cp/backup-is-src index 3703350ad..bc91d6666 100755 --- a/tests/cp/backup-is-src +++ b/tests/cp/backup-is-src @@ -37,4 +37,4 @@ EOF compare out2 exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/cp-HL b/tests/cp/cp-HL index bdc34d9a5..09257fb00 100755 --- a/tests/cp/cp-HL +++ b/tests/cp/cp-HL @@ -42,4 +42,4 @@ cat dest-dir/src-dir/slink > /dev/null 2>&1 && fail=1 # FIXME: test -L, too. -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/cp-a-selinux b/tests/cp/cp-a-selinux index 03d515399..2f4af3593 100755 --- a/tests/cp/cp-a-selinux +++ b/tests/cp/cp-a-selinux @@ -80,4 +80,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/cp-deref b/tests/cp/cp-deref index 89584502c..1f7edd8ea 100755 --- a/tests/cp/cp-deref +++ b/tests/cp/cp-deref @@ -36,4 +36,4 @@ cp -RL a b d || fail=1 test -d a/c || fail=1 test -d b/c || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/cp-i b/tests/cp/cp-i index a248eaa9e..94284bee7 100755 --- a/tests/cp/cp-i +++ b/tests/cp/cp-i @@ -31,4 +31,4 @@ fail=0 # coreutils 6.2 cp would neglect to prompt in this case. echo n | cp -iR a b 2>/dev/null || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/cp-mv-backup b/tests/cp/cp-mv-backup index 4280e481a..a8c55c9b3 100755 --- a/tests/cp/cp-mv-backup +++ b/tests/cp/cp-mv-backup @@ -94,4 +94,4 @@ sed 's/: x/:/' $expected-tmp |cat $expected-tmp - > $expected compare $expected $actual || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/cp-parents b/tests/cp/cp-parents index e936f59be..bfaf747a0 100755 --- a/tests/cp/cp-parents +++ b/tests/cp/cp-parents @@ -61,4 +61,4 @@ p=`ls -ld g/sym|cut -b-10`; case $p in drwx-w--w-);; *) fail=1;; esac p=`ls -ld e/d/a/b/c|cut -b-10`; case $p in drwxr-xr-x);; *) fail=1;; esac p=`ls -ld g/sym/b/c|cut -b-10`; case $p in drwxr-xr-x);; *) fail=1;; esac -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/deref-slink b/tests/cp/deref-slink index d2e953752..112802745 100755 --- a/tests/cp/deref-slink +++ b/tests/cp/deref-slink @@ -30,4 +30,4 @@ ln -s slink-target slink || framework_failure fail=0 cp -d f slink || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/dir-rm-dest b/tests/cp/dir-rm-dest index c97e709f2..4e540bc7a 100755 --- a/tests/cp/dir-rm-dest +++ b/tests/cp/dir-rm-dest @@ -32,4 +32,4 @@ cp -R --remove-destination d e || fail=1 # ...and again, with an existing destination. cp -R --remove-destination d e || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/dir-slash b/tests/cp/dir-slash index 0e591cedb..db6e17cb9 100755 --- a/tests/cp/dir-slash +++ b/tests/cp/dir-slash @@ -37,4 +37,4 @@ test -r dir2/file && fail=1 test -r dir2/dir1/file || fail=1 test -r dir1/file || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/dir-vs-file b/tests/cp/dir-vs-file index 317c69a9c..50b940a43 100755 --- a/tests/cp/dir-vs-file +++ b/tests/cp/dir-vs-file @@ -35,4 +35,4 @@ cp -R dir file 2>/dev/null && fail=1 # In 4.0.35, it was. test -f file || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/existing-perm-race b/tests/cp/existing-perm-race index d428e99bf..d1bc76845 100755 --- a/tests/cp/existing-perm-race +++ b/tests/cp/existing-perm-race @@ -89,4 +89,4 @@ case $mode in *) fail=1;; esac -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/fail-perm b/tests/cp/fail-perm index f2dabd155..bf37ee8d1 100755 --- a/tests/cp/fail-perm +++ b/tests/cp/fail-perm @@ -61,4 +61,4 @@ compare out exp || fail=1 chmod 700 D -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/file-perm-race b/tests/cp/file-perm-race index 1b6eff6bf..9745a1476 100755 --- a/tests/cp/file-perm-race +++ b/tests/cp/file-perm-race @@ -57,4 +57,4 @@ esac wait $cp_pid || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/into-self b/tests/cp/into-self index 53dfe5697..ee3fcf5fd 100755 --- a/tests/cp/into-self +++ b/tests/cp/into-self @@ -42,4 +42,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/link b/tests/cp/link index a1cf92622..20b2eed0d 100755 --- a/tests/cp/link +++ b/tests/cp/link @@ -33,4 +33,4 @@ fail=0 cp -f --link src dest || fail=1 cp -f --symbolic-link src dest2 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/link-no-deref b/tests/cp/link-no-deref index 3ff16e036..561aa6a2b 100755 --- a/tests/cp/link-no-deref +++ b/tests/cp/link-no-deref @@ -31,4 +31,4 @@ fail=0 # with link being applied to the dangling symlink. cp --link --no-dereference dangling-slink d2 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/link-preserve b/tests/cp/link-preserve index 0dd96f05e..309c05121 100755 --- a/tests/cp/link-preserve +++ b/tests/cp/link-preserve @@ -87,4 +87,4 @@ test "$mode" = "-rwx------" || fail=1 umask 022 # -------------------------------------- -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/no-deref-link1 b/tests/cp/no-deref-link1 index e92c40cc3..f18ae0374 100755 --- a/tests/cp/no-deref-link1 +++ b/tests/cp/no-deref-link1 @@ -41,4 +41,4 @@ test $? = 1 || fail=1 test "`cat a/foo`" = $msg || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/no-deref-link2 b/tests/cp/no-deref-link2 index 20b87fc98..8fbf9bff8 100755 --- a/tests/cp/no-deref-link2 +++ b/tests/cp/no-deref-link2 @@ -41,4 +41,4 @@ test $? = 1 || fail=1 test "`cat a`" = $msg || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/no-deref-link3 b/tests/cp/no-deref-link3 index 32966ca0e..a177bacf2 100755 --- a/tests/cp/no-deref-link3 +++ b/tests/cp/no-deref-link3 @@ -38,4 +38,4 @@ test $? = 1 || fail=1 test "`cat a`" = $msg || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/parent-perm b/tests/cp/parent-perm index a7da5e2e0..01ca2b811 100755 --- a/tests/cp/parent-perm +++ b/tests/cp/parent-perm @@ -53,4 +53,4 @@ for dir in a a/b a/b/d; do fail=1 done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/parent-perm-race b/tests/cp/parent-perm-race index c84f2e9f3..196a40549 100755 --- a/tests/cp/parent-perm-race +++ b/tests/cp/parent-perm-race @@ -64,4 +64,4 @@ do wait $cp_pid || fail=1 done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/perm b/tests/cp/perm index aed3a722b..8073ac005 100755 --- a/tests/cp/perm +++ b/tests/cp/perm @@ -75,4 +75,4 @@ for u in 31 37 2; do done done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/preserve-2 b/tests/cp/preserve-2 index 667b50392..19cb5fd9c 100755 --- a/tests/cp/preserve-2 +++ b/tests/cp/preserve-2 @@ -29,4 +29,4 @@ fail=0 cp --preserve=mode,links f g || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/preserve-gid b/tests/cp/preserve-gid index d7f86e030..2fb738438 100755 --- a/tests/cp/preserve-gid +++ b/tests/cp/preserve-gid @@ -42,7 +42,7 @@ t0() { : else echo "$0: $* $f b: $u $g != $s" 1>&2 - (exit 1); exit 1 + Exit 1 fi fi } @@ -103,4 +103,4 @@ t1 c0 "$nameless_uid" "$nameless_gid1" cp -p t1 c1 "$nameless_uid" "$nameless_gid2" cp -p fail=0 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/proc-zero-len b/tests/cp/proc-zero-len index 33e5802a5..586720a68 100755 --- a/tests/cp/proc-zero-len +++ b/tests/cp/proc-zero-len @@ -42,4 +42,4 @@ test -s exp && { rm -f exp; echo nonempty > exp; } compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/r-vs-symlink b/tests/cp/r-vs-symlink index 08070f7d9..8596bb729 100755 --- a/tests/cp/r-vs-symlink +++ b/tests/cp/r-vs-symlink @@ -43,4 +43,4 @@ case $mode in *) fail=1;; esac -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/same-file b/tests/cp/same-file index e5cc8237e..32bdc2a6e 100755 --- a/tests/cp/same-file +++ b/tests/cp/same-file @@ -225,4 +225,4 @@ fail=0; compare $expected $actual 1>&2 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/slink-2-slink b/tests/cp/slink-2-slink index c86a251dd..4fc0ef50a 100755 --- a/tests/cp/slink-2-slink +++ b/tests/cp/slink-2-slink @@ -34,4 +34,4 @@ fail=0 cp --update --no-dereference a b || fail=1 cp --update --no-dereference c d || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/sparse b/tests/cp/sparse index 2c2024ce3..e07f05130 100755 --- a/tests/cp/sparse +++ b/tests/cp/sparse @@ -38,4 +38,4 @@ cp --sparse=always sparse copy || fail=1 # Ensure that the copy has the same block count as the original. test `stat --printf %b copy` -le `stat --printf %b sparse` || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/special-bits b/tests/cp/special-bits index c75fb5014..ef7755bd4 100755 --- a/tests/cp/special-bits +++ b/tests/cp/special-bits @@ -52,4 +52,4 @@ set _ `ls -l c`; shift; p1=$1 set _ `ls -l c2`; shift; p2=$1 test $p1 = $p2 && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/special-f b/tests/cp/special-f index 054ad70b4..0556f01a7 100755 --- a/tests/cp/special-f +++ b/tests/cp/special-f @@ -37,4 +37,4 @@ cp -R fifo e || fail=1 cp -Rf fifo e || fail=1 test -p fifo || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/src-base-dot b/tests/cp/src-base-dot index 09aedb21f..5552944bb 100755 --- a/tests/cp/src-base-dot +++ b/tests/cp/src-base-dot @@ -34,4 +34,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/symlink-slash b/tests/cp/symlink-slash index 893a413e7..16b1c2669 100755 --- a/tests/cp/symlink-slash +++ b/tests/cp/symlink-slash @@ -38,4 +38,4 @@ set `ls -l s` # call and so cp ends up dereferencing the symlink and copying the directory. test "$*" = 'total 0' && : || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/cp/thru-dangling b/tests/cp/thru-dangling index 7caeed33b..d7bffd8e0 100755 --- a/tests/cp/thru-dangling +++ b/tests/cp/thru-dangling @@ -43,4 +43,4 @@ cat no-such >> out || fail=1 compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/dd/misc b/tests/dd/misc index 04318f08a..4fdebc2cd 100755 --- a/tests/dd/misc +++ b/tests/dd/misc @@ -98,4 +98,4 @@ compare err_ok err || fail=1 test $fail -eq 0 && fail=$warn -(exit $fail); exit $fail +Exit $fail diff --git a/tests/dd/not-rewound b/tests/dd/not-rewound index b0bdf120e..8c811811e 100755 --- a/tests/dd/not-rewound +++ b/tests/dd/not-rewound @@ -33,4 +33,4 @@ case `cat out` in *) fail=1 ;; esac -(exit $fail); exit $fail +Exit $fail diff --git a/tests/dd/skip-seek2 b/tests/dd/skip-seek2 index 1381305f9..c831c85aa 100755 --- a/tests/dd/skip-seek2 +++ b/tests/dd/skip-seek2 @@ -40,4 +40,4 @@ case `cat out` in *) fail=1 ;; esac -(exit $fail); exit $fail +Exit $fail diff --git a/tests/dd/unblock-sync b/tests/dd/unblock-sync index b66653340..2adcbb7fd 100755 --- a/tests/dd/unblock-sync +++ b/tests/dd/unblock-sync @@ -37,4 +37,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/df/total b/tests/df/total index 186bf8de3..6d8266386 100755 --- a/tests/df/total +++ b/tests/df/total @@ -39,4 +39,4 @@ $EGREP "$RE_TOTAL" tmp && fail=1 df --total | $EGREP "$RE_TOTAL" || fail=1 df -i --total | $EGREP "$RE_TOTAL" || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/df/total-awk b/tests/df/total-awk index d569f26df..a10a03daf 100755 --- a/tests/df/total-awk +++ b/tests/df/total-awk @@ -77,4 +77,4 @@ $AWK -f compute_sum.awk tmp > out1 || fail=1 $AWK -f parse_total.awk tmp > out2 || fail=1 compare out1 out2 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/2g b/tests/du/2g index 6a7463c02..44592f942 100755 --- a/tests/du/2g +++ b/tests/du/2g @@ -70,4 +70,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/8gb b/tests/du/8gb index 49989d1f2..bdeeb070f 100755 --- a/tests/du/8gb +++ b/tests/du/8gb @@ -55,4 +55,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/basic b/tests/du/basic index 837ec92d5..94e62a838 100755 --- a/tests/du/basic +++ b/tests/du/basic @@ -91,4 +91,4 @@ EOF compare out exp || fail=1 fi -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/deref b/tests/du/deref index facdf426b..08606c0e3 100755 --- a/tests/du/deref +++ b/tests/du/deref @@ -34,4 +34,4 @@ fail=0 # du: `b': No such file or directory du -sD slink b > /dev/null 2>&1 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/deref-args b/tests/du/deref-args index 02bdf7d55..ee5499ccf 100755 --- a/tests/du/deref-args +++ b/tests/du/deref-args @@ -50,4 +50,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/exclude b/tests/du/exclude index 1e32b60f3..e6fd68f48 100755 --- a/tests/du/exclude +++ b/tests/du/exclude @@ -60,4 +60,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/fd-leak b/tests/du/fd-leak index 14df938d3..a35ee24b8 100755 --- a/tests/du/fd-leak +++ b/tests/du/fd-leak @@ -45,4 +45,4 @@ fail=0 # With coreutils-5.0, this would fail due to a file descriptor leak. du $f > out || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/hard-link b/tests/du/hard-link index f4fdf2616..d58adbe44 100755 --- a/tests/du/hard-link +++ b/tests/du/hard-link @@ -50,4 +50,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/inacc-dest b/tests/du/inacc-dest index b0ea4d677..4f66f8be2 100755 --- a/tests/du/inacc-dest +++ b/tests/du/inacc-dest @@ -58,4 +58,4 @@ sed 's,cannot access,cannot read directory,' out > t && mv t out compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/inacc-dir b/tests/du/inacc-dir index 3b5fa5088..f3b0a46c6 100755 --- a/tests/du/inacc-dir +++ b/tests/du/inacc-dir @@ -44,4 +44,4 @@ du -k a > out 2> /dev/null && fail=1 compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/inaccessible-cwd b/tests/du/inaccessible-cwd index 70e83a1f9..9ee647838 100755 --- a/tests/du/inaccessible-cwd +++ b/tests/du/inaccessible-cwd @@ -37,4 +37,4 @@ fail=0 du "$cwd/a" > /dev/null || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/long-from-unreadable b/tests/du/long-from-unreadable index fdaf91ab4..5d9ce7c8e 100755 --- a/tests/du/long-from-unreadable +++ b/tests/du/long-from-unreadable @@ -68,4 +68,4 @@ chmod 0 . || framework_failure fail=0 du -s "$cwd/$dir" > /dev/null || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/long-sloop b/tests/du/long-sloop index 31aac1fe5..5d430252e 100755 --- a/tests/du/long-sloop +++ b/tests/du/long-sloop @@ -74,4 +74,4 @@ echo "du: cannot access: $too_many" > exp || fail=1 compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/no-deref b/tests/du/no-deref index 8d8bc6c68..d1ce5931d 100755 --- a/tests/du/no-deref +++ b/tests/du/no-deref @@ -35,4 +35,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/no-x b/tests/du/no-x index 5569b5d19..b4d6fad77 100755 --- a/tests/du/no-x +++ b/tests/du/no-x @@ -51,4 +51,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/one-file-system b/tests/du/one-file-system index 82081c6da..e944d1d06 100755 --- a/tests/du/one-file-system +++ b/tests/du/one-file-system @@ -42,4 +42,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/restore-wd b/tests/du/restore-wd index b716b4112..07c648c37 100755 --- a/tests/du/restore-wd +++ b/tests/du/restore-wd @@ -33,4 +33,4 @@ fail=0 du a b > out || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/slash b/tests/du/slash index d433a9235..c2d2cc382 100755 --- a/tests/du/slash +++ b/tests/du/slash @@ -35,4 +35,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/slink b/tests/du/slink index 588c4df32..5bf0349cb 100755 --- a/tests/du/slink +++ b/tests/du/slink @@ -59,4 +59,4 @@ du -a $symlinks > out || fail=1 # Require that at least one of these symlinks has a non-zero size. grep '^[1-9]' out > /dev/null || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/trailing-slash b/tests/du/trailing-slash index 92de5d45c..296ad7d4e 100755 --- a/tests/du/trailing-slash +++ b/tests/du/trailing-slash @@ -49,4 +49,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/du/two-args b/tests/du/two-args index 2b25bf535..b5d67b4b8 100755 --- a/tests/du/two-args +++ b/tests/du/two-args @@ -42,4 +42,4 @@ du $t/1 $t/2 > /dev/null || fail=1 du . $t > /dev/null || fail=1 du .. $t > /dev/null || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/install/basic-1 b/tests/install/basic-1 index 31f321545..09c8d4437 100755 --- a/tests/install/basic-1 +++ b/tests/install/basic-1 @@ -126,4 +126,4 @@ ginstall: creating directory `sub3/a/b/c' `file' -> `sub3/a/b/c/file' EOF -(exit $fail); exit $fail +Exit $fail diff --git a/tests/install/create-leading b/tests/install/create-leading index 3e6079245..55d20eb2e 100755 --- a/tests/install/create-leading +++ b/tests/install/create-leading @@ -37,4 +37,4 @@ ginstall -D $file no-dir1/no-dir2/dest || fail=1 test -d no-dir1/no-dir2 || fail=1 test -r no-dir1/no-dir2/dest || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/install/d-slashdot b/tests/install/d-slashdot index 057c7bef2..e02e2c6b1 100755 --- a/tests/install/d-slashdot +++ b/tests/install/d-slashdot @@ -31,4 +31,4 @@ test -d d1 || fail=1 ginstall -d d2/.. || fail=1 test -d d2 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/install/strip-program b/tests/install/strip-program index 57597fcd3..98f7febea 100755 --- a/tests/install/strip-program +++ b/tests/install/strip-program @@ -38,4 +38,4 @@ echo aBc > exp || fail=1 ginstall src dest -s --strip-program=./b || fail=1 compare dest exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/install/trap b/tests/install/trap index 5b2b115e1..f03899fe9 100755 --- a/tests/install/trap +++ b/tests/install/trap @@ -35,4 +35,4 @@ fail=0 exec ginstall -s "$abs_top_builddir/src/ginstall$EXEEXT" . ) -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ln/backup-1 b/tests/ln/backup-1 index f796f3abf..0aff4f3d9 100755 --- a/tests/ln/backup-1 +++ b/tests/ln/backup-1 @@ -31,4 +31,4 @@ touch a b || framework_failure ln b b~ || fail=1 ln -f --b=simple a b || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ln/hard-backup b/tests/ln/hard-backup index 90f8cd85b..c02b265b6 100755 --- a/tests/ln/hard-backup +++ b/tests/ln/hard-backup @@ -34,4 +34,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ln/misc b/tests/ln/misc index f8ec46fca..a4a925407 100755 --- a/tests/ln/misc +++ b/tests/ln/misc @@ -149,4 +149,4 @@ ln foo '' 2> /dev/null # =================================================== -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ln/sf-1 b/tests/ln/sf-1 index 2dd3d8c2e..d00df6e02 100755 --- a/tests/ln/sf-1 +++ b/tests/ln/sf-1 @@ -34,4 +34,4 @@ case `cat err` in *) fail=1 ;; esac -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ln/target-1 b/tests/ln/target-1 index e60106c7f..d088e2417 100755 --- a/tests/ln/target-1 +++ b/tests/ln/target-1 @@ -32,4 +32,4 @@ mkdir d || framework_failure fail=0 ln -s --target-dir=d ../f || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/capability b/tests/ls/capability index fcd3c2ad3..f064348ef 100755 --- a/tests/ls/capability +++ b/tests/ls/capability @@ -40,4 +40,4 @@ LS_COLORS="ca=$code" \ printf "\033[0m\033[${code}mtest\033[0m\n\033[m" > out_ok || fail=1 compare out out_ok || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/color-dtype-dir b/tests/ls/color-dtype-dir index 37b40c459..6664d3bee 100755 --- a/tests/ls/color-dtype-dir +++ b/tests/ls/color-dtype-dir @@ -50,4 +50,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/dangle b/tests/ls/dangle index 942b45a8b..08a73b9f5 100755 --- a/tests/ls/dangle +++ b/tests/ls/dangle @@ -50,4 +50,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/dired b/tests/ls/dired index 3d96852c0..57b67b9c1 100755 --- a/tests/ls/dired +++ b/tests/ls/dired @@ -37,4 +37,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/file-type b/tests/ls/file-type index 1dfc303f4..01daeafeb 100755 --- a/tests/ls/file-type +++ b/tests/ls/file-type @@ -67,4 +67,4 @@ compare out3 exp3 || fail=1 ls --color=auto -F sub > out || fail=1 compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/follow-slink b/tests/ls/follow-slink index e0468de23..651ad8a50 100755 --- a/tests/ls/follow-slink +++ b/tests/ls/follow-slink @@ -63,4 +63,4 @@ EOF compare out-L exp-L || fail=1 compare out-FLR-sub exp-FLR-sub || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/infloop b/tests/ls/infloop index 6476e25c3..8ce145d93 100755 --- a/tests/ls/infloop +++ b/tests/ls/infloop @@ -44,4 +44,4 @@ EOF # Make sure we don't get the "bad" output. compare out bad > /dev/null 2>&1 && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/inode b/tests/ls/inode index dea2b2849..b5ddc8c9a 100755 --- a/tests/ls/inode +++ b/tests/ls/inode @@ -67,4 +67,4 @@ test $# = 4 || fail=1 # With -H, they must be different from inside a directory. test "$1" != "$3" || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/m-option b/tests/ls/m-option index 15495879e..cd0bc8a45 100755 --- a/tests/ls/m-option +++ b/tests/ls/m-option @@ -42,4 +42,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/nameless-uid b/tests/ls/nameless-uid index d5fa7f129..3cfc5880f 100755 --- a/tests/ls/nameless-uid +++ b/tests/ls/nameless-uid @@ -41,4 +41,4 @@ fail=0 set -- `ls -o f` || fail=1 test $3 = $nameless_uid || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/no-arg b/tests/ls/no-arg index cd9dd380c..e3ccb9910 100755 --- a/tests/ls/no-arg +++ b/tests/ls/no-arg @@ -58,4 +58,4 @@ ls -R1 > out || fail=1 compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/proc-selinux-segfault b/tests/ls/proc-selinux-segfault index 1a31ece30..a37275788 100755 --- a/tests/ls/proc-selinux-segfault +++ b/tests/ls/proc-selinux-segfault @@ -29,4 +29,4 @@ test -r $f || f=. fail=0 ls -l $f > out || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/recursive b/tests/ls/recursive index 158b9ced3..e6f1e58b3 100755 --- a/tests/ls/recursive +++ b/tests/ls/recursive @@ -64,4 +64,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/rt-1 b/tests/ls/rt-1 index 1a131761c..d4fd2ca11 100755 --- a/tests/ls/rt-1 +++ b/tests/ls/rt-1 @@ -50,4 +50,4 @@ a EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/stat-dtype b/tests/ls/stat-dtype index 7e7dcb9c7..bca2bfc10 100755 --- a/tests/ls/stat-dtype +++ b/tests/ls/stat-dtype @@ -63,4 +63,4 @@ printf 'a2345/\tb/\n' > exp || fail=1 compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/stat-failed b/tests/ls/stat-failed index be9a78094..949fa24c6 100755 --- a/tests/ls/stat-failed +++ b/tests/ls/stat-failed @@ -54,4 +54,4 @@ EOF sed 's/^ l/ ?/' out | compare - exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/stat-free-symlinks b/tests/ls/stat-free-symlinks index be4d49048..e5ad6dcf1 100755 --- a/tests/ls/stat-free-symlinks +++ b/tests/ls/stat-free-symlinks @@ -52,4 +52,4 @@ grep '^stat("x"' err && fail=1 compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/stat-vs-dirent b/tests/ls/stat-vs-dirent index f105e2f3b..2c3b064db 100755 --- a/tests/ls/stat-vs-dirent +++ b/tests/ls/stat-vs-dirent @@ -64,4 +64,4 @@ while :; do test $dev_ino = $root_dev_ino && break done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/symlink-slash b/tests/ls/symlink-slash index 4315b063b..6b18bfe70 100755 --- a/tests/ls/symlink-slash +++ b/tests/ls/symlink-slash @@ -32,4 +32,4 @@ set `ls -l symlink/` # Prior to fileutils-4.0k, the following would have output `... symlink -> dir'. test "$*" = 'total 0' && : || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/ls/x-option b/tests/ls/x-option index b47960007..7f479d0c8 100755 --- a/tests/ls/x-option +++ b/tests/ls/x-option @@ -39,4 +39,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/arch b/tests/misc/arch index 1661d6c60..781cca6e4 100755 --- a/tests/misc/arch +++ b/tests/misc/arch @@ -36,4 +36,4 @@ uname -m > exp || fail=1 compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/cat-proc b/tests/misc/cat-proc index 8fa3f56ac..791b7d403 100755 --- a/tests/misc/cat-proc +++ b/tests/misc/cat-proc @@ -40,4 +40,4 @@ cat $f | sed 's/[0-9][0-9]*/D/g' | tr -d '$' > exp || fail=1 compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/chcon b/tests/misc/chcon index fefe0ec46..723bfd0f3 100755 --- a/tests/misc/chcon +++ b/tests/misc/chcon @@ -64,4 +64,4 @@ chcon --verbose -u$u1 f > out || fail=1 echo 'changing security context of `f'\' > exp compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/chcon-fail b/tests/misc/chcon-fail index d9bac7c85..a9efbff75 100755 --- a/tests/misc/chcon-fail +++ b/tests/misc/chcon-fail @@ -24,4 +24,4 @@ chcon --reference=f 2> /dev/null && fail=1 # No file chcon -u anyone 2> /dev/null && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/close-stdout b/tests/misc/close-stdout index ede75205f..261a3834d 100755 --- a/tests/misc/close-stdout +++ b/tests/misc/close-stdout @@ -59,4 +59,4 @@ if test -w /dev/full && test -c /dev/full; then cp --verbose a b >/dev/full 2>/dev/null && fail=1 fi -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/csplit b/tests/misc/csplit index 9997860e1..2d27daa07 100755 --- a/tests/misc/csplit +++ b/tests/misc/csplit @@ -90,4 +90,4 @@ printf 'x%8199s\nx\n%8199s\nx\n' x x > in csplit in '/x\{1\}/' '{*}' > /dev/null || fail=1 cat xx?? | compare - in || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/date-sec b/tests/misc/date-sec index dea183513..2bb69cfb8 100755 --- a/tests/misc/date-sec +++ b/tests/misc/date-sec @@ -51,4 +51,4 @@ case "$s" in *) fail=1;; esac -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/df b/tests/misc/df index bb895e7fa..9f0bfc300 100755 --- a/tests/misc/df +++ b/tests/misc/df @@ -31,4 +31,4 @@ case `df .` in fail=1;; esac -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/df-P b/tests/misc/df-P index 8024864ce..a6dcf9c7e 100755 --- a/tests/misc/df-P +++ b/tests/misc/df-P @@ -39,4 +39,4 @@ head -n1 t2 > out || fail=1 compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/false-status b/tests/misc/false-status index 67191a3fe..be47e27d9 100755 --- a/tests/misc/false-status +++ b/tests/misc/false-status @@ -27,4 +27,4 @@ fail=0 false --version > /dev/null && fail=1 false --help > /dev/null && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/fmt-long-line b/tests/misc/fmt-long-line index 690202338..ae7acf36f 100755 --- a/tests/misc/fmt-long-line +++ b/tests/misc/fmt-long-line @@ -63,4 +63,4 @@ fmt -s in > out || fail=1 compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/groups-dash b/tests/misc/groups-dash index bc132d804..01a507df1 100755 --- a/tests/misc/groups-dash +++ b/tests/misc/groups-dash @@ -33,4 +33,4 @@ echo $? >> exp compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/groups-version b/tests/misc/groups-version index 34dbd3307..1862045f2 100755 --- a/tests/misc/groups-version +++ b/tests/misc/groups-version @@ -30,4 +30,4 @@ id --version | sed '/^$/q' > exp || fail=1 compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/head-c b/tests/misc/head-c index 2b348d2e3..7149028ca 100755 --- a/tests/misc/head-c +++ b/tests/misc/head-c @@ -32,4 +32,4 @@ case "`cat out`" in *) fail=1 ;; esac -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/head-pos b/tests/misc/head-pos index 0c55a879b..2469d6cf2 100755 --- a/tests/misc/head-pos +++ b/tests/misc/head-pos @@ -34,4 +34,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/help-version b/tests/misc/help-version index 8fa7a0b4a..c7bec357d 100755 --- a/tests/misc/help-version +++ b/tests/misc/help-version @@ -41,7 +41,7 @@ expected_failure_status_vdir=2 fail=0 test "$built_programs" \ - || { echo "$this_test: no programs built!?!" 1>&2; (exit $fail); exit $fail; } + || { echo "$this_test: no programs built!?!" 1>&2; Exit $fail; } for lang in C fr da; do for i in $built_programs; do @@ -199,4 +199,4 @@ for i in $built_programs; do rm -rf $tmp_in $tmp_in2 $tmp_out $tmp_dir done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/id-context b/tests/misc/id-context index ea90ec676..0d9e8caa3 100755 --- a/tests/misc/id-context +++ b/tests/misc/id-context @@ -34,4 +34,4 @@ id | grep context= >/dev/null || fail=1 id -nu > /dev/null \ && id $(id -nu) | grep context= >/dev/null && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/ls-time b/tests/misc/ls-time index 07271c601..50c7a4743 100755 --- a/tests/misc/ls-time +++ b/tests/misc/ls-time @@ -92,7 +92,7 @@ In the output below, the date of last access for \`a' should have been $u1. EOF ls --full -lu a - (exit 77); exit 77 + Exit 77 ;; esac @@ -123,4 +123,4 @@ EOF fail=1 fi -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/mknod b/tests/misc/mknod index bb8e02480..4cf7d9fdb 100755 --- a/tests/misc/mknod +++ b/tests/misc/mknod @@ -39,4 +39,4 @@ mkdir -m 734 f3 || fail=1 mode=`ls -dgo f3|cut -b-10` test $mode = drwx-wxr-- || test $mode = drwx-wsr-- || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/nice b/tests/misc/nice index 4fcb80fad..90cfb8f2e 100755 --- a/tests/misc/nice +++ b/tests/misc/nice @@ -80,4 +80,4 @@ while :; do shift; shift; shift done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/nl b/tests/misc/nl index 572e44a33..eefbbb5d7 100755 --- a/tests/misc/nl +++ b/tests/misc/nl @@ -45,4 +45,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/nohup b/tests/misc/nohup index 1b36dbd29..62f87b13f 100755 --- a/tests/misc/nohup +++ b/tests/misc/nohup @@ -105,4 +105,4 @@ EOF nohup >/dev/null 2>&1 test $? = 127 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/od-N b/tests/misc/od-N index 884127ceb..9a452d0ff 100755 --- a/tests/misc/od-N +++ b/tests/misc/od-N @@ -34,4 +34,4 @@ cat <<EOF > exp || fail=1 EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/od-multiple-t b/tests/misc/od-multiple-t index 63fb7e424..2865f1836 100755 --- a/tests/misc/od-multiple-t +++ b/tests/misc/od-multiple-t @@ -44,4 +44,4 @@ done compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/od-x8 b/tests/misc/od-x8 index b52c1ce38..5a17b38fa 100755 --- a/tests/misc/od-x8 +++ b/tests/misc/od-x8 @@ -45,4 +45,4 @@ od -An -t x1 in \ compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/pathchk1 b/tests/misc/pathchk1 index 5b20f077a..f8f8784a0 100755 --- a/tests/misc/pathchk1 +++ b/tests/misc/pathchk1 @@ -40,4 +40,4 @@ pathchk -P '' > /dev/null 2>&1 && fail=1 pathchk -P -- - > /dev/null 2>&1 && fail=1 pathchk -p -P x/- > /dev/null 2>&1 && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/printf b/tests/misc/printf index 78084b3b0..1cc440e2e 100755 --- a/tests/misc/printf +++ b/tests/misc/printf @@ -95,4 +95,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/printf-hex b/tests/misc/printf-hex index 968f66726..3668013c2 100755 --- a/tests/misc/printf-hex +++ b/tests/misc/printf-hex @@ -35,4 +35,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/printf-surprise b/tests/misc/printf-surprise index 3336f12a5..b24e3bef9 100755 --- a/tests/misc/printf-surprise +++ b/tests/misc/printf-surprise @@ -87,4 +87,4 @@ case $n_out:$diagnostic:$exit in *) fail=1;; esac -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/ptx-overrun b/tests/misc/ptx-overrun index 185969118..3c2e04b9d 100755 --- a/tests/misc/ptx-overrun +++ b/tests/misc/ptx-overrun @@ -37,4 +37,4 @@ ptx -S 'foo\' $f < /dev/null >> out || fail=1 ptx -W 'bar\\\' $f < /dev/null >> out || fail=1 compare out empty || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/pwd-long b/tests/misc/pwd-long index 94d4e4c03..427007159 100755 --- a/tests/misc/pwd-long +++ b/tests/misc/pwd-long @@ -116,4 +116,4 @@ EOF fail=$? -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/pwd-unreadable-parent b/tests/misc/pwd-unreadable-parent index 75df827f2..c79daad0c 100755 --- a/tests/misc/pwd-unreadable-parent +++ b/tests/misc/pwd-unreadable-parent @@ -44,4 +44,4 @@ readlink -ev . > out || fail=1 compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/readlink-fp-loop b/tests/misc/readlink-fp-loop index 7ac54b9a9..c03fcb1aa 100755 --- a/tests/misc/readlink-fp-loop +++ b/tests/misc/readlink-fp-loop @@ -70,4 +70,4 @@ readlink -v -e loop 2> out && fail=1 echo "readlink: loop: $symlink_loop_msg" > exp || framework_failure compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/runcon-no-reorder b/tests/misc/runcon-no-reorder index c1705e524..a62795724 100755 --- a/tests/misc/runcon-no-reorder +++ b/tests/misc/runcon-no-reorder @@ -44,4 +44,4 @@ esac compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/selinux b/tests/misc/selinux index 8065182f5..a231fa78f 100755 --- a/tests/misc/selinux +++ b/tests/misc/selinux @@ -49,4 +49,4 @@ for i in d f p; do c=`stat --printf %C s2/$i`; test x$c = x$ctx || fail=1 done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/shred-exact b/tests/misc/shred-exact index d90a80e03..e2917fda9 100755 --- a/tests/misc/shred-exact +++ b/tests/misc/shred-exact @@ -38,4 +38,4 @@ for opt in --exact --zero; do test -f c && fail=1 done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/shred-remove b/tests/misc/shred-remove index a5dc6f12d..3c304f8a3 100755 --- a/tests/misc/shred-remove +++ b/tests/misc/shred-remove @@ -38,4 +38,4 @@ fail=0 # When the command completes, expect it to fail. shred -u $file > /dev/null 2>&1 && fail=1 || : -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/shuf b/tests/misc/shuf index 83530c207..7ec23ca19 100755 --- a/tests/misc/shuf +++ b/tests/misc/shuf @@ -56,4 +56,4 @@ shuf --zero-terminated -i 1-1 > out || fail=1 printf '1\0' > exp || framework_failure cmp out exp || { fail=1; echo "missing NUL terminator?" 1>&2; } -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/sort-compress b/tests/misc/sort-compress index f3c473597..fa1c05a1a 100755 --- a/tests/misc/sort-compress +++ b/tests/misc/sort-compress @@ -73,4 +73,4 @@ rm -f dzip ok PATH=. "$SORT" -S 1k in > out || fail=1 compare exp out || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/sort-rand b/tests/misc/sort-rand index f675c956c..47d4d8527 100755 --- a/tests/misc/sort-rand +++ b/tests/misc/sort-rand @@ -52,4 +52,4 @@ if (locale --version) > /dev/null 2>&1; then compare in out1 || { fail=1; echo "not a permutation with LC_ALL=$locale" 1>&2; } fi -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/sort-version b/tests/misc/sort-version index 3208f2eea..262ee95ce 100755 --- a/tests/misc/sort-version +++ b/tests/misc/sort-version @@ -72,4 +72,4 @@ cat > exp <<- _EOF_ fail=0 sort --sort=version -o out in || fail=1 compare exp out || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/split-a b/tests/misc/split-a index 19f3f0aed..c73063587 100755 --- a/tests/misc/split-a +++ b/tests/misc/split-a @@ -68,4 +68,4 @@ for f in $files; do n=$(expr $n + 1) done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/split-fail b/tests/misc/split-fail index 0334c2d14..0680891b6 100755 --- a/tests/misc/split-fail +++ b/tests/misc/split-fail @@ -75,4 +75,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/split-l b/tests/misc/split-l index 453f1008f..48f4352e6 100755 --- a/tests/misc/split-l +++ b/tests/misc/split-l @@ -44,4 +44,4 @@ compare xab exp-2 || fail=1 compare xac exp-3 || fail=1 test -f xad && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/stat-fmt b/tests/misc/stat-fmt index f169166b1..354eae2ea 100755 --- a/tests/misc/stat-fmt +++ b/tests/misc/stat-fmt @@ -32,4 +32,4 @@ for i in `seq 50`; do test "$out" = "$fmt" || fail=1 done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/stty b/tests/misc/stty index 8216c8e81..c53f6c40a 100755 --- a/tests/misc/stty +++ b/tests/misc/stty @@ -100,4 +100,4 @@ fi stty `cat $saved_state` -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/stty-invalid b/tests/misc/stty-invalid index 302dbe0ec..47531c533 100755 --- a/tests/misc/stty-invalid +++ b/tests/misc/stty-invalid @@ -45,4 +45,4 @@ stty `echo $saved_state |sed 's/:[0-9a-f]*$/:'$hex_2_64/` 2>/dev/null && fail=1 # the state of our tty), try to restore the initial state. stty $saved_state || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/stty-row-col b/tests/misc/stty-row-col index 8ac114336..987e0d597 100755 --- a/tests/misc/stty-row-col +++ b/tests/misc/stty-row-col @@ -81,4 +81,4 @@ done set x $saved_size stty rows $2 columns $3 || exit 1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/sum-sysv b/tests/misc/sum-sysv index 8766449ef..1d337c76f 100755 --- a/tests/misc/sum-sysv +++ b/tests/misc/sum-sysv @@ -54,4 +54,4 @@ cat > exp <<\EOF EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/tac-continue b/tests/misc/tac-continue index ce41a525c..ea2a3eaeb 100755 --- a/tests/misc/tac-continue +++ b/tests/misc/tac-continue @@ -33,7 +33,7 @@ fi if ! test -d "$FULL_PARTITION_TMPDIR"; then echo "$0: $FULL_PARTITION_TMPDIR:" \ "\$FULL_PARTITION_TMPDIR does not specify a directory" 1>&2 - (exit 1); exit 1 + Exit 1 fi fp_tmp="$FULL_PARTITION_TMPDIR/tac-cont-$$" @@ -42,14 +42,14 @@ cleanup_() { rm -f "$fp_tmp"; } # Make sure we can create an empty file there (i.e. no shortage of inodes). if ! touch $fp_tmp; then echo "$0: $fp_tmp: cannot create empty file" 1>&2 - (exit 1); exit 1 + Exit 1 fi # Make sure that we fail when trying to create a file large enough # to consume a non-inode block. if seq 1000 > $fp_tmp 2>/dev/null; then echo "$0: $FULL_PARTITION_TMPDIR: not a full partition" 1>&2 - (exit 1); exit 1 + Exit 1 fi seq 5 > in @@ -72,4 +72,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/tee b/tests/misc/tee index adf0caa0b..ccdf12272 100755 --- a/tests/misc/tee +++ b/tests/misc/tee @@ -36,4 +36,4 @@ for n in 0 $nums; do done done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/tee-dash b/tests/misc/tee-dash index 2564117f1..e57b225a5 100755 --- a/tests/misc/tee-dash +++ b/tests/misc/tee-dash @@ -26,4 +26,4 @@ fi fail=0 tee - </dev/null || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/timeout b/tests/misc/timeout index 8996fbce3..fa964a37e 100755 --- a/tests/misc/timeout +++ b/tests/misc/timeout @@ -41,4 +41,4 @@ timeout 1 false && fail=1 timeout 1 sleep 2 test $? = 124 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/timeout-parameters b/tests/misc/timeout-parameters index e44ff9808..27d6b570a 100755 --- a/tests/misc/timeout-parameters +++ b/tests/misc/timeout-parameters @@ -49,4 +49,4 @@ timeout 1 . && fail=1 # non existant command timeout 1 ... && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/truncate-dangling-symlink b/tests/misc/truncate-dangling-symlink index e16da95de..b71e2bad6 100755 --- a/tests/misc/truncate-dangling-symlink +++ b/tests/misc/truncate-dangling-symlink @@ -30,4 +30,4 @@ truncate -s0 t-symlink || fail=1 test -f truncate-target || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/truncate-dir-fail b/tests/misc/truncate-dir-fail index 3ae918e76..942c6b4cc 100755 --- a/tests/misc/truncate-dir-fail +++ b/tests/misc/truncate-dir-fail @@ -11,4 +11,4 @@ fi # truncate on dir not allowed truncate -s+0 . && fail=1 || fail=0 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/truncate-fail-diag b/tests/misc/truncate-fail-diag index 0c6bb1c57..39091d933 100755 --- a/tests/misc/truncate-fail-diag +++ b/tests/misc/truncate-fail-diag @@ -46,4 +46,4 @@ truncate -s0 $dir > out 2>&1 && fail=1 #truncate: cannot open \`$dir' for writing: Not a directory #truncate: cannot open \`$dir' for writing: Is a directory -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/truncate-fifo b/tests/misc/truncate-fifo index f2decc6aa..d5802c0ca 100755 --- a/tests/misc/truncate-fifo +++ b/tests/misc/truncate-fifo @@ -29,4 +29,4 @@ fail=0 truncate -s0 "fifo" || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/truncate-no-create-missing b/tests/misc/truncate-no-create-missing index bbe8e8559..a5d0e72bb 100755 --- a/tests/misc/truncate-no-create-missing +++ b/tests/misc/truncate-no-create-missing @@ -28,4 +28,4 @@ fail=0 # truncate -c no-such-file should not fail. truncate -s0 -c no-such-file || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/truncate-overflow b/tests/misc/truncate-overflow index 5dbbf38cd..b903244e6 100755 --- a/tests/misc/truncate-overflow +++ b/tests/misc/truncate-overflow @@ -52,4 +52,4 @@ else truncate -s+2147483647 non-empty-file && fail=1 fi -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/truncate-owned-by-other b/tests/misc/truncate-owned-by-other index a7ad27864..708138d75 100755 --- a/tests/misc/truncate-owned-by-other +++ b/tests/misc/truncate-owned-by-other @@ -37,4 +37,4 @@ chmod g+x . setuidgid $NON_ROOT_USERNAME env PATH="$PATH" truncate -s0 root-owned || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/truncate-parameters b/tests/misc/truncate-parameters index 27a22a91f..4489ed405 100755 --- a/tests/misc/truncate-parameters +++ b/tests/misc/truncate-parameters @@ -46,4 +46,4 @@ truncate --size=" >1" file || fail=1 #file now 1 truncate --size=" +1" file || fail=1 #file now 2 test $(stat --format %s file) = 2 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/truncate-relative b/tests/misc/truncate-relative index dedb76fd8..cee49b4f4 100755 --- a/tests/misc/truncate-relative +++ b/tests/misc/truncate-relative @@ -37,4 +37,4 @@ truncate --size="/0" file && fail=1 # division by zero truncate --size="%0" file && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/misc/wc-files0 b/tests/misc/wc-files0 index aa2221e86..115012190 100755 --- a/tests/misc/wc-files0 +++ b/tests/misc/wc-files0 @@ -45,4 +45,4 @@ if test "$fail" = ''; then compare out exp || fail=1 fi -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mkdir/p-1 b/tests/mkdir/p-1 index 85a2458e6..2039513f5 100755 --- a/tests/mkdir/p-1 +++ b/tests/mkdir/p-1 @@ -27,4 +27,4 @@ fail=0 mkdir --parents "`pwd`/t" || fail=1 test -d t || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mkdir/p-2 b/tests/mkdir/p-2 index 7daf0b5fa..22b7615db 100755 --- a/tests/mkdir/p-2 +++ b/tests/mkdir/p-2 @@ -27,4 +27,4 @@ fail=0 mkdir --parents "`pwd`/t/u" || fail=1 test -d t/u || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mkdir/p-3 b/tests/mkdir/p-3 index 54052f171..45e1a0a59 100755 --- a/tests/mkdir/p-3 +++ b/tests/mkdir/p-3 @@ -52,4 +52,4 @@ b=`ls "$p/a" | tr -d '\n'` # With coreutils-5.3.0, this would fail with $b=bu. test "x$b" = xb || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mkdir/p-slashdot b/tests/mkdir/p-slashdot index d2c3f983c..d7b5dfa91 100755 --- a/tests/mkdir/p-slashdot +++ b/tests/mkdir/p-slashdot @@ -31,4 +31,4 @@ test -d d1 || fail=1 mkdir -p d2/.. || fail=1 test -d d2 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mkdir/p-thru-slink b/tests/mkdir/p-thru-slink index accdc7985..6321fc9ee 100755 --- a/tests/mkdir/p-thru-slink +++ b/tests/mkdir/p-thru-slink @@ -29,4 +29,4 @@ fail=0 mkdir -p slink/x || fail=1 test -d x || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mkdir/p-v b/tests/mkdir/p-v index 27696b52d..8e085949c 100755 --- a/tests/mkdir/p-v +++ b/tests/mkdir/p-v @@ -34,4 +34,4 @@ mkdir: created directory `foo/a/b/c' mkdir: created directory `foo/a/b/c/d' EOF -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mkdir/parents b/tests/mkdir/parents index 5433ee0b8..46f5867d3 100755 --- a/tests/mkdir/parents +++ b/tests/mkdir/parents @@ -53,4 +53,4 @@ p=`ls -ld a/b/c|cut -b-10`; case $p in drwx------);; *) fail=1;; esac # `d's perms are determined by the -m argument. p=`ls -ld a/b/c/d|cut -b-10`; case $p in $d_mode_str);; *) fail=1;; esac -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mkdir/perm b/tests/mkdir/perm index 4fa9b5604..2f8715b47 100755 --- a/tests/mkdir/perm +++ b/tests/mkdir/perm @@ -85,4 +85,4 @@ for p in empty -p; do done done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mkdir/selinux b/tests/mkdir/selinux index 4a01a4330..a81689a80 100755 --- a/tests/mkdir/selinux +++ b/tests/mkdir/selinux @@ -56,4 +56,4 @@ for cmd_w_arg in 'mkdir dir' 'mknod b p' 'mkfifo f'; do compare out exp || fail=1 done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mkdir/special-1 b/tests/mkdir/special-1 index 9d13cbad9..7a1c185c4 100755 --- a/tests/mkdir/special-1 +++ b/tests/mkdir/special-1 @@ -52,4 +52,4 @@ case "$mode" in *) fail=1 ;; esac -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mkdir/t-slash b/tests/mkdir/t-slash index e95b0529b..4de4459ee 100755 --- a/tests/mkdir/t-slash +++ b/tests/mkdir/t-slash @@ -33,4 +33,4 @@ test -d dir || fail=1 mkdir d2/ || fail=1 test -d d2 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mkdir/writable-under-readonly b/tests/mkdir/writable-under-readonly index 1057b445b..f6de62144 100755 --- a/tests/mkdir/writable-under-readonly +++ b/tests/mkdir/writable-under-readonly @@ -54,4 +54,4 @@ mkdir -p mnt-ro/rw/sub || fail=1 umount /tmp/2 umount /tmp/1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/acl b/tests/mv/acl index e9121a59b..f596ff7dc 100755 --- a/tests/mv/acl +++ b/tests/mv/acl @@ -69,4 +69,4 @@ mv dir2 $other_partition_tmpdir || fail=1 acl2=`cd $other_partition_tmpdir && getfacl dir2` || framework_failure test "$acl1" = "$acl2" || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/atomic b/tests/mv/atomic index b360e13eb..3f731a5cb 100755 --- a/tests/mv/atomic +++ b/tests/mv/atomic @@ -46,4 +46,4 @@ ls -dl s1 > /dev/null 2>&1 && fail=1 # Ensure that the destination, s2, contains the link from s1. test "`readlink s2`" = t1 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/atomic2 b/tests/mv/atomic2 index 796d9c499..3a4ee7612 100755 --- a/tests/mv/atomic2 +++ b/tests/mv/atomic2 @@ -47,4 +47,4 @@ ls -dl a > /dev/null 2>&1 && fail=1 n_links=`stat --printf=%h b` || fail=1 test "$n_links" = 1 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/backup-dir b/tests/mv/backup-dir index 28876a007..36c4bb0da 100755 --- a/tests/mv/backup-dir +++ b/tests/mv/backup-dir @@ -36,4 +36,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/backup-is-src b/tests/mv/backup-is-src index eee4fd9d8..70b1e96aa 100755 --- a/tests/mv/backup-is-src +++ b/tests/mv/backup-is-src @@ -47,4 +47,4 @@ EOF compare out2 exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/childproof b/tests/mv/childproof index dffdf40c1..2067bd81c 100755 --- a/tests/mv/childproof +++ b/tests/mv/childproof @@ -86,4 +86,4 @@ test `stat --format %i a/f` = `stat --format %i c/f` || fail=1 # b/f and c/f must not be linked test `stat --format %i b/f` = `stat --format %i c/f` && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/diag b/tests/mv/diag index ef25d8092..446fc34bf 100755 --- a/tests/mv/diag +++ b/tests/mv/diag @@ -50,4 +50,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/dir-file b/tests/mv/dir-file index 38217e0f3..82c0c21b4 100755 --- a/tests/mv/dir-file +++ b/tests/mv/dir-file @@ -32,4 +32,4 @@ fail=0 mv dir file > /dev/null 2>&1 && fail=1 mv file dir > /dev/null 2>&1 && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/dir2dir b/tests/mv/dir2dir index 9a038814a..8e260a777 100755 --- a/tests/mv/dir2dir +++ b/tests/mv/dir2dir @@ -44,4 +44,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/dup-source b/tests/mv/dup-source index d7b56e854..398d877dc 100755 --- a/tests/mv/dup-source +++ b/tests/mv/dup-source @@ -68,4 +68,4 @@ EOF compare out exp || fail=1 done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/force b/tests/mv/force index f2eaf918e..912354ee8 100755 --- a/tests/mv/force +++ b/tests/mv/force @@ -43,4 +43,4 @@ test `cat $ff` = force-contents || fail=1 # device and inodes are the same. mv $ff $ff2 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/hard-2 b/tests/mv/hard-2 index aaf9349af..6451a1cae 100755 --- a/tests/mv/hard-2 +++ b/tests/mv/hard-2 @@ -79,4 +79,4 @@ ic=`ls -i c|sed 's/ c//'` test $ia = $ib || fail=1 test $ia = $ic || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/hard-3 b/tests/mv/hard-3 index a2fa4e759..e476c9d30 100755 --- a/tests/mv/hard-3 +++ b/tests/mv/hard-3 @@ -71,4 +71,4 @@ test "$ia" = "$ic" || fail=1 ib=`ls -i x/b` || fail=1; set x $ib; ib=$2 test "$ia" = "$ib" && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/hard-4 b/tests/mv/hard-4 index 881cab518..e11914a1f 100755 --- a/tests/mv/hard-4 +++ b/tests/mv/hard-4 @@ -40,4 +40,4 @@ test -r a && fail=1 test -r b || fail=1 test -r b~ || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/hard-link-1 b/tests/mv/hard-link-1 index 864fd0318..08b3c9252 100755 --- a/tests/mv/hard-link-1 +++ b/tests/mv/hard-link-1 @@ -42,4 +42,4 @@ a=`sed -n 's/ a$//p' out` b=`sed -n 's/ b$//p' out` test "$a" = "$b" || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/hard-verbose b/tests/mv/hard-verbose index 0b4a12903..a558d32bc 100755 --- a/tests/mv/hard-verbose +++ b/tests/mv/hard-verbose @@ -35,4 +35,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/i-2 b/tests/mv/i-2 index 1cc139497..959912a16 100755 --- a/tests/mv/i-2 +++ b/tests/mv/i-2 @@ -57,4 +57,4 @@ test -f g || fail=1 test -f h || fail=1 compare g h || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/i-3 b/tests/mv/i-3 index 9d8b03ecd..b9cd7d9ed 100755 --- a/tests/mv/i-3 +++ b/tests/mv/i-3 @@ -54,4 +54,4 @@ case "`cat out`" in *) fail=1 ;; esac -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/i-4 b/tests/mv/i-4 index 5de59b43b..fcc38df53 100755 --- a/tests/mv/i-4 +++ b/tests/mv/i-4 @@ -51,4 +51,4 @@ mv -i a b < y >/dev/null 2>&1 || fail=1 test -r a && fail=1 test -r b || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/i-5 b/tests/mv/i-5 index da9716888..f8fc8e6a7 100755 --- a/tests/mv/i-5 +++ b/tests/mv/i-5 @@ -31,4 +31,4 @@ fail=0 # coreutils 6.2 mv would neglect to prompt in this case. echo n | mv -i a b 2>/dev/null || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/i-link-no b/tests/mv/i-link-no index b32287259..226d5dd17 100755 --- a/tests/mv/i-link-no +++ b/tests/mv/i-link-no @@ -48,4 +48,4 @@ case "`cat b/foo`" in *) fail=1;; esac -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/into-self b/tests/mv/into-self index 915194f60..428eb174e 100755 --- a/tests/mv/into-self +++ b/tests/mv/into-self @@ -55,4 +55,4 @@ test -d $dir/$dir && fail=1 # Make sure the file has been moved to the right place. test -f $dir/$file || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/into-self-2 b/tests/mv/into-self-2 index 13e996a22..99763d62d 100755 --- a/tests/mv/into-self-2 +++ b/tests/mv/into-self-2 @@ -54,4 +54,4 @@ EOF compare out2 exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/into-self-3 b/tests/mv/into-self-3 index 3b967322f..d1a0710d4 100755 --- a/tests/mv/into-self-3 +++ b/tests/mv/into-self-3 @@ -42,4 +42,4 @@ EOF compare out2 exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/into-self-4 b/tests/mv/into-self-4 index 9f001139f..0a4af7fc9 100755 --- a/tests/mv/into-self-4 +++ b/tests/mv/into-self-4 @@ -36,4 +36,4 @@ mv s s 2> /dev/null && fail=1 # Before 4.0.36, `s' would have been removed. test -f s || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/leak-fd b/tests/mv/leak-fd index 1141b7303..993bbdf0c 100755 --- a/tests/mv/leak-fd +++ b/tests/mv/leak-fd @@ -57,4 +57,4 @@ rm .dirs out=$(ls -A) || fail=1 test -z "$out" || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/mv-special-1 b/tests/mv/mv-special-1 index f10dc10ef..bae203cc8 100755 --- a/tests/mv/mv-special-1 +++ b/tests/mv/mv-special-1 @@ -75,4 +75,4 @@ compare out2 exp || fail=1 # cd $other_partition_tmpdir # ls -l -A -R $other_partition_tmpdir -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/no-target-dir b/tests/mv/no-target-dir index 7df1fb99f..7094cc73f 100755 --- a/tests/mv/no-target-dir +++ b/tests/mv/no-target-dir @@ -51,4 +51,4 @@ mv -fT src d2 2> /dev/null && fail=1 # rename must fail, since the src is not a directory. mv -fT f e2 2> /dev/null && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/part-fail b/tests/mv/part-fail index 60c421031..469880a89 100755 --- a/tests/mv/part-fail +++ b/tests/mv/part-fail @@ -56,4 +56,4 @@ else fi test $fail = 1 && diff out exp 2> /dev/null -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/part-hardlink b/tests/mv/part-hardlink index 3eaa083cd..fa3d54da6 100755 --- a/tests/mv/part-hardlink +++ b/tests/mv/part-hardlink @@ -45,4 +45,4 @@ test $1 = $3 || fail=1 set `ls -Ci a/1 b/1` test $1 = $3 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/part-rename b/tests/mv/part-rename index 8bff9915f..e80004b6a 100755 --- a/tests/mv/part-rename +++ b/tests/mv/part-rename @@ -33,4 +33,4 @@ fail=0 mv foo/ $other_partition_tmpdir/bar || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/part-symlink b/tests/mv/part-symlink index 926252493..2aed4d854 100755 --- a/tests/mv/part-symlink +++ b/tests/mv/part-symlink @@ -204,4 +204,4 @@ EOF # Redirect to stderr, since stdout is already taken. compare $expected $actual 1>&2 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/partition-perm b/tests/mv/partition-perm index 03f169ebb..08236a2a4 100755 --- a/tests/mv/partition-perm +++ b/tests/mv/partition-perm @@ -39,4 +39,4 @@ test -f $other_partition_tmpdir/file || fail=1 mode=`ls -l $other_partition_tmpdir/file|cut -b-10` test "$mode" = "-rwxrwxrwx" || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/perm-1 b/tests/mv/perm-1 index 95bbccb8d..44a1af2b7 100755 --- a/tests/mv/perm-1 +++ b/tests/mv/perm-1 @@ -37,4 +37,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/reply-no b/tests/mv/reply-no index 42967c866..fb7cc2f8d 100755 --- a/tests/mv/reply-no +++ b/tests/mv/reply-no @@ -39,4 +39,4 @@ EOF compare out exp_err || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/sticky-to-xpart b/tests/mv/sticky-to-xpart index 14cb76211..55d8f8f28 100755 --- a/tests/mv/sticky-to-xpart +++ b/tests/mv/sticky-to-xpart @@ -65,4 +65,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/to-symlink b/tests/mv/to-symlink index 560d63de9..b12772250 100755 --- a/tests/mv/to-symlink +++ b/tests/mv/to-symlink @@ -47,4 +47,4 @@ test -f $file && fail=1 # Make sure $rem_file is unmodified. test `cat $rem_file` = remote || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/trailing-slash b/tests/mv/trailing-slash index eea982f3e..a5932ba64 100755 --- a/tests/mv/trailing-slash +++ b/tests/mv/trailing-slash @@ -55,4 +55,4 @@ done #touch a a2 #mv a a2/ && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/mv/update b/tests/mv/update index 15e6fa762..29910c82b 100755 --- a/tests/mv/update +++ b/tests/mv/update @@ -57,4 +57,4 @@ cp --update new old || fail=1 case "`cat old`" in new) ;; *) fail=1 ;; esac case "`cat new`" in new) ;; *) fail=1 ;; esac -(exit $fail); exit $fail +Exit $fail diff --git a/tests/readlink/can-e b/tests/readlink/can-e index 72c2c5cd3..6316ff98f 100755 --- a/tests/readlink/can-e +++ b/tests/readlink/can-e @@ -107,4 +107,4 @@ for p in "" "$pwd/$tmp/"; do test -z "$v" || fail=1 done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/readlink/can-f b/tests/readlink/can-f index 67f84b92f..9e19eb015 100755 --- a/tests/readlink/can-f +++ b/tests/readlink/can-f @@ -140,4 +140,4 @@ for p in "" "$pwd/$tmp/"; do test -z "$v" || fail=1 done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/readlink/can-m b/tests/readlink/can-m index 24f98c985..d20dcd73b 100755 --- a/tests/readlink/can-m +++ b/tests/readlink/can-m @@ -144,4 +144,4 @@ for p in "" "$pwd/$tmp/"; do done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/readlink/rl-1 b/tests/readlink/rl-1 index 91401b0f4..cdde35bae 100755 --- a/tests/readlink/rl-1 +++ b/tests/readlink/rl-1 @@ -45,4 +45,4 @@ test -z "$v" || fail=1 v=`readlink missing` && fail=1 test -z "$v" || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/require-perl b/tests/require-perl index 1f98edfe4..a6d9dc9d3 100644 --- a/tests/require-perl +++ b/tests/require-perl @@ -2,5 +2,5 @@ $PERL -e 'use warnings' > /dev/null 2>&1 || { echo 1>&2 "$0: configure did not find a usable version of Perl," \ "so skipping this test" - (exit 77); exit 77 + Exit 77 } diff --git a/tests/rm/cycle b/tests/rm/cycle index 4c9f04d03..20522a052 100755 --- a/tests/rm/cycle +++ b/tests/rm/cycle @@ -38,4 +38,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/dangling-symlink b/tests/rm/dangling-symlink index 7581be22f..189bafcfc 100755 --- a/tests/rm/dangling-symlink +++ b/tests/rm/dangling-symlink @@ -44,4 +44,4 @@ ls -l symlink > /dev/null 2>&1 && fail=1 kill $pid > /dev/null 2>&1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/deep-1 b/tests/rm/deep-1 index 34e9e1919..c16967880 100755 --- a/tests/rm/deep-1 +++ b/tests/rm/deep-1 @@ -55,4 +55,4 @@ rm -r $t || fail=1 # Make sure all of $t was deleted. test -d $t && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/deep-2 b/tests/rm/deep-2 index ed84c66ea..f01a79efc 100755 --- a/tests/rm/deep-2 +++ b/tests/rm/deep-2 @@ -50,4 +50,4 @@ test -s out && fail=1 # the directory must have been removed test -d x && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/dir-no-w b/tests/rm/dir-no-w index 35ab1852d..d5317d7b3 100755 --- a/tests/rm/dir-no-w +++ b/tests/rm/dir-no-w @@ -44,4 +44,4 @@ rm -f out-t compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/dir-nonrecur b/tests/rm/dir-nonrecur index 064ef5d43..1d06b4438 100755 --- a/tests/rm/dir-nonrecur +++ b/tests/rm/dir-nonrecur @@ -36,4 +36,4 @@ EOF # Before coreutils-5.93 this test would fail on Solaris 9 and newer. compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/dot-rel b/tests/rm/dot-rel index 0d0e1a1de..6a3ac5105 100755 --- a/tests/rm/dot-rel +++ b/tests/rm/dot-rel @@ -31,4 +31,4 @@ fail=0 rm -r a b || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/empty-inacc b/tests/rm/empty-inacc index e89d103f2..67af8753e 100755 --- a/tests/rm/empty-inacc +++ b/tests/rm/empty-inacc @@ -40,4 +40,4 @@ test -d inacc && fail=1 rm -rf a || fail=1 test -d a && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/f-1 b/tests/rm/f-1 index acd241a20..fa008068f 100755 --- a/tests/rm/f-1 +++ b/tests/rm/f-1 @@ -30,4 +30,4 @@ mkdir -p d || framework_failure fail=0 rm -f d/no-such-file || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/fail-2eperm b/tests/rm/fail-2eperm index 6cc66ef80..14654e999 100755 --- a/tests/rm/fail-2eperm +++ b/tests/rm/fail-2eperm @@ -54,4 +54,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/fail-eacces b/tests/rm/fail-eacces index 916b2577b..4722b0f61 100755 --- a/tests/rm/fail-eacces +++ b/tests/rm/fail-eacces @@ -56,4 +56,4 @@ rm: cannot remove `e/slink': Permission denied EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/hash b/tests/rm/hash index abb7ffd04..eaa384a76 100755 --- a/tests/rm/hash +++ b/tests/rm/hash @@ -39,4 +39,4 @@ fail=0 rm -r t || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/i-1 b/tests/rm/i-1 index d19ebeaec..1d4b1dced 100755 --- a/tests/rm/i-1 +++ b/tests/rm/i-1 @@ -44,4 +44,4 @@ test -f $t/a && fail=1 rm -rf $t -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/i-never b/tests/rm/i-never index 244054ab7..2bde9ecfa 100755 --- a/tests/rm/i-never +++ b/tests/rm/i-never @@ -35,4 +35,4 @@ rm --interactive=never f > out || fail=1 compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/i-no-r b/tests/rm/i-no-r index f028b6357..718b1495d 100755 --- a/tests/rm/i-no-r +++ b/tests/rm/i-no-r @@ -36,4 +36,4 @@ rm -i dir < y > /dev/null 2>&1 && fail=1 # The directory must remain. test -d dir || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/ignorable b/tests/rm/ignorable index 37e0150f4..7b38fb6fd 100755 --- a/tests/rm/ignorable +++ b/tests/rm/ignorable @@ -32,4 +32,4 @@ fail=0 # Example from Andreas Schwab. rm -f existing-non-dir/f > out 2>&1 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/inaccessible b/tests/rm/inaccessible index 35cddc599..fc46b021f 100755 --- a/tests/rm/inaccessible +++ b/tests/rm/inaccessible @@ -57,4 +57,4 @@ sed 's/: The file access permissions.*/: Permission denied/'<out>o1;mv o1 out compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/interactive-always b/tests/rm/interactive-always index 382cc6ff1..88afd7554 100755 --- a/tests/rm/interactive-always +++ b/tests/rm/interactive-always @@ -91,4 +91,4 @@ EOF compare out expout || fail=1 compare err experr || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/interactive-once b/tests/rm/interactive-once index 6238f3fcf..159083281 100755 --- a/tests/rm/interactive-once +++ b/tests/rm/interactive-once @@ -111,4 +111,4 @@ EOF compare out expout || fail=1 compare err experr || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/ir-1 b/tests/rm/ir-1 index c3cdc0be8..c3cb8b327 100755 --- a/tests/rm/ir-1 +++ b/tests/rm/ir-1 @@ -61,4 +61,4 @@ case `echo $t/*` in *) fail=1 ;; esac -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/isatty b/tests/rm/isatty index 596887311..173458d50 100755 --- a/tests/rm/isatty +++ b/tests/rm/isatty @@ -56,4 +56,4 @@ echo x >> out compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/no-give-up b/tests/rm/no-give-up index b888296c8..c88642037 100755 --- a/tests/rm/no-give-up +++ b/tests/rm/no-give-up @@ -43,4 +43,4 @@ test -d d || fail=1 # f must have been removed. test -f d/f && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/one-file-system b/tests/rm/one-file-system index 419ada201..2de7678dd 100755 --- a/tests/rm/one-file-system +++ b/tests/rm/one-file-system @@ -45,4 +45,4 @@ umount $t compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/r-1 b/tests/rm/r-1 index ec846fb8d..187b6642c 100755 --- a/tests/rm/r-1 +++ b/tests/rm/r-1 @@ -47,4 +47,4 @@ done # Compare expected and actual output. compare $test.E $test.O || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/r-2 b/tests/rm/r-2 index 0bf6756de..d9614ba92 100755 --- a/tests/rm/r-2 +++ b/tests/rm/r-2 @@ -48,4 +48,4 @@ fi # Compare expected and actual output. cmp t/E t/O || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/r-3 b/tests/rm/r-3 index 9c31d881f..e4d8dc961 100755 --- a/tests/rm/r-3 +++ b/tests/rm/r-3 @@ -50,4 +50,4 @@ fail=0 rm -rf t || fail=1 test -d t && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/r-4 b/tests/rm/r-4 index 3d2107914..7cc84b61d 100755 --- a/tests/rm/r-4 +++ b/tests/rm/r-4 @@ -38,4 +38,4 @@ rm -fr d/../ 2>/dev/null && fail=1 test -f d/a || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/readdir-bug b/tests/rm/readdir-bug index 15dc74125..2d2e6ebbf 100755 --- a/tests/rm/readdir-bug +++ b/tests/rm/readdir-bug @@ -43,4 +43,4 @@ rm -rf b || fail=1 test -d b && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/rm1 b/tests/rm/rm1 index 70bc0e8b4..116bd7bea 100755 --- a/tests/rm/rm1 +++ b/tests/rm/rm1 @@ -50,4 +50,4 @@ test -d b/a/p || fail=1 test -d b/c && fail=1 test -d b/d && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/rm2 b/tests/rm/rm2 index 853f4e2ac..67402a823 100755 --- a/tests/rm/rm2 +++ b/tests/rm/rm2 @@ -57,4 +57,4 @@ test -d a/3 && fail=1 chmod u+x b test -d b/3 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/rm3 b/tests/rm/rm3 index c5630a269..a64bd2797 100755 --- a/tests/rm/rm3 +++ b/tests/rm/rm3 @@ -75,4 +75,4 @@ compare out exp || fail=1 test -d z && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/rm4 b/tests/rm/rm4 index 2fbf317a1..8642a9d23 100755 --- a/tests/rm/rm4 +++ b/tests/rm/rm4 @@ -33,4 +33,4 @@ rm dir > /dev/null 2>&1 && fail=1 test -d dir || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/rm5 b/tests/rm/rm5 index f54d640a0..e36f08dfa 100755 --- a/tests/rm/rm5 +++ b/tests/rm/rm5 @@ -54,4 +54,4 @@ test -d d && fail=1 compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/sunos-1 b/tests/rm/sunos-1 index ce1016e1f..010c93782 100755 --- a/tests/rm/sunos-1 +++ b/tests/rm/sunos-1 @@ -31,4 +31,4 @@ fi fail=0 rm -r '' > /dev/null 2>&1 && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/unread2 b/tests/rm/unread2 index 005c4255c..615f24d8d 100755 --- a/tests/rm/unread2 +++ b/tests/rm/unread2 @@ -37,4 +37,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/unread3 b/tests/rm/unread3 index e79bd6003..db38f900f 100755 --- a/tests/rm/unread3 +++ b/tests/rm/unread3 @@ -45,4 +45,4 @@ test -d "$t/b" && fail=1 test -d "$t/d" && fail=1 test -d "$t/e" && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rm/v-slash b/tests/rm/v-slash index 3a9d5411a..71432e6d9 100755 --- a/tests/rm/v-slash +++ b/tests/rm/v-slash @@ -36,4 +36,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rmdir/fail-perm b/tests/rmdir/fail-perm index 9eeb633ea..bfc7b0768 100755 --- a/tests/rmdir/fail-perm +++ b/tests/rmdir/fail-perm @@ -34,4 +34,4 @@ fail=0 # As of coreutils-5.1.2, it fails, as required. rmdir -p d d/e/f 2> /dev/null && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rmdir/ignore b/tests/rmdir/ignore index e55ae1f64..564b180a2 100755 --- a/tests/rmdir/ignore +++ b/tests/rmdir/ignore @@ -34,4 +34,4 @@ test -d "$cwd/a/x" || fail=1 test -d "$cwd/a/b" && fail=1 test -d "$cwd/a/b/c" && fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/rmdir/t-slash b/tests/rmdir/t-slash index 923e9c9c9..85e4e7e04 100755 --- a/tests/rmdir/t-slash +++ b/tests/rmdir/t-slash @@ -31,4 +31,4 @@ fail=0 # rmdir: `dir': No such file or directory rmdir -p dir/ || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/sample-test b/tests/sample-test index 67bc0d1fc..ca1687238 100644 --- a/tests/sample-test +++ b/tests/sample-test @@ -38,4 +38,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/tail-2/append-only b/tests/tail-2/append-only index fc761006b..d78a54063 100755 --- a/tests/tail-2/append-only +++ b/tests/tail-2/append-only @@ -42,4 +42,4 @@ pid=$! tail --pid=$pid -f f > /dev/null 2>&1 || fail=1 chattr -a f 2>/dev/null -(exit $fail); exit $fail +Exit $fail diff --git a/tests/tail-2/assert b/tests/tail-2/assert index 309d12d8d..65f00d6af 100755 --- a/tests/tail-2/assert +++ b/tests/tail-2/assert @@ -61,4 +61,4 @@ esac test $fail = 1 && cat err -(exit $fail); exit $fail +Exit $fail diff --git a/tests/tail-2/assert-2 b/tests/tail-2/assert-2 index 4c6f4a9f3..d816c7c65 100755 --- a/tests/tail-2/assert-2 +++ b/tests/tail-2/assert-2 @@ -49,4 +49,4 @@ esac test $fail = 1 && cat err -(exit $fail); exit $fail +Exit $fail diff --git a/tests/tail-2/big-4gb b/tests/tail-2/big-4gb index b362aeb3d..c8b2a4884 100755 --- a/tests/tail-2/big-4gb +++ b/tests/tail-2/big-4gb @@ -52,4 +52,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/tail-2/infloop-1 b/tests/tail-2/infloop-1 index c18c3e670..bf12a1143 100755 --- a/tests/tail-2/infloop-1 +++ b/tests/tail-2/infloop-1 @@ -36,4 +36,4 @@ sleep 1 fail=0 kill $tail_pid && fail=1 || : -(exit $fail); exit $fail +Exit $fail diff --git a/tests/tail-2/proc-ksyms b/tests/tail-2/proc-ksyms index 84566b542..4766671b2 100755 --- a/tests/tail-2/proc-ksyms +++ b/tests/tail-2/proc-ksyms @@ -30,4 +30,4 @@ if test -r $ksyms; then tail $ksyms > /dev/null || fail=1 fi -(exit $fail); exit $fail +Exit $fail diff --git a/tests/tail-2/start-middle b/tests/tail-2/start-middle index 3151e9d09..cc8cc8ee9 100755 --- a/tests/tail-2/start-middle +++ b/tests/tail-2/start-middle @@ -35,4 +35,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/tail-2/tail-n0f b/tests/tail-2/tail-n0f index 4a22541d8..bf19cf54c 100755 --- a/tests/tail-2/tail-n0f +++ b/tests/tail-2/tail-n0f @@ -56,4 +56,4 @@ for file in empty nonempty; do done done -(exit $fail); exit $fail +Exit $fail diff --git a/tests/test-lib.sh b/tests/test-lib.sh index f0e107061..e7ec80e6d 100644 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -5,13 +5,13 @@ unset function_test eval 'function_test() { return 11; }; function_test' if test $? != 11; then echo "$0: /bin/sh lacks support for functions; skipping this test." 1>&2 - (exit 77); exit 77 + Exit 77 fi skip_test_() { echo "$0: skipping test: $@" 1>&2 - (exit 77); exit 77 + Exit 77 } require_acl_() @@ -184,7 +184,7 @@ require_root_() } skip_if_root_() { uid_is_privileged_ && skip_test_ "must be run as non-root"; } -error_() { echo "$0: $@" 1>&2; (exit 1); exit 1; } +error_() { echo "$0: $@" 1>&2; Exit 1; } framework_failure() { error_ 'failure in testing framework'; } # Set `groups' to a space-separated list of at least two groups @@ -271,6 +271,18 @@ working_umask_or_skip_() esac } +# We use a trap below for cleanup. This requires us to go through +# hoops to get the right exit status transported through the signal. +# So use `Exit STATUS' instead of `exit STATUS' inside of the tests. +# Turn off errexit here so that we don't trip the bug with OSF1/Tru64 +# sh inside this function. +Exit () +{ + set +e + (exit $1) + exit $1 +} + test_dir_=$(pwd) this_test_() { echo "./$0" | sed 's,.*/,,'; } @@ -294,7 +306,7 @@ remove_tmp_() # Run each test from within a temporary sub-directory named after the # test itself, and arrange to remove it upon exception or normal exit. trap remove_tmp_ 0 -trap '(exit $?); exit $?' 1 2 13 15 +trap 'Exit $?' 1 2 13 15 cd "$t_" || error_ "failed to cd to $t_" diff --git a/tests/touch/dangling-symlink b/tests/touch/dangling-symlink index aedb4afb2..add6f63f1 100755 --- a/tests/touch/dangling-symlink +++ b/tests/touch/dangling-symlink @@ -51,4 +51,4 @@ when operating on dangling symlinks. esac fi -(exit $fail); exit $fail +Exit $fail diff --git a/tests/touch/dir-1 b/tests/touch/dir-1 index 34023072f..1698ab1ca 100755 --- a/tests/touch/dir-1 +++ b/tests/touch/dir-1 @@ -11,4 +11,4 @@ fi fail=0 touch . || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/touch/empty-file b/tests/touch/empty-file index 0f42ba57e..9c11990dc 100755 --- a/tests/touch/empty-file +++ b/tests/touch/empty-file @@ -82,4 +82,4 @@ if test $fail != 0; then EOF fi -(exit $fail); exit $fail +Exit $fail diff --git a/tests/touch/fail-diag b/tests/touch/fail-diag index b8889121b..37814fd4d 100755 --- a/tests/touch/fail-diag +++ b/tests/touch/fail-diag @@ -38,4 +38,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/touch/fifo b/tests/touch/fifo index 9cd2d0171..8152717ba 100755 --- a/tests/touch/fifo +++ b/tests/touch/fifo @@ -29,4 +29,4 @@ fail=0 touch fifo || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/touch/no-create-missing b/tests/touch/no-create-missing index be2d0dbf3..48c81d55d 100755 --- a/tests/touch/no-create-missing +++ b/tests/touch/no-create-missing @@ -41,4 +41,4 @@ if "$test" -w /dev/stdout >/dev/null && touch -ca - >&- 2> /dev/null || fail=1 fi -(exit $fail); exit $fail +Exit $fail diff --git a/tests/touch/no-rights b/tests/touch/no-rights index 7550bae5e..5a662b3df 100755 --- a/tests/touch/no-rights +++ b/tests/touch/no-rights @@ -42,4 +42,4 @@ test "$*" = "x t1 t2" || fail=1 # Also test the combination of --no-create and -a. touch -a --no-create t1 || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/touch/not-owner b/tests/touch/not-owner index adcdaa87a..b0ad4ac59 100755 --- a/tests/touch/not-owner +++ b/tests/touch/not-owner @@ -54,4 +54,4 @@ test "$match" = 1 || fail=1 test $fail = 1 && diff out exp 2> /dev/null -(exit $fail); exit $fail +Exit $fail diff --git a/tests/touch/now-owned-by-other b/tests/touch/now-owned-by-other index 2c1faefef..123df8458 100755 --- a/tests/touch/now-owned-by-other +++ b/tests/touch/now-owned-by-other @@ -36,4 +36,4 @@ chmod g+x . setuidgid $NON_ROOT_USERNAME env PATH="$PATH" touch -d now root-owned || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/touch/obsolescent b/tests/touch/obsolescent index 8b558777e..a5dcd24b6 100755 --- a/tests/touch/obsolescent +++ b/tests/touch/obsolescent @@ -43,4 +43,4 @@ y2000=0101000000 rm -f $y2000 file || fail=1 touch $y2000 file && test -f $y2000 && test -f file || fail=1 -(exit $fail); exit $fail +Exit $fail diff --git a/tests/touch/read-only b/tests/touch/read-only index e2338c51c..8b7ebd18f 100755 --- a/tests/touch/read-only +++ b/tests/touch/read-only @@ -33,4 +33,4 @@ touch read-only || fail=1 touch - 1< read-only 2> /dev/null && { test ! -f - || fail=1; } -(exit $fail); exit $fail +Exit $fail diff --git a/tests/touch/relative b/tests/touch/relative index 7c1396f15..db31b16d0 100755 --- a/tests/touch/relative +++ b/tests/touch/relative @@ -40,4 +40,4 @@ EOF compare out exp || fail=1 -(exit $fail); exit $fail +Exit $fail |