diff options
Diffstat (limited to 'tests/cp/dir-slash')
| -rwxr-xr-x | tests/cp/dir-slash | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/tests/cp/dir-slash b/tests/cp/dir-slash index 31bfcb317..6a6a613a3 100755 --- a/tests/cp/dir-slash +++ b/tests/cp/dir-slash @@ -2,7 +2,7 @@ # Make sure that cp -R DIR1 DIR2 does the right thing # when DIR1 is written with a trailing slash. -# 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 @@ -22,22 +22,10 @@ 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 $?; exit $status' 0 -trap 'exit $?' 1 2 13 15 +. $srcdir/../test-lib.sh -framework_failure=0 -mkdir -p $tmp || framework_failure=1 -cd $tmp || framework_failure=1 - -mkdir dir1 dir2 || framework_failure=1 -touch dir1/file || framework_failure=1 - -if test $framework_failure = 1; then - echo 'failure in testing framework' - exit 1 -fi +mkdir dir1 dir2 || framework_failure +touch dir1/file || framework_failure fail=0 cp -R dir1/ dir2 || fail=1 |