diff options
Diffstat (limited to 'tests/cp/dir-rm-dest')
| -rwxr-xr-x | tests/cp/dir-rm-dest | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/tests/cp/dir-rm-dest b/tests/cp/dir-rm-dest index f531e63c7..45212c748 100755 --- a/tests/cp/dir-rm-dest +++ b/tests/cp/dir-rm-dest @@ -1,7 +1,7 @@ #!/bin/sh # verify that cp's --remove-destination option works with -R -# Copyright (C) 2000, 2002, 2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 2000, 2002, 2004, 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,23 +21,11 @@ if test "$VERBOSE" = yes; then cp --version fi -pwd=`pwd` -t0=`echo "$0"|sed 's,.*/,,'`.tmp;tmp=$t0/$$ -trap 'status=$?; cd "$pwd" && rm -rf $t0 && exit $status' 0 -trap '(exit $?); exit' 1 2 13 15 +. $srcdir/../test-lib.sh -framework_failure=0 -mkdir -p $tmp || framework_failure=1 -cd $tmp || framework_failure=1 -mkdir d e || framework_failure=1 - -if test $framework_failure = 1; then - echo 'failure in testing framework' - exit 1 -fi +mkdir d e || framework_failure fail=0 - # Do it once with no destination... cp -R --remove-destination d e || fail=1 |