.

1 files changed, 241 insertions, 211 deletions

diff --git a/tests/wc/wc-tests b/tests/wc/wc-tests
index a4129c85a..466a22ee7 100755
--- a/tests/wc/wc-tests
+++ b/tests/wc/wc-tests
@@ -20,515 +20,545 @@ export LANG
 
 cat $srcdir/a0.I | $xx -c > a0.O 2> a0.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a0(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a0.O $srcdir/a0.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a0(|)"; fi ;;
-    1) $echo "Test a0(|) failed: files a0.O and $srcdir/a0.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a0(|) may have failed." 1>&2;
-       $echo The command "cmp a0.O $srcdir/a0.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a0(|)"; fi;;
+    1) $echo "Test a0(|) failed: files a0.O and $srcdir/a0.X differ" 1>&2
+       (diff -c a0.O $srcdir/a0.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a0(|) may have failed." 1>&2
+       $echo The command "cmp a0.O $srcdir/a0.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a0.E || rm -f a0.E
 $xx -c < $srcdir/a0.I > a0.O 2> a0.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a0(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a0.O $srcdir/a0.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a0(<)"; fi ;;
-    1) $echo "Test a0(<) failed: files a0.O and $srcdir/a0.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a0(<) may have failed." 1>&2;
-       $echo The command "cmp a0.O $srcdir/a0.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a0(<)"; fi;;
+    1) $echo "Test a0(<) failed: files a0.O and $srcdir/a0.X differ" 1>&2
+       (diff -c a0.O $srcdir/a0.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a0(<) may have failed." 1>&2
+       $echo The command "cmp a0.O $srcdir/a0.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a0.E || rm -f a0.E
 cat $srcdir/a1.I | $xx -l > a1.O 2> a1.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a1(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a1.O $srcdir/a1.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a1(|)"; fi ;;
-    1) $echo "Test a1(|) failed: files a1.O and $srcdir/a1.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a1(|) may have failed." 1>&2;
-       $echo The command "cmp a1.O $srcdir/a1.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a1(|)"; fi;;
+    1) $echo "Test a1(|) failed: files a1.O and $srcdir/a1.X differ" 1>&2
+       (diff -c a1.O $srcdir/a1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a1(|) may have failed." 1>&2
+       $echo The command "cmp a1.O $srcdir/a1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a1.E || rm -f a1.E
 $xx -l < $srcdir/a1.I > a1.O 2> a1.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a1(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a1.O $srcdir/a1.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a1(<)"; fi ;;
-    1) $echo "Test a1(<) failed: files a1.O and $srcdir/a1.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a1(<) may have failed." 1>&2;
-       $echo The command "cmp a1.O $srcdir/a1.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a1(<)"; fi;;
+    1) $echo "Test a1(<) failed: files a1.O and $srcdir/a1.X differ" 1>&2
+       (diff -c a1.O $srcdir/a1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a1(<) may have failed." 1>&2
+       $echo The command "cmp a1.O $srcdir/a1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a1.E || rm -f a1.E
 cat $srcdir/a2.I | $xx -w > a2.O 2> a2.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a2(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a2.O $srcdir/a2.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a2(|)"; fi ;;
-    1) $echo "Test a2(|) failed: files a2.O and $srcdir/a2.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a2(|) may have failed." 1>&2;
-       $echo The command "cmp a2.O $srcdir/a2.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a2(|)"; fi;;
+    1) $echo "Test a2(|) failed: files a2.O and $srcdir/a2.X differ" 1>&2
+       (diff -c a2.O $srcdir/a2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a2(|) may have failed." 1>&2
+       $echo The command "cmp a2.O $srcdir/a2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a2.E || rm -f a2.E
 $xx -w < $srcdir/a2.I > a2.O 2> a2.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a2(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a2.O $srcdir/a2.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a2(<)"; fi ;;
-    1) $echo "Test a2(<) failed: files a2.O and $srcdir/a2.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a2(<) may have failed." 1>&2;
-       $echo The command "cmp a2.O $srcdir/a2.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a2(<)"; fi;;
+    1) $echo "Test a2(<) failed: files a2.O and $srcdir/a2.X differ" 1>&2
+       (diff -c a2.O $srcdir/a2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a2(<) may have failed." 1>&2
+       $echo The command "cmp a2.O $srcdir/a2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a2.E || rm -f a2.E
 cat $srcdir/a3.I | $xx -c > a3.O 2> a3.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a3(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a3.O $srcdir/a3.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a3(|)"; fi ;;
-    1) $echo "Test a3(|) failed: files a3.O and $srcdir/a3.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a3(|) may have failed." 1>&2;
-       $echo The command "cmp a3.O $srcdir/a3.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a3(|)"; fi;;
+    1) $echo "Test a3(|) failed: files a3.O and $srcdir/a3.X differ" 1>&2
+       (diff -c a3.O $srcdir/a3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a3(|) may have failed." 1>&2
+       $echo The command "cmp a3.O $srcdir/a3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a3.E || rm -f a3.E
 $xx -c < $srcdir/a3.I > a3.O 2> a3.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a3(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a3.O $srcdir/a3.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a3(<)"; fi ;;
-    1) $echo "Test a3(<) failed: files a3.O and $srcdir/a3.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a3(<) may have failed." 1>&2;
-       $echo The command "cmp a3.O $srcdir/a3.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a3(<)"; fi;;
+    1) $echo "Test a3(<) failed: files a3.O and $srcdir/a3.X differ" 1>&2
+       (diff -c a3.O $srcdir/a3.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a3(<) may have failed." 1>&2
+       $echo The command "cmp a3.O $srcdir/a3.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a3.E || rm -f a3.E
 cat $srcdir/a4.I | $xx -w > a4.O 2> a4.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a4(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a4.O $srcdir/a4.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a4(|)"; fi ;;
-    1) $echo "Test a4(|) failed: files a4.O and $srcdir/a4.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a4(|) may have failed." 1>&2;
-       $echo The command "cmp a4.O $srcdir/a4.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a4(|)"; fi;;
+    1) $echo "Test a4(|) failed: files a4.O and $srcdir/a4.X differ" 1>&2
+       (diff -c a4.O $srcdir/a4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a4(|) may have failed." 1>&2
+       $echo The command "cmp a4.O $srcdir/a4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a4.E || rm -f a4.E
 $xx -w < $srcdir/a4.I > a4.O 2> a4.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a4(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a4.O $srcdir/a4.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a4(<)"; fi ;;
-    1) $echo "Test a4(<) failed: files a4.O and $srcdir/a4.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a4(<) may have failed." 1>&2;
-       $echo The command "cmp a4.O $srcdir/a4.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a4(<)"; fi;;
+    1) $echo "Test a4(<) failed: files a4.O and $srcdir/a4.X differ" 1>&2
+       (diff -c a4.O $srcdir/a4.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a4(<) may have failed." 1>&2
+       $echo The command "cmp a4.O $srcdir/a4.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a4.E || rm -f a4.E
 cat $srcdir/a5.I | $xx -w > a5.O 2> a5.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a5(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a5.O $srcdir/a5.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a5(|)"; fi ;;
-    1) $echo "Test a5(|) failed: files a5.O and $srcdir/a5.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a5(|) may have failed." 1>&2;
-       $echo The command "cmp a5.O $srcdir/a5.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a5(|)"; fi;;
+    1) $echo "Test a5(|) failed: files a5.O and $srcdir/a5.X differ" 1>&2
+       (diff -c a5.O $srcdir/a5.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a5(|) may have failed." 1>&2
+       $echo The command "cmp a5.O $srcdir/a5.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a5.E || rm -f a5.E
 $xx -w < $srcdir/a5.I > a5.O 2> a5.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a5(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a5.O $srcdir/a5.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a5(<)"; fi ;;
-    1) $echo "Test a5(<) failed: files a5.O and $srcdir/a5.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a5(<) may have failed." 1>&2;
-       $echo The command "cmp a5.O $srcdir/a5.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a5(<)"; fi;;
+    1) $echo "Test a5(<) failed: files a5.O and $srcdir/a5.X differ" 1>&2
+       (diff -c a5.O $srcdir/a5.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a5(<) may have failed." 1>&2
+       $echo The command "cmp a5.O $srcdir/a5.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a5.E || rm -f a5.E
 cat $srcdir/a6.I | $xx -w > a6.O 2> a6.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a6(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a6.O $srcdir/a6.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a6(|)"; fi ;;
-    1) $echo "Test a6(|) failed: files a6.O and $srcdir/a6.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a6(|) may have failed." 1>&2;
-       $echo The command "cmp a6.O $srcdir/a6.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a6(|)"; fi;;
+    1) $echo "Test a6(|) failed: files a6.O and $srcdir/a6.X differ" 1>&2
+       (diff -c a6.O $srcdir/a6.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a6(|) may have failed." 1>&2
+       $echo The command "cmp a6.O $srcdir/a6.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a6.E || rm -f a6.E
 $xx -w < $srcdir/a6.I > a6.O 2> a6.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a6(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a6.O $srcdir/a6.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a6(<)"; fi ;;
-    1) $echo "Test a6(<) failed: files a6.O and $srcdir/a6.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a6(<) may have failed." 1>&2;
-       $echo The command "cmp a6.O $srcdir/a6.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a6(<)"; fi;;
+    1) $echo "Test a6(<) failed: files a6.O and $srcdir/a6.X differ" 1>&2
+       (diff -c a6.O $srcdir/a6.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a6(<) may have failed." 1>&2
+       $echo The command "cmp a6.O $srcdir/a6.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a6.E || rm -f a6.E
 cat $srcdir/a7.I | $xx -l > a7.O 2> a7.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a7(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a7.O $srcdir/a7.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a7(|)"; fi ;;
-    1) $echo "Test a7(|) failed: files a7.O and $srcdir/a7.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a7(|) may have failed." 1>&2;
-       $echo The command "cmp a7.O $srcdir/a7.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a7(|)"; fi;;
+    1) $echo "Test a7(|) failed: files a7.O and $srcdir/a7.X differ" 1>&2
+       (diff -c a7.O $srcdir/a7.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a7(|) may have failed." 1>&2
+       $echo The command "cmp a7.O $srcdir/a7.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a7.E || rm -f a7.E
 $xx -l < $srcdir/a7.I > a7.O 2> a7.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a7(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a7.O $srcdir/a7.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a7(<)"; fi ;;
-    1) $echo "Test a7(<) failed: files a7.O and $srcdir/a7.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a7(<) may have failed." 1>&2;
-       $echo The command "cmp a7.O $srcdir/a7.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a7(<)"; fi;;
+    1) $echo "Test a7(<) failed: files a7.O and $srcdir/a7.X differ" 1>&2
+       (diff -c a7.O $srcdir/a7.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a7(<) may have failed." 1>&2
+       $echo The command "cmp a7.O $srcdir/a7.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a7.E || rm -f a7.E
 cat $srcdir/a8.I | $xx -l > a8.O 2> a8.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a8(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a8.O $srcdir/a8.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a8(|)"; fi ;;
-    1) $echo "Test a8(|) failed: files a8.O and $srcdir/a8.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a8(|) may have failed." 1>&2;
-       $echo The command "cmp a8.O $srcdir/a8.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a8(|)"; fi;;
+    1) $echo "Test a8(|) failed: files a8.O and $srcdir/a8.X differ" 1>&2
+       (diff -c a8.O $srcdir/a8.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a8(|) may have failed." 1>&2
+       $echo The command "cmp a8.O $srcdir/a8.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a8.E || rm -f a8.E
 $xx -l < $srcdir/a8.I > a8.O 2> a8.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a8(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a8.O $srcdir/a8.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a8(<)"; fi ;;
-    1) $echo "Test a8(<) failed: files a8.O and $srcdir/a8.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a8(<) may have failed." 1>&2;
-       $echo The command "cmp a8.O $srcdir/a8.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a8(<)"; fi;;
+    1) $echo "Test a8(<) failed: files a8.O and $srcdir/a8.X differ" 1>&2
+       (diff -c a8.O $srcdir/a8.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a8(<) may have failed." 1>&2
+       $echo The command "cmp a8.O $srcdir/a8.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a8.E || rm -f a8.E
 cat $srcdir/a9.I | $xx -l > a9.O 2> a9.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a9(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a9.O $srcdir/a9.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a9(|)"; fi ;;
-    1) $echo "Test a9(|) failed: files a9.O and $srcdir/a9.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a9(|) may have failed." 1>&2;
-       $echo The command "cmp a9.O $srcdir/a9.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a9(|)"; fi;;
+    1) $echo "Test a9(|) failed: files a9.O and $srcdir/a9.X differ" 1>&2
+       (diff -c a9.O $srcdir/a9.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a9(|) may have failed." 1>&2
+       $echo The command "cmp a9.O $srcdir/a9.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a9.E || rm -f a9.E
 $xx -l < $srcdir/a9.I > a9.O 2> a9.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test a9(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a9.O $srcdir/a9.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a9(<)"; fi ;;
-    1) $echo "Test a9(<) failed: files a9.O and $srcdir/a9.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test a9(<) may have failed." 1>&2;
-       $echo The command "cmp a9.O $srcdir/a9.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed a9(<)"; fi;;
+    1) $echo "Test a9(<) failed: files a9.O and $srcdir/a9.X differ" 1>&2
+       (diff -c a9.O $srcdir/a9.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test a9(<) may have failed." 1>&2
+       $echo The command "cmp a9.O $srcdir/a9.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s a9.E || rm -f a9.E
 cat $srcdir/b0.I | $xx  > b0.O 2> b0.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test b0(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp b0.O $srcdir/b0.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed b0(|)"; fi ;;
-    1) $echo "Test b0(|) failed: files b0.O and $srcdir/b0.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test b0(|) may have failed." 1>&2;
-       $echo The command "cmp b0.O $srcdir/b0.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed b0(|)"; fi;;
+    1) $echo "Test b0(|) failed: files b0.O and $srcdir/b0.X differ" 1>&2
+       (diff -c b0.O $srcdir/b0.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test b0(|) may have failed." 1>&2
+       $echo The command "cmp b0.O $srcdir/b0.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s b0.E || rm -f b0.E
 $xx  < $srcdir/b0.I > b0.O 2> b0.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test b0(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp b0.O $srcdir/b0.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed b0(<)"; fi ;;
-    1) $echo "Test b0(<) failed: files b0.O and $srcdir/b0.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test b0(<) may have failed." 1>&2;
-       $echo The command "cmp b0.O $srcdir/b0.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed b0(<)"; fi;;
+    1) $echo "Test b0(<) failed: files b0.O and $srcdir/b0.X differ" 1>&2
+       (diff -c b0.O $srcdir/b0.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test b0(<) may have failed." 1>&2
+       $echo The command "cmp b0.O $srcdir/b0.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s b0.E || rm -f b0.E
 cat $srcdir/b1.I | $xx  > b1.O 2> b1.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test b1(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp b1.O $srcdir/b1.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed b1(|)"; fi ;;
-    1) $echo "Test b1(|) failed: files b1.O and $srcdir/b1.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test b1(|) may have failed." 1>&2;
-       $echo The command "cmp b1.O $srcdir/b1.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed b1(|)"; fi;;
+    1) $echo "Test b1(|) failed: files b1.O and $srcdir/b1.X differ" 1>&2
+       (diff -c b1.O $srcdir/b1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test b1(|) may have failed." 1>&2
+       $echo The command "cmp b1.O $srcdir/b1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s b1.E || rm -f b1.E
 $xx  < $srcdir/b1.I > b1.O 2> b1.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test b1(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp b1.O $srcdir/b1.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed b1(<)"; fi ;;
-    1) $echo "Test b1(<) failed: files b1.O and $srcdir/b1.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test b1(<) may have failed." 1>&2;
-       $echo The command "cmp b1.O $srcdir/b1.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed b1(<)"; fi;;
+    1) $echo "Test b1(<) failed: files b1.O and $srcdir/b1.X differ" 1>&2
+       (diff -c b1.O $srcdir/b1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test b1(<) may have failed." 1>&2
+       $echo The command "cmp b1.O $srcdir/b1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s b1.E || rm -f b1.E
 cat $srcdir/c0.I | $xx -L > c0.O 2> c0.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test c0(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp c0.O $srcdir/c0.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed c0(|)"; fi ;;
-    1) $echo "Test c0(|) failed: files c0.O and $srcdir/c0.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test c0(|) may have failed." 1>&2;
-       $echo The command "cmp c0.O $srcdir/c0.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed c0(|)"; fi;;
+    1) $echo "Test c0(|) failed: files c0.O and $srcdir/c0.X differ" 1>&2
+       (diff -c c0.O $srcdir/c0.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test c0(|) may have failed." 1>&2
+       $echo The command "cmp c0.O $srcdir/c0.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s c0.E || rm -f c0.E
 $xx -L < $srcdir/c0.I > c0.O 2> c0.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test c0(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp c0.O $srcdir/c0.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed c0(<)"; fi ;;
-    1) $echo "Test c0(<) failed: files c0.O and $srcdir/c0.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test c0(<) may have failed." 1>&2;
-       $echo The command "cmp c0.O $srcdir/c0.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed c0(<)"; fi;;
+    1) $echo "Test c0(<) failed: files c0.O and $srcdir/c0.X differ" 1>&2
+       (diff -c c0.O $srcdir/c0.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test c0(<) may have failed." 1>&2
+       $echo The command "cmp c0.O $srcdir/c0.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s c0.E || rm -f c0.E
 cat $srcdir/c1.I | $xx -L > c1.O 2> c1.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test c1(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp c1.O $srcdir/c1.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed c1(|)"; fi ;;
-    1) $echo "Test c1(|) failed: files c1.O and $srcdir/c1.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test c1(|) may have failed." 1>&2;
-       $echo The command "cmp c1.O $srcdir/c1.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed c1(|)"; fi;;
+    1) $echo "Test c1(|) failed: files c1.O and $srcdir/c1.X differ" 1>&2
+       (diff -c c1.O $srcdir/c1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test c1(|) may have failed." 1>&2
+       $echo The command "cmp c1.O $srcdir/c1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s c1.E || rm -f c1.E
 $xx -L < $srcdir/c1.I > c1.O 2> c1.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test c1(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp c1.O $srcdir/c1.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed c1(<)"; fi ;;
-    1) $echo "Test c1(<) failed: files c1.O and $srcdir/c1.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test c1(<) may have failed." 1>&2;
-       $echo The command "cmp c1.O $srcdir/c1.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed c1(<)"; fi;;
+    1) $echo "Test c1(<) failed: files c1.O and $srcdir/c1.X differ" 1>&2
+       (diff -c c1.O $srcdir/c1.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test c1(<) may have failed." 1>&2
+       $echo The command "cmp c1.O $srcdir/c1.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s c1.E || rm -f c1.E
 cat $srcdir/c2.I | $xx -L > c2.O 2> c2.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test c2(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp c2.O $srcdir/c2.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed c2(|)"; fi ;;
-    1) $echo "Test c2(|) failed: files c2.O and $srcdir/c2.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test c2(|) may have failed." 1>&2;
-       $echo The command "cmp c2.O $srcdir/c2.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed c2(|)"; fi;;
+    1) $echo "Test c2(|) failed: files c2.O and $srcdir/c2.X differ" 1>&2
+       (diff -c c2.O $srcdir/c2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test c2(|) may have failed." 1>&2
+       $echo The command "cmp c2.O $srcdir/c2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s c2.E || rm -f c2.E
 $xx -L < $srcdir/c2.I > c2.O 2> c2.E
 code=$?
-if test $code != 0 ; then
+if test $code != 0; then
   $echo "Test c2(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp c2.O $srcdir/c2.X > /dev/null 2>&1
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed c2(<)"; fi ;;
-    1) $echo "Test c2(<) failed: files c2.O and $srcdir/c2.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test c2(<) may have failed." 1>&2;
-       $echo The command "cmp c2.O $srcdir/c2.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
+    0) if test "$VERBOSE"; then $echo "passed c2(<)"; fi;;
+    1) $echo "Test c2(<) failed: files c2.O and $srcdir/c2.X differ" 1>&2
+       (diff -c c2.O $srcdir/c2.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test c2(<) may have failed." 1>&2
+       $echo The command "cmp c2.O $srcdir/c2.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
   esac
 fi
 test -s c2.E || rm -f c2.E
-if test $errors = 0 ; then
+if test $errors = 0; then
   $echo Passed all 30 tests. 1>&2
 else
   $echo Failed $errors tests. 1>&2