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/mkdir | |
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/mkdir')
-rwxr-xr-x | tests/mkdir/p-1 | 2 | ||||
-rwxr-xr-x | tests/mkdir/p-2 | 2 | ||||
-rwxr-xr-x | tests/mkdir/p-3 | 2 | ||||
-rwxr-xr-x | tests/mkdir/p-slashdot | 2 | ||||
-rwxr-xr-x | tests/mkdir/p-thru-slink | 2 | ||||
-rwxr-xr-x | tests/mkdir/p-v | 2 | ||||
-rwxr-xr-x | tests/mkdir/parents | 2 | ||||
-rwxr-xr-x | tests/mkdir/perm | 2 | ||||
-rwxr-xr-x | tests/mkdir/selinux | 2 | ||||
-rwxr-xr-x | tests/mkdir/special-1 | 2 | ||||
-rwxr-xr-x | tests/mkdir/t-slash | 2 | ||||
-rwxr-xr-x | tests/mkdir/writable-under-readonly | 2 |
12 files changed, 12 insertions, 12 deletions
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 |