diff options
Diffstat (limited to 'tests/mv/backup-dir')
| -rwxr-xr-x | tests/mv/backup-dir | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/tests/mv/backup-dir b/tests/mv/backup-dir index 8b80bd278..2880cbd30 100755 --- a/tests/mv/backup-dir +++ b/tests/mv/backup-dir @@ -1,7 +1,7 @@ #!/bin/sh # Ensure "mv --verbose --backup" works the same for dirs and non-dirs. -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 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,25 +21,11 @@ if test "$VERBOSE" = yes; then mv --version fi -. $srcdir/../envvar-check . $srcdir/../lang-default +. $srcdir/../test-lib.sh -pwd=`pwd` -t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$ -trap 'status=$?; cd "$pwd" && chmod -R u+rwx $t0 && rm -rf $t0 && exit $status' 0 -trap '(exit $?); exit $?' 1 2 13 15 - -framework_failure=0 -mkdir -p $tmp || framework_failure=1 -cd $tmp || framework_failure=1 - -mkdir A B || framework_failure=1 -touch X Y || framework_failure=1 - -if test $framework_failure = 1; then - echo "$0: failure in testing framework" 1>&2 - (exit 1); exit 1 -fi +mkdir A B || framework_failure +touch X Y || framework_failure fail=0 @@ -49,7 +35,6 @@ cat <<\EOF > exp || fail=1 `A' -> `B' (backup: `B.~1~') EOF -cmp out exp || fail=1 -test $fail = 1 && diff out exp 2> /dev/null +compare out exp || fail=1 (exit $fail); exit $fail |