diff options
Diffstat (limited to 'tests/cp/backup-is-src')
| -rwxr-xr-x | tests/cp/backup-is-src | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/tests/cp/backup-is-src b/tests/cp/backup-is-src index e0ae0ec0e..7721be9c5 100755 --- a/tests/cp/backup-is-src +++ b/tests/cp/backup-is-src @@ -1,8 +1,7 @@ #!/bin/sh # Test cp backup to source file. -# Copyright (C) 1998, 1999, 2000, 2002, 2004, 2006 Free Software Foundation, -# Inc. +# Copyright (C) 1998-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 @@ -23,24 +22,10 @@ if test "$VERBOSE" = yes; then fi . $srcdir/../lang-default -. $srcdir/../envvar-check +. $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 - -echo a > a || framework_failure=1 -echo a-tilde > a~ || framework_failure=1 - -if test $framework_failure = 1; then - echo "$0: failure in testing framework" 1>&2 - (exit 1); exit 1 -fi +echo a > a || framework_failure +echo a-tilde > a~ || framework_failure # This cp command should exit nonzero. cp --b=simple a~ a > out 2>&1 && fail=1 @@ -51,6 +36,6 @@ cat > exp <<\EOF XXX: backing up `a' would destroy source; `a~' not copied EOF -cmp out2 exp || fail=1 +compare out2 exp || fail=1 (exit $fail); exit $fail |