From ec2064acc84d9cc6e0bfae04c591974efc449d8a Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 7 Sep 2007 15:25:23 +0200 Subject: Convert tests/du/*, too. --- tests/du/inacc-dir | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'tests/du/inacc-dir') diff --git a/tests/du/inacc-dir b/tests/du/inacc-dir index add929347..1ee5943b4 100755 --- a/tests/du/inacc-dir +++ b/tests/du/inacc-dir @@ -20,20 +20,9 @@ if test "$VERBOSE" = yes; then du --version fi -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 -p a/sub || framework_failure=1 - -if test $framework_failure = 1; then - echo "$0: failure in testing framework" 1>&2 - (exit 1); exit 1 -fi +. $srcdir/../test-lib.sh + +mkdir -p a/sub || framework_failure fail=0 @@ -42,8 +31,7 @@ chmod 0 a/sub || fail=1 # Expect failure, ignore diagnostics. du -s a > out 2> /dev/null && fail=1 -cmp out exp || fail=1 -test $fail = 1 && diff out exp 2> /dev/null +compare out exp || fail=1 # Same as above, but don't use -s, so we print # an entry for the unreadable "sub", too. @@ -53,7 +41,6 @@ chmod 0 a/sub || fail=1 # Expect failure, ignore diagnostics. du -k a > out 2> /dev/null && fail=1 -cmp out exp || fail=1 -test $fail = 1 && diff out exp 2> /dev/null +compare out exp || fail=1 (exit $fail); exit $fail -- cgit v1.2.3-54-g00ecf