diff options
Diffstat (limited to 'tests/cp/src-base-dot')
| -rwxr-xr-x | tests/cp/src-base-dot | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/tests/cp/src-base-dot b/tests/cp/src-base-dot index 9cc03b1cc..274a66429 100755 --- a/tests/cp/src-base-dot +++ b/tests/cp/src-base-dot @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that "mkdir x y; cd y; cp -ab ../x/. ." is a successful, silent, no-op. -# 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,23 +21,9 @@ if test "$VERBOSE" = yes; then cp --version fi -. $srcdir/../envvar-check +. $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 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 x y || framework_failure fail=0 @@ -46,7 +32,6 @@ cp --verbose -ab ../x/. . > out 2>&1 || fail=1 cat <<\EOF > exp || fail=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 |