diff options
Diffstat (limited to 'tests/cp/into-self')
| -rwxr-xr-x | tests/cp/into-self | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/tests/cp/into-self b/tests/cp/into-self index d2dc0b8d7..7afe2a5bc 100755 --- a/tests/cp/into-self +++ b/tests/cp/into-self @@ -1,7 +1,7 @@ #!/bin/sh # Confirm that copying a directory into itself gets a proper diagnostic. -# Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 2001, 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 @@ -26,24 +26,10 @@ if test "$VERBOSE" = yes; then cp --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" && 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 dir || framework_failure=1 - -if test $framework_failure = 1; then - echo 'failure in testing framework' 1>&2 - (exit 1); exit 1 -fi +mkdir dir || framework_failure fail=0 @@ -55,7 +41,6 @@ cp: cannot copy a directory, `dir', into itself, `dir/dir' EOF #' -cmp out exp || fail=1 -test $fail = 1 && diff out exp 2> /dev/null +compare out exp || fail=1 (exit $fail); exit $fail |