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/i-4 | |
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/i-4')
-rwxr-xr-x | tests/mv/i-4 | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/tests/mv/i-4 b/tests/mv/i-4 index 2bd68161d..288c42830 100755 --- a/tests/mv/i-4 +++ b/tests/mv/i-4 @@ -1,7 +1,7 @@ #!/bin/sh # make sure `mv -i a b' does its job with a positive response -# Copyright (C) 2001, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2001, 2005-2007 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 @@ -21,28 +21,13 @@ if test "$VERBOSE" = yes; then mv --version fi -. $srcdir/../envvar-check . $srcdir/../lang-default - -pwd=`pwd` -tmp=mv-i4-$$ -trap 'status=$?; cd "$pwd" && rm -rf $tmp && exit $status' 0 -trap 'exit $?' 1 2 13 15 - -framework_failure=0 -mkdir $tmp || framework_failure=1 -cd $tmp || framework_failure=1 - +. $srcdir/../test-lib.sh for i in a b; do - echo $i > $i || framework_failure=1 + echo $i > $i || framework_failure done -echo y > y || framework_failure=1 - -if test $framework_failure = 1; then - echo 'failure in testing framework' - exit 1 -fi +echo y > y || framework_failure fail=0 mv -i a b < y >/dev/null 2>&1 || fail=1 |