diff options
| author | Jim Meyering <jim@meyering.net> | 2007-09-06 23:05:16 +0200 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-09-15 08:40:38 +0200 |
| commit | 33173e867aa45b7f88551551da51e36875582813 (patch) | |
| tree | 8bbe0a98f0b3cbd0977e35b2b0d4f4cc432dc288 /tests/mv/childproof | |
| parent | df0beae1eb1318869d51a064aec8fdd401877cbf (diff) | |
| download | coreutils-33173e867aa45b7f88551551da51e36875582813.tar.xz | |
Convert tests/mv, too.
* tests/other-fs-tmpdir: Before, all callers would exit 77 upon failure to
find the required dir. Now, exit 77 in this script so callers don't have to.
Adjust callers.
Diffstat (limited to 'tests/mv/childproof')
| -rwxr-xr-x | tests/mv/childproof | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/tests/mv/childproof b/tests/mv/childproof index e35afb6b4..6d93974a4 100755 --- a/tests/mv/childproof +++ b/tests/mv/childproof @@ -25,26 +25,13 @@ if test "$VERBOSE" = yes; then ln --version fi -. $srcdir/../envvar-check . $srcdir/../lang-default PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check +. $srcdir/../test-lib.sh -pwd=`pwd` -tmp=childproof.$$ -trap 'status=$?; cd "$pwd" && rm -rf $tmp && exit $status' 0 -trap '(exit $?); exit' 1 2 13 15 - -framework_failure=0 -mkdir $tmp || framework_failure=1 -cd $tmp || framework_failure=1 -mkdir a b c || framework_failure=1 -echo a > a/f || framework_failure=1 -echo b > b/f || framework_failure=1 - -if test $framework_failure = 1; then - echo 'failure in testing framework' 1>&2 - (exit 1); exit 1 -fi +mkdir a b c || framework_failure +echo a > a/f || framework_failure +echo b > b/f || framework_failure fail=0 |