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/dir-file | |
| 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/dir-file')
| -rwxr-xr-x | tests/mv/dir-file | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/tests/mv/dir-file b/tests/mv/dir-file index e9f00eb2f..61b7deaea 100755 --- a/tests/mv/dir-file +++ b/tests/mv/dir-file @@ -1,7 +1,7 @@ #!/bin/sh # mv must fail when src and dest are mismatched directory/non-directory. -# Copyright (C) 2000, 2006 Free Software Foundation, Inc. +# Copyright (C) 2000, 2006-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,20 +21,10 @@ if test "$VERBOSE" = yes; then mv --version fi -tmp=mv-mismatch-$$ -pwd=`pwd` -trap 'cd "$pwd" && rm -rf $tmp' 0 1 2 3 15 +. $srcdir/../test-lib.sh -framework_failure=0 -mkdir $tmp || framework_failure=1 -cd $tmp -mkdir -p dir/file || framework_failure=1 -> file || framework_failure=1 - -if test $framework_failure = 1; then - echo 'failure in testing framework' - exit 1 -fi +mkdir -p dir/file || framework_failure +> file || framework_failure fail=0 |