diff options
author | Jim Meyering <meyering@redhat.com> | 2008-03-28 14:14:04 +0100 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2008-03-28 14:21:28 +0100 |
commit | 17720c10cd73b71230f309137c437bf3aad7b6f5 (patch) | |
tree | f5df1dac6af0eedd44cc94f3c065f67d4147aa17 /tests/mkdir | |
parent | 818dbee8dc1a50f6dbc1ba85f7f25a47ded09930 (diff) | |
download | coreutils-17720c10cd73b71230f309137c437bf3aad7b6f5.tar.xz |
Require that "(exit $fail); exit $fail" be last line of each test.
* maint.mk (sc_require_test_exit_idiom): New rule to enforce policy.
* tests/cp/acl: Adhere to the new policy.
* tests/cp/preserve-gid: Likewise.
* tests/dd/misc:
* tests/install/create-leading:
* tests/ln/sf-1:
* tests/ls/symlink-slash:
* tests/misc/help-version:
* tests/misc/ls-time:
* tests/misc/nice:
* tests/misc/shred-remove:
* tests/misc/stty:
* tests/misc/stty-row-col:
* tests/mkdir/p-1:
* tests/mkdir/p-2:
* tests/mkdir/p-3:
* tests/mkdir/p-v:
* tests/mkdir/special-1:
* tests/mkdir/writable-under-readonly:
* tests/mv/acl:
* tests/mv/backup-is-src:
* tests/mv/diag:
* tests/mv/dir-file:
* tests/mv/force:
* tests/mv/hard-link-1:
* tests/mv/i-2:
* tests/mv/i-4:
* tests/mv/into-self:
* tests/mv/into-self-2:
* tests/mv/into-self-3:
* tests/mv/partition-perm:
* tests/mv/to-symlink:
* tests/rmdir/ignore:
* tests/tail-2/assert:
* tests/tail-2/assert-2:
* tests/touch/dangling-symlink:
* tests/touch/dir-1:
* tests/touch/empty-file:
* tests/touch/fifo:
* tests/touch/no-rights: Likewise.
Signed-off-by: Jim Meyering <meyering@redhat.com>
Diffstat (limited to 'tests/mkdir')
-rwxr-xr-x | tests/mkdir/p-1 | 4 | ||||
-rwxr-xr-x | tests/mkdir/p-2 | 4 | ||||
-rwxr-xr-x | tests/mkdir/p-3 | 4 | ||||
-rwxr-xr-x | tests/mkdir/p-v | 5 | ||||
-rwxr-xr-x | tests/mkdir/special-1 | 4 | ||||
-rwxr-xr-x | tests/mkdir/writable-under-readonly | 5 |
6 files changed, 16 insertions, 10 deletions
diff --git a/tests/mkdir/p-1 b/tests/mkdir/p-1 index 7ef63be52..a5672743a 100755 --- a/tests/mkdir/p-1 +++ b/tests/mkdir/p-1 @@ -1,7 +1,7 @@ #!/bin/sh # Test "mkdir -p". -# Copyright (C) 1997, 2000, 2002, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 1997, 2000, 2002, 2006-2008 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -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 f19a50cde..0659a8e35 100755 --- a/tests/mkdir/p-2 +++ b/tests/mkdir/p-2 @@ -1,7 +1,7 @@ #!/bin/sh # Just like p-1, but with an absolute path. -# Copyright (C) 1997, 2000, 2002, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 1997, 2000, 2002, 2006-2008 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -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 401091131..e868b520f 100755 --- a/tests/mkdir/p-3 +++ b/tests/mkdir/p-3 @@ -3,7 +3,7 @@ # causes immediate failure. Also, ensure that we don't create # subsequent, relative command-line arguments in the wrong place. -# Copyright (C) 2005-2007 Free Software Foundation, Inc. +# Copyright (C) 2005-2008 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -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-v b/tests/mkdir/p-v index 569e9b072..316c1e939 100755 --- a/tests/mkdir/p-v +++ b/tests/mkdir/p-v @@ -24,7 +24,8 @@ fi . $srcdir/../lang-default . $srcdir/../test-lib.sh -mkdir -pv foo/a/b/c/d >out || exit +fail=0 +mkdir -pv foo/a/b/c/d >out || fail=1 diff - out <<\EOF mkdir: created directory `foo' @@ -33,3 +34,5 @@ mkdir: created directory `foo/a/b' mkdir: created directory `foo/a/b/c' mkdir: created directory `foo/a/b/c/d' EOF + +(exit $fail); exit $fail diff --git a/tests/mkdir/special-1 b/tests/mkdir/special-1 index f65d2ae01..800d51065 100755 --- a/tests/mkdir/special-1 +++ b/tests/mkdir/special-1 @@ -1,7 +1,7 @@ #!/bin/sh # verify that mkdir honors special bits in MODE -# Copyright (C) 2000, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2000, 2006-2008 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -52,4 +52,4 @@ case "$mode" in *) fail=1 ;; esac -exit $fail +(exit $fail); exit $fail diff --git a/tests/mkdir/writable-under-readonly b/tests/mkdir/writable-under-readonly index bf2c2ad37..92d87ab5a 100755 --- a/tests/mkdir/writable-under-readonly +++ b/tests/mkdir/writable-under-readonly @@ -1,7 +1,7 @@ #!/bin/sh # FIXME: convert this to a root-only test. -# Copyright (C) 2005, 2007 Free Software Foundation, Inc. +# Copyright (C) 2005, 2007-2008 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -37,6 +37,7 @@ skip_test_ temporarily disabled # FIXME: define cleanup_ to do the umount +fail=0 # FIXME: use mktemp cd /tmp \ && dd if=/dev/zero of=1 bs=8192 count=50 \ @@ -52,3 +53,5 @@ mkdir -p mnt-ro/rw/sub || fail=1 # To clean up umount /tmp/2 umount /tmp/1 + +(exit $fail); exit $fail |