diff options
| author | Jim Meyering <jim@meyering.net> | 2007-09-06 17:34:49 +0200 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-09-15 08:40:38 +0200 |
| commit | df0beae1eb1318869d51a064aec8fdd401877cbf (patch) | |
| tree | 94f2224056162eadbb3d6b640e32f56d3f405cbf /tests/cp/cp-mv-backup | |
| parent | c840cd4334c086f5ce4d9144d9fac75643824a38 (diff) | |
| download | coreutils-df0beae1eb1318869d51a064aec8fdd401877cbf.tar.xz | |
Adjust chgrp, chmod, chown, cp tests to use test-lib.sh.
* tests/check.mk: Also define abs_top_builddir.
Diffstat (limited to 'tests/cp/cp-mv-backup')
| -rwxr-xr-x | tests/cp/cp-mv-backup | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/tests/cp/cp-mv-backup b/tests/cp/cp-mv-backup index ab77adaca..9a464a16d 100755 --- a/tests/cp/cp-mv-backup +++ b/tests/cp/cp-mv-backup @@ -1,7 +1,7 @@ #!/bin/sh # Test basic --backup functionality for both cp and mv. -# Copyright (C) 1999, 2000, 2002, 2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 1999, 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 @@ -24,7 +24,7 @@ fi # Ensure that ls sorts the same way for everyone. . $srcdir/../lang-default -. $srcdir/../envvar-check +. $srcdir/../test-lib.sh umask 022 @@ -32,20 +32,6 @@ umask 022 # Use `1>&2' rather than `1<&-' since the latter appears not to work # with /bin/sh from powerpc-ibm-aix4.2.0.0. -pwd=`pwd` -t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$ -trap 'status=$?; cd "$pwd" && exec 1>&2; 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 - -if test $framework_failure = 1; then - echo "$0: failure in testing framework" 1>&2 - (exit 1); exit 1 -fi - actual=actual expected=expected @@ -107,9 +93,6 @@ EOF sed 's/: x/:/' $expected-tmp |cat $expected-tmp - > $expected -cmp $expected $actual || fail=1 - -# Uncomment this if you see a failure and want to try to diagnose it. -test $fail = 1 && diff -c $expected $actual 1>&2 +compare $expected $actual || fail=1 (exit $fail); exit $fail |