diff options
author | Jim Meyering <jim@meyering.net> | 2004-06-23 15:07:00 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2004-06-23 15:07:00 +0000 |
commit | 112efa81f24ead69a3a9b6ae76f601911535352c (patch) | |
tree | dc10a3855c2b2a118ebf08a2df2710377dcff8d7 /tests/ls | |
parent | 11f05299f96e39d58356f83d09811487235c5f4c (diff) | |
download | coreutils-112efa81f24ead69a3a9b6ae76f601911535352c.tar.xz |
Replace all occurrences of `(exit N); exit' with
`(exit N); exit N'. Otherwise, those many tests could exit with
improper exit status when exiting via e.g., a trapped interrupt.
Thanks to a report from Bob Proulx.
Diffstat (limited to 'tests/ls')
-rwxr-xr-x | tests/ls/dired | 4 | ||||
-rwxr-xr-x | tests/ls/follow-slink | 4 | ||||
-rwxr-xr-x | tests/ls/infloop | 4 | ||||
-rwxr-xr-x | tests/ls/no-arg | 4 | ||||
-rwxr-xr-x | tests/ls/recursive | 4 | ||||
-rwxr-xr-x | tests/ls/rt-1 | 4 | ||||
-rwxr-xr-x | tests/ls/time-1 | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/tests/ls/dired b/tests/ls/dired index 82f90fe04..8126e0a45 100755 --- a/tests/ls/dired +++ b/tests/ls/dired @@ -20,7 +20,7 @@ mkdir dir || framework_failure=1 if test $framework_failure = 1; then echo 'failure in testing framework' 1>&2 - (exit 1); exit + (exit 1); exit 1 fi fail=0 @@ -36,4 +36,4 @@ EOF cmp out exp || fail=1 test $fail = 1 && diff out exp 2> /dev/null -(exit $fail); exit +(exit $fail); exit $fail diff --git a/tests/ls/follow-slink b/tests/ls/follow-slink index 05d522718..ede278ee5 100755 --- a/tests/ls/follow-slink +++ b/tests/ls/follow-slink @@ -23,11 +23,11 @@ ls -F link > /dev/null || framework_failure=1 if test $framework_failure = 1; then echo 'failure in testing framework' - (exit 1); exit + (exit 1); exit 1 fi fail=0 ls -L link 2> /dev/null && fail=1 -(exit $fail); exit +(exit $fail); exit $fail diff --git a/tests/ls/infloop b/tests/ls/infloop index 1842c5bc4..9e2ad79fc 100755 --- a/tests/ls/infloop +++ b/tests/ls/infloop @@ -22,7 +22,7 @@ ln -s ../loop loop/sub || framework_failure=1 if test $framework_failure = 1; then echo 'failure in testing framework' 1>&2 - (exit 1); exit + (exit 1); exit 1 fi fail=0 @@ -41,4 +41,4 @@ EOF cmp out bad 2>/dev/null && fail=1 -(exit $fail); exit +(exit $fail); exit $fail diff --git a/tests/ls/no-arg b/tests/ls/no-arg index f36bb0edf..46fa6d901 100755 --- a/tests/ls/no-arg +++ b/tests/ls/no-arg @@ -27,7 +27,7 @@ EOF if test $framework_failure = 1; then echo 'failure in testing framework' - (exit 1); exit + (exit 1); exit 1 fi fail=0 @@ -56,4 +56,4 @@ ls -R1 > out || fail=1 cmp out exp || fail=1 test $fail = 1 && diff out exp 2> /dev/null -(exit $fail); exit +(exit $fail); exit $fail diff --git a/tests/ls/recursive b/tests/ls/recursive index 3b4cb7255..455db181a 100755 --- a/tests/ls/recursive +++ b/tests/ls/recursive @@ -23,7 +23,7 @@ touch f a/1/I a/1/II || framework_failure=1 if test $framework_failure = 1; then echo "$0: failure in testing framework" 1>&2 - (exit 1); exit + (exit 1); exit 1 fi fail=0 @@ -65,4 +65,4 @@ EOF cmp out exp || fail=1 test $fail = 1 && diff out exp 2> /dev/null -(exit $fail); exit +(exit $fail); exit $fail diff --git a/tests/ls/rt-1 b/tests/ls/rt-1 index 66aa3ca0b..3d89a7b9f 100755 --- a/tests/ls/rt-1 +++ b/tests/ls/rt-1 @@ -27,7 +27,7 @@ touch -d "$date" b || framework_failure=1 if test $framework_failure = 1; then echo "$0: failure in testing framework" 1>&2 - (exit 1); exit + (exit 1); exit 1 fi fail=0 @@ -51,4 +51,4 @@ EOF cmp out exp || fail=1 test $fail = 1 && diff out exp 2> /dev/null -(exit $fail); exit +(exit $fail); exit $fail diff --git a/tests/ls/time-1 b/tests/ls/time-1 index 5c4deb30b..1d50033ca 100755 --- a/tests/ls/time-1 +++ b/tests/ls/time-1 @@ -85,7 +85,7 @@ In the output below, the date of last access for \`a' should have been $u1. EOF ls --full -lu a - (exit 77); exit + (exit 77); exit 77 ;; esac |