From ceb5b04614dfc6037c0a3ac6205b6b3c072bc4cb Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 7 Sep 2007 14:28:47 +0200 Subject: Convert tests/dd/*, too. --- tests/dd/misc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'tests/dd/misc') diff --git a/tests/dd/misc b/tests/dd/misc index dc77e8b60..aea949109 100755 --- a/tests/dd/misc +++ b/tests/dd/misc @@ -2,7 +2,7 @@ # Ensure dd treats `--' properly. # Also test some flag values. -# Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 1999, 2004-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 @@ -17,16 +17,18 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -tmp_in=dd-in.$$ -tmp_in2=dd-in2.$$ -tmp_sym=dd-sym.$$ -tmp_out=dd-out.$$ - if test "$VERBOSE" = yes; then set -x dd --version fi +. $srcdir/../test-lib.sh + +tmp_in=dd-in.$$ +tmp_in2=dd-in2.$$ +tmp_sym=dd-sym.$$ +tmp_out=dd-out.$$ + fail=0 warn=0 test_failure=0 @@ -39,14 +41,14 @@ if test $test_failure = 1; then fi dd if=$tmp_in of=$tmp_out 2> /dev/null || fail=1 -cmp $tmp_in $tmp_out || fail=1 +compare $tmp_in $tmp_out || fail=1 rm $tmp_out dd -- if=$tmp_in of=$tmp_out 2> /dev/null || fail=1 -cmp $tmp_in $tmp_out || fail=1 +compare $tmp_in $tmp_out || fail=1 if dd oflag=append if=$tmp_in of=$tmp_out 2> /dev/null; then - cmp $tmp_in $tmp_out || fail=1 + compare $tmp_in $tmp_out || fail=1 fi if dd iflag=nofollow if=$tmp_in count=0 2> /dev/null; then @@ -84,7 +86,5 @@ fi outbytes=`echo x | dd bs=3 ibs=10 obs=10 conv=sync 2>/dev/null | wc -c` test "$outbytes" -eq 3 || fail=1 -rm -f $tmp_in $tmp_in2 $tmp_sym $tmp_out || fail=1 - test $fail -eq 0 && fail=$warn exit $fail -- cgit v1.2.3-54-g00ecf