From e566848d2a367a08480ee34ce283b839db8aee5f Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Sun, 3 Mar 2002 09:57:20 +0000
Subject: .

---
 tests/cut/cut-tests   | 264 +++++++++++++++++++++++++-------------------------
 tests/join/join-tests |  76 +++++++--------
 tests/tac/tac-tests   | 102 +++++++++----------
 tests/tail/tail-tests |  74 +++++++-------
 tests/tr/tr-tests     | 228 +++++++++++++++++++++----------------------
 tests/wc/wc-tests     |  60 ++++++------
 6 files changed, 402 insertions(+), 402 deletions(-)

(limited to 'tests')

diff --git a/tests/cut/cut-tests b/tests/cut/cut-tests
index e24ad918a..ecbd16750 100755
--- a/tests/cut/cut-tests
+++ b/tests/cut/cut-tests
@@ -18,7 +18,7 @@ export LC_ALL
 LANG=C
 export LANG
 
- $xx -d: -f1,3- $srcdir/1.I > 1.O 2> 1.E
+$xx -d: -f1,3- $srcdir/1.I > 1.O 2> 1.E
 code=$?
 if test $code != 0; then
   $echo "Test 1(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -36,7 +36,7 @@ else
   esac
 fi
 test -s 1.E || rm -f 1.E
-cat $srcdir/1.I |  $xx -d: -f1,3- > 1.O 2> 1.E
+cat $srcdir/1.I | $xx -d: -f1,3- > 1.O 2> 1.E
 code=$?
 if test $code != 0; then
   $echo "Test 1(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -54,7 +54,7 @@ else
   esac
 fi
 test -s 1.E || rm -f 1.E
- $xx -d: -f1,3- < $srcdir/1.I > 1.O 2> 1.E
+$xx -d: -f1,3- < $srcdir/1.I > 1.O 2> 1.E
 code=$?
 if test $code != 0; then
   $echo "Test 1(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -72,7 +72,7 @@ else
   esac
 fi
 test -s 1.E || rm -f 1.E
- $xx -d: -f1,3- $srcdir/2.I > 2.O 2> 2.E
+$xx -d: -f1,3- $srcdir/2.I > 2.O 2> 2.E
 code=$?
 if test $code != 0; then
   $echo "Test 2(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -90,7 +90,7 @@ else
   esac
 fi
 test -s 2.E || rm -f 2.E
-cat $srcdir/2.I |  $xx -d: -f1,3- > 2.O 2> 2.E
+cat $srcdir/2.I | $xx -d: -f1,3- > 2.O 2> 2.E
 code=$?
 if test $code != 0; then
   $echo "Test 2(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -108,7 +108,7 @@ else
   esac
 fi
 test -s 2.E || rm -f 2.E
- $xx -d: -f1,3- < $srcdir/2.I > 2.O 2> 2.E
+$xx -d: -f1,3- < $srcdir/2.I > 2.O 2> 2.E
 code=$?
 if test $code != 0; then
   $echo "Test 2(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -126,7 +126,7 @@ else
   esac
 fi
 test -s 2.E || rm -f 2.E
- $xx -d: -f2- $srcdir/3.I > 3.O 2> 3.E
+$xx -d: -f2- $srcdir/3.I > 3.O 2> 3.E
 code=$?
 if test $code != 0; then
   $echo "Test 3(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -144,7 +144,7 @@ else
   esac
 fi
 test -s 3.E || rm -f 3.E
-cat $srcdir/3.I |  $xx -d: -f2- > 3.O 2> 3.E
+cat $srcdir/3.I | $xx -d: -f2- > 3.O 2> 3.E
 code=$?
 if test $code != 0; then
   $echo "Test 3(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -162,7 +162,7 @@ else
   esac
 fi
 test -s 3.E || rm -f 3.E
- $xx -d: -f2- < $srcdir/3.I > 3.O 2> 3.E
+$xx -d: -f2- < $srcdir/3.I > 3.O 2> 3.E
 code=$?
 if test $code != 0; then
   $echo "Test 3(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -180,7 +180,7 @@ else
   esac
 fi
 test -s 3.E || rm -f 3.E
- $xx -d: -f4 $srcdir/4.I > 4.O 2> 4.E
+$xx -d: -f4 $srcdir/4.I > 4.O 2> 4.E
 code=$?
 if test $code != 0; then
   $echo "Test 4(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -198,7 +198,7 @@ else
   esac
 fi
 test -s 4.E || rm -f 4.E
-cat $srcdir/4.I |  $xx -d: -f4 > 4.O 2> 4.E
+cat $srcdir/4.I | $xx -d: -f4 > 4.O 2> 4.E
 code=$?
 if test $code != 0; then
   $echo "Test 4(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -216,7 +216,7 @@ else
   esac
 fi
 test -s 4.E || rm -f 4.E
- $xx -d: -f4 < $srcdir/4.I > 4.O 2> 4.E
+$xx -d: -f4 < $srcdir/4.I > 4.O 2> 4.E
 code=$?
 if test $code != 0; then
   $echo "Test 4(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -234,7 +234,7 @@ else
   esac
 fi
 test -s 4.E || rm -f 4.E
- $xx -d: -f4 $srcdir/5.I > 5.O 2> 5.E
+$xx -d: -f4 $srcdir/5.I > 5.O 2> 5.E
 code=$?
 if test $code != 0; then
   $echo "Test 5(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -252,7 +252,7 @@ else
   esac
 fi
 test -s 5.E || rm -f 5.E
-cat $srcdir/5.I |  $xx -d: -f4 > 5.O 2> 5.E
+cat $srcdir/5.I | $xx -d: -f4 > 5.O 2> 5.E
 code=$?
 if test $code != 0; then
   $echo "Test 5(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -270,7 +270,7 @@ else
   esac
 fi
 test -s 5.E || rm -f 5.E
- $xx -d: -f4 < $srcdir/5.I > 5.O 2> 5.E
+$xx -d: -f4 < $srcdir/5.I > 5.O 2> 5.E
 code=$?
 if test $code != 0; then
   $echo "Test 5(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -288,7 +288,7 @@ else
   esac
 fi
 test -s 5.E || rm -f 5.E
- $xx -c4 $srcdir/6.I > 6.O 2> 6.E
+$xx -c4 $srcdir/6.I > 6.O 2> 6.E
 code=$?
 if test $code != 0; then
   $echo "Test 6(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -306,7 +306,7 @@ else
   esac
 fi
 test -s 6.E || rm -f 6.E
-cat $srcdir/6.I |  $xx -c4 > 6.O 2> 6.E
+cat $srcdir/6.I | $xx -c4 > 6.O 2> 6.E
 code=$?
 if test $code != 0; then
   $echo "Test 6(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -324,7 +324,7 @@ else
   esac
 fi
 test -s 6.E || rm -f 6.E
- $xx -c4 < $srcdir/6.I > 6.O 2> 6.E
+$xx -c4 < $srcdir/6.I > 6.O 2> 6.E
 code=$?
 if test $code != 0; then
   $echo "Test 6(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -342,7 +342,7 @@ else
   esac
 fi
 test -s 6.E || rm -f 6.E
- $xx -c4 $srcdir/7.I > 7.O 2> 7.E
+$xx -c4 $srcdir/7.I > 7.O 2> 7.E
 code=$?
 if test $code != 0; then
   $echo "Test 7(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -360,7 +360,7 @@ else
   esac
 fi
 test -s 7.E || rm -f 7.E
-cat $srcdir/7.I |  $xx -c4 > 7.O 2> 7.E
+cat $srcdir/7.I | $xx -c4 > 7.O 2> 7.E
 code=$?
 if test $code != 0; then
   $echo "Test 7(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -378,7 +378,7 @@ else
   esac
 fi
 test -s 7.E || rm -f 7.E
- $xx -c4 < $srcdir/7.I > 7.O 2> 7.E
+$xx -c4 < $srcdir/7.I > 7.O 2> 7.E
 code=$?
 if test $code != 0; then
   $echo "Test 7(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -396,7 +396,7 @@ else
   esac
 fi
 test -s 7.E || rm -f 7.E
- $xx -c4 $srcdir/8.I > 8.O 2> 8.E
+$xx -c4 $srcdir/8.I > 8.O 2> 8.E
 code=$?
 if test $code != 0; then
   $echo "Test 8(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -414,7 +414,7 @@ else
   esac
 fi
 test -s 8.E || rm -f 8.E
-cat $srcdir/8.I |  $xx -c4 > 8.O 2> 8.E
+cat $srcdir/8.I | $xx -c4 > 8.O 2> 8.E
 code=$?
 if test $code != 0; then
   $echo "Test 8(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -432,7 +432,7 @@ else
   esac
 fi
 test -s 8.E || rm -f 8.E
- $xx -c4 < $srcdir/8.I > 8.O 2> 8.E
+$xx -c4 < $srcdir/8.I > 8.O 2> 8.E
 code=$?
 if test $code != 0; then
   $echo "Test 8(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -450,7 +450,7 @@ else
   esac
 fi
 test -s 8.E || rm -f 8.E
- $xx -c4 $srcdir/9.I > 9.O 2> 9.E
+$xx -c4 $srcdir/9.I > 9.O 2> 9.E
 code=$?
 if test $code != 0; then
   $echo "Test 9(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -468,7 +468,7 @@ else
   esac
 fi
 test -s 9.E || rm -f 9.E
-cat $srcdir/9.I |  $xx -c4 > 9.O 2> 9.E
+cat $srcdir/9.I | $xx -c4 > 9.O 2> 9.E
 code=$?
 if test $code != 0; then
   $echo "Test 9(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -486,7 +486,7 @@ else
   esac
 fi
 test -s 9.E || rm -f 9.E
- $xx -c4 < $srcdir/9.I > 9.O 2> 9.E
+$xx -c4 < $srcdir/9.I > 9.O 2> 9.E
 code=$?
 if test $code != 0; then
   $echo "Test 9(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -504,7 +504,7 @@ else
   esac
 fi
 test -s 9.E || rm -f 9.E
- $xx -s -d: -f3- $srcdir/a.I > a.O 2> a.E
+$xx -s -d: -f3- $srcdir/a.I > a.O 2> a.E
 code=$?
 if test $code != 0; then
   $echo "Test a(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -522,7 +522,7 @@ else
   esac
 fi
 test -s a.E || rm -f a.E
-cat $srcdir/a.I |  $xx -s -d: -f3- > a.O 2> a.E
+cat $srcdir/a.I | $xx -s -d: -f3- > a.O 2> a.E
 code=$?
 if test $code != 0; then
   $echo "Test a(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -540,7 +540,7 @@ else
   esac
 fi
 test -s a.E || rm -f a.E
- $xx -s -d: -f3- < $srcdir/a.I > a.O 2> a.E
+$xx -s -d: -f3- < $srcdir/a.I > a.O 2> a.E
 code=$?
 if test $code != 0; then
   $echo "Test a(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -558,7 +558,7 @@ else
   esac
 fi
 test -s a.E || rm -f a.E
- $xx -s -d: -f2,3 $srcdir/b.I > b.O 2> b.E
+$xx -s -d: -f2,3 $srcdir/b.I > b.O 2> b.E
 code=$?
 if test $code != 0; then
   $echo "Test b(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -576,7 +576,7 @@ else
   esac
 fi
 test -s b.E || rm -f b.E
-cat $srcdir/b.I |  $xx -s -d: -f2,3 > b.O 2> b.E
+cat $srcdir/b.I | $xx -s -d: -f2,3 > b.O 2> b.E
 code=$?
 if test $code != 0; then
   $echo "Test b(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -594,7 +594,7 @@ else
   esac
 fi
 test -s b.E || rm -f b.E
- $xx -s -d: -f2,3 < $srcdir/b.I > b.O 2> b.E
+$xx -s -d: -f2,3 < $srcdir/b.I > b.O 2> b.E
 code=$?
 if test $code != 0; then
   $echo "Test b(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -612,7 +612,7 @@ else
   esac
 fi
 test -s b.E || rm -f b.E
- $xx -s -d: -f1,3 $srcdir/c.I > c.O 2> c.E
+$xx -s -d: -f1,3 $srcdir/c.I > c.O 2> c.E
 code=$?
 if test $code != 0; then
   $echo "Test c(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -630,7 +630,7 @@ else
   esac
 fi
 test -s c.E || rm -f c.E
-cat $srcdir/c.I |  $xx -s -d: -f1,3 > c.O 2> c.E
+cat $srcdir/c.I | $xx -s -d: -f1,3 > c.O 2> c.E
 code=$?
 if test $code != 0; then
   $echo "Test c(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -648,7 +648,7 @@ else
   esac
 fi
 test -s c.E || rm -f c.E
- $xx -s -d: -f1,3 < $srcdir/c.I > c.O 2> c.E
+$xx -s -d: -f1,3 < $srcdir/c.I > c.O 2> c.E
 code=$?
 if test $code != 0; then
   $echo "Test c(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -666,7 +666,7 @@ else
   esac
 fi
 test -s c.E || rm -f c.E
- $xx -s -d: -f1,3 $srcdir/d.I > d.O 2> d.E
+$xx -s -d: -f1,3 $srcdir/d.I > d.O 2> d.E
 code=$?
 if test $code != 0; then
   $echo "Test d(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -684,7 +684,7 @@ else
   esac
 fi
 test -s d.E || rm -f d.E
-cat $srcdir/d.I |  $xx -s -d: -f1,3 > d.O 2> d.E
+cat $srcdir/d.I | $xx -s -d: -f1,3 > d.O 2> d.E
 code=$?
 if test $code != 0; then
   $echo "Test d(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -702,7 +702,7 @@ else
   esac
 fi
 test -s d.E || rm -f d.E
- $xx -s -d: -f1,3 < $srcdir/d.I > d.O 2> d.E
+$xx -s -d: -f1,3 < $srcdir/d.I > d.O 2> d.E
 code=$?
 if test $code != 0; then
   $echo "Test d(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -720,7 +720,7 @@ else
   esac
 fi
 test -s d.E || rm -f d.E
- $xx -s -d: -f3- $srcdir/e.I > e.O 2> e.E
+$xx -s -d: -f3- $srcdir/e.I > e.O 2> e.E
 code=$?
 if test $code != 0; then
   $echo "Test e(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -738,7 +738,7 @@ else
   esac
 fi
 test -s e.E || rm -f e.E
-cat $srcdir/e.I |  $xx -s -d: -f3- > e.O 2> e.E
+cat $srcdir/e.I | $xx -s -d: -f3- > e.O 2> e.E
 code=$?
 if test $code != 0; then
   $echo "Test e(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -756,7 +756,7 @@ else
   esac
 fi
 test -s e.E || rm -f e.E
- $xx -s -d: -f3- < $srcdir/e.I > e.O 2> e.E
+$xx -s -d: -f3- < $srcdir/e.I > e.O 2> e.E
 code=$?
 if test $code != 0; then
   $echo "Test e(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -774,7 +774,7 @@ else
   esac
 fi
 test -s e.E || rm -f e.E
- $xx -s -d: -f3-4 $srcdir/f.I > f.O 2> f.E
+$xx -s -d: -f3-4 $srcdir/f.I > f.O 2> f.E
 code=$?
 if test $code != 0; then
   $echo "Test f(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -792,7 +792,7 @@ else
   esac
 fi
 test -s f.E || rm -f f.E
-cat $srcdir/f.I |  $xx -s -d: -f3-4 > f.O 2> f.E
+cat $srcdir/f.I | $xx -s -d: -f3-4 > f.O 2> f.E
 code=$?
 if test $code != 0; then
   $echo "Test f(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -810,7 +810,7 @@ else
   esac
 fi
 test -s f.E || rm -f f.E
- $xx -s -d: -f3-4 < $srcdir/f.I > f.O 2> f.E
+$xx -s -d: -f3-4 < $srcdir/f.I > f.O 2> f.E
 code=$?
 if test $code != 0; then
   $echo "Test f(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -828,7 +828,7 @@ else
   esac
 fi
 test -s f.E || rm -f f.E
- $xx -s -d: -f3,4 $srcdir/g.I > g.O 2> g.E
+$xx -s -d: -f3,4 $srcdir/g.I > g.O 2> g.E
 code=$?
 if test $code != 0; then
   $echo "Test g(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -846,7 +846,7 @@ else
   esac
 fi
 test -s g.E || rm -f g.E
-cat $srcdir/g.I |  $xx -s -d: -f3,4 > g.O 2> g.E
+cat $srcdir/g.I | $xx -s -d: -f3,4 > g.O 2> g.E
 code=$?
 if test $code != 0; then
   $echo "Test g(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -864,7 +864,7 @@ else
   esac
 fi
 test -s g.E || rm -f g.E
- $xx -s -d: -f3,4 < $srcdir/g.I > g.O 2> g.E
+$xx -s -d: -f3,4 < $srcdir/g.I > g.O 2> g.E
 code=$?
 if test $code != 0; then
   $echo "Test g(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -882,7 +882,7 @@ else
   esac
 fi
 test -s g.E || rm -f g.E
- $xx -s -d: -f2,3 $srcdir/h.I > h.O 2> h.E
+$xx -s -d: -f2,3 $srcdir/h.I > h.O 2> h.E
 code=$?
 if test $code != 0; then
   $echo "Test h(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -900,7 +900,7 @@ else
   esac
 fi
 test -s h.E || rm -f h.E
-cat $srcdir/h.I |  $xx -s -d: -f2,3 > h.O 2> h.E
+cat $srcdir/h.I | $xx -s -d: -f2,3 > h.O 2> h.E
 code=$?
 if test $code != 0; then
   $echo "Test h(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -918,7 +918,7 @@ else
   esac
 fi
 test -s h.E || rm -f h.E
- $xx -s -d: -f2,3 < $srcdir/h.I > h.O 2> h.E
+$xx -s -d: -f2,3 < $srcdir/h.I > h.O 2> h.E
 code=$?
 if test $code != 0; then
   $echo "Test h(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -936,7 +936,7 @@ else
   esac
 fi
 test -s h.E || rm -f h.E
- $xx -d: -f1-3 $srcdir/i.I > i.O 2> i.E
+$xx -d: -f1-3 $srcdir/i.I > i.O 2> i.E
 code=$?
 if test $code != 0; then
   $echo "Test i(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -954,7 +954,7 @@ else
   esac
 fi
 test -s i.E || rm -f i.E
-cat $srcdir/i.I |  $xx -d: -f1-3 > i.O 2> i.E
+cat $srcdir/i.I | $xx -d: -f1-3 > i.O 2> i.E
 code=$?
 if test $code != 0; then
   $echo "Test i(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -972,7 +972,7 @@ else
   esac
 fi
 test -s i.E || rm -f i.E
- $xx -d: -f1-3 < $srcdir/i.I > i.O 2> i.E
+$xx -d: -f1-3 < $srcdir/i.I > i.O 2> i.E
 code=$?
 if test $code != 0; then
   $echo "Test i(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -990,7 +990,7 @@ else
   esac
 fi
 test -s i.E || rm -f i.E
- $xx -d: -f1-4 $srcdir/j.I > j.O 2> j.E
+$xx -d: -f1-4 $srcdir/j.I > j.O 2> j.E
 code=$?
 if test $code != 0; then
   $echo "Test j(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1008,7 +1008,7 @@ else
   esac
 fi
 test -s j.E || rm -f j.E
-cat $srcdir/j.I |  $xx -d: -f1-4 > j.O 2> j.E
+cat $srcdir/j.I | $xx -d: -f1-4 > j.O 2> j.E
 code=$?
 if test $code != 0; then
   $echo "Test j(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1026,7 +1026,7 @@ else
   esac
 fi
 test -s j.E || rm -f j.E
- $xx -d: -f1-4 < $srcdir/j.I > j.O 2> j.E
+$xx -d: -f1-4 < $srcdir/j.I > j.O 2> j.E
 code=$?
 if test $code != 0; then
   $echo "Test j(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1044,7 +1044,7 @@ else
   esac
 fi
 test -s j.E || rm -f j.E
- $xx -d: -f2-3 $srcdir/k.I > k.O 2> k.E
+$xx -d: -f2-3 $srcdir/k.I > k.O 2> k.E
 code=$?
 if test $code != 0; then
   $echo "Test k(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1062,7 +1062,7 @@ else
   esac
 fi
 test -s k.E || rm -f k.E
-cat $srcdir/k.I |  $xx -d: -f2-3 > k.O 2> k.E
+cat $srcdir/k.I | $xx -d: -f2-3 > k.O 2> k.E
 code=$?
 if test $code != 0; then
   $echo "Test k(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1080,7 +1080,7 @@ else
   esac
 fi
 test -s k.E || rm -f k.E
- $xx -d: -f2-3 < $srcdir/k.I > k.O 2> k.E
+$xx -d: -f2-3 < $srcdir/k.I > k.O 2> k.E
 code=$?
 if test $code != 0; then
   $echo "Test k(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1098,7 +1098,7 @@ else
   esac
 fi
 test -s k.E || rm -f k.E
- $xx -d: -f2-4 $srcdir/l.I > l.O 2> l.E
+$xx -d: -f2-4 $srcdir/l.I > l.O 2> l.E
 code=$?
 if test $code != 0; then
   $echo "Test l(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1116,7 +1116,7 @@ else
   esac
 fi
 test -s l.E || rm -f l.E
-cat $srcdir/l.I |  $xx -d: -f2-4 > l.O 2> l.E
+cat $srcdir/l.I | $xx -d: -f2-4 > l.O 2> l.E
 code=$?
 if test $code != 0; then
   $echo "Test l(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1134,7 +1134,7 @@ else
   esac
 fi
 test -s l.E || rm -f l.E
- $xx -d: -f2-4 < $srcdir/l.I > l.O 2> l.E
+$xx -d: -f2-4 < $srcdir/l.I > l.O 2> l.E
 code=$?
 if test $code != 0; then
   $echo "Test l(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1152,7 +1152,7 @@ else
   esac
 fi
 test -s l.E || rm -f l.E
- $xx -s -d: -f1-3 $srcdir/m.I > m.O 2> m.E
+$xx -s -d: -f1-3 $srcdir/m.I > m.O 2> m.E
 code=$?
 if test $code != 0; then
   $echo "Test m(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1170,7 +1170,7 @@ else
   esac
 fi
 test -s m.E || rm -f m.E
-cat $srcdir/m.I |  $xx -s -d: -f1-3 > m.O 2> m.E
+cat $srcdir/m.I | $xx -s -d: -f1-3 > m.O 2> m.E
 code=$?
 if test $code != 0; then
   $echo "Test m(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1188,7 +1188,7 @@ else
   esac
 fi
 test -s m.E || rm -f m.E
- $xx -s -d: -f1-3 < $srcdir/m.I > m.O 2> m.E
+$xx -s -d: -f1-3 < $srcdir/m.I > m.O 2> m.E
 code=$?
 if test $code != 0; then
   $echo "Test m(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1206,7 +1206,7 @@ else
   esac
 fi
 test -s m.E || rm -f m.E
- $xx -s -d: -f1-4 $srcdir/n.I > n.O 2> n.E
+$xx -s -d: -f1-4 $srcdir/n.I > n.O 2> n.E
 code=$?
 if test $code != 0; then
   $echo "Test n(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1224,7 +1224,7 @@ else
   esac
 fi
 test -s n.E || rm -f n.E
-cat $srcdir/n.I |  $xx -s -d: -f1-4 > n.O 2> n.E
+cat $srcdir/n.I | $xx -s -d: -f1-4 > n.O 2> n.E
 code=$?
 if test $code != 0; then
   $echo "Test n(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1242,7 +1242,7 @@ else
   esac
 fi
 test -s n.E || rm -f n.E
- $xx -s -d: -f1-4 < $srcdir/n.I > n.O 2> n.E
+$xx -s -d: -f1-4 < $srcdir/n.I > n.O 2> n.E
 code=$?
 if test $code != 0; then
   $echo "Test n(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1260,7 +1260,7 @@ else
   esac
 fi
 test -s n.E || rm -f n.E
- $xx -s -d: -f2-3 $srcdir/o.I > o.O 2> o.E
+$xx -s -d: -f2-3 $srcdir/o.I > o.O 2> o.E
 code=$?
 if test $code != 0; then
   $echo "Test o(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1278,7 +1278,7 @@ else
   esac
 fi
 test -s o.E || rm -f o.E
-cat $srcdir/o.I |  $xx -s -d: -f2-3 > o.O 2> o.E
+cat $srcdir/o.I | $xx -s -d: -f2-3 > o.O 2> o.E
 code=$?
 if test $code != 0; then
   $echo "Test o(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1296,7 +1296,7 @@ else
   esac
 fi
 test -s o.E || rm -f o.E
- $xx -s -d: -f2-3 < $srcdir/o.I > o.O 2> o.E
+$xx -s -d: -f2-3 < $srcdir/o.I > o.O 2> o.E
 code=$?
 if test $code != 0; then
   $echo "Test o(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1314,7 +1314,7 @@ else
   esac
 fi
 test -s o.E || rm -f o.E
- $xx -s -d: -f2-4 $srcdir/p.I > p.O 2> p.E
+$xx -s -d: -f2-4 $srcdir/p.I > p.O 2> p.E
 code=$?
 if test $code != 0; then
   $echo "Test p(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1332,7 +1332,7 @@ else
   esac
 fi
 test -s p.E || rm -f p.E
-cat $srcdir/p.I |  $xx -s -d: -f2-4 > p.O 2> p.E
+cat $srcdir/p.I | $xx -s -d: -f2-4 > p.O 2> p.E
 code=$?
 if test $code != 0; then
   $echo "Test p(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1350,7 +1350,7 @@ else
   esac
 fi
 test -s p.E || rm -f p.E
- $xx -s -d: -f2-4 < $srcdir/p.I > p.O 2> p.E
+$xx -s -d: -f2-4 < $srcdir/p.I > p.O 2> p.E
 code=$?
 if test $code != 0; then
   $echo "Test p(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1368,7 +1368,7 @@ else
   esac
 fi
 test -s p.E || rm -f p.E
- $xx -s -d: -f2-4 $srcdir/q.I > q.O 2> q.E
+$xx -s -d: -f2-4 $srcdir/q.I > q.O 2> q.E
 code=$?
 if test $code != 0; then
   $echo "Test q(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1386,7 +1386,7 @@ else
   esac
 fi
 test -s q.E || rm -f q.E
-cat $srcdir/q.I |  $xx -s -d: -f2-4 > q.O 2> q.E
+cat $srcdir/q.I | $xx -s -d: -f2-4 > q.O 2> q.E
 code=$?
 if test $code != 0; then
   $echo "Test q(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1404,7 +1404,7 @@ else
   esac
 fi
 test -s q.E || rm -f q.E
- $xx -s -d: -f2-4 < $srcdir/q.I > q.O 2> q.E
+$xx -s -d: -f2-4 < $srcdir/q.I > q.O 2> q.E
 code=$?
 if test $code != 0; then
   $echo "Test q(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1422,7 +1422,7 @@ else
   esac
 fi
 test -s q.E || rm -f q.E
- $xx -s -d: -f2-4 $srcdir/r.I > r.O 2> r.E
+$xx -s -d: -f2-4 $srcdir/r.I > r.O 2> r.E
 code=$?
 if test $code != 0; then
   $echo "Test r(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1440,7 +1440,7 @@ else
   esac
 fi
 test -s r.E || rm -f r.E
-cat $srcdir/r.I |  $xx -s -d: -f2-4 > r.O 2> r.E
+cat $srcdir/r.I | $xx -s -d: -f2-4 > r.O 2> r.E
 code=$?
 if test $code != 0; then
   $echo "Test r(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1458,7 +1458,7 @@ else
   esac
 fi
 test -s r.E || rm -f r.E
- $xx -s -d: -f2-4 < $srcdir/r.I > r.O 2> r.E
+$xx -s -d: -f2-4 < $srcdir/r.I > r.O 2> r.E
 code=$?
 if test $code != 0; then
   $echo "Test r(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1476,7 +1476,7 @@ else
   esac
 fi
 test -s r.E || rm -f r.E
- $xx -s -d: -f1-4 $srcdir/s.I > s.O 2> s.E
+$xx -s -d: -f1-4 $srcdir/s.I > s.O 2> s.E
 code=$?
 if test $code != 0; then
   $echo "Test s(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1494,7 +1494,7 @@ else
   esac
 fi
 test -s s.E || rm -f s.E
-cat $srcdir/s.I |  $xx -s -d: -f1-4 > s.O 2> s.E
+cat $srcdir/s.I | $xx -s -d: -f1-4 > s.O 2> s.E
 code=$?
 if test $code != 0; then
   $echo "Test s(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1512,7 +1512,7 @@ else
   esac
 fi
 test -s s.E || rm -f s.E
- $xx -s -d: -f1-4 < $srcdir/s.I > s.O 2> s.E
+$xx -s -d: -f1-4 < $srcdir/s.I > s.O 2> s.E
 code=$?
 if test $code != 0; then
   $echo "Test s(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1530,7 +1530,7 @@ else
   esac
 fi
 test -s s.E || rm -f s.E
- $xx -s -d: -f3- $srcdir/t.I > t.O 2> t.E
+$xx -s -d: -f3- $srcdir/t.I > t.O 2> t.E
 code=$?
 if test $code != 0; then
   $echo "Test t(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1548,7 +1548,7 @@ else
   esac
 fi
 test -s t.E || rm -f t.E
-cat $srcdir/t.I |  $xx -s -d: -f3- > t.O 2> t.E
+cat $srcdir/t.I | $xx -s -d: -f3- > t.O 2> t.E
 code=$?
 if test $code != 0; then
   $echo "Test t(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1566,7 +1566,7 @@ else
   esac
 fi
 test -s t.E || rm -f t.E
- $xx -s -d: -f3- < $srcdir/t.I > t.O 2> t.E
+$xx -s -d: -f3- < $srcdir/t.I > t.O 2> t.E
 code=$?
 if test $code != 0; then
   $echo "Test t(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1584,7 +1584,7 @@ else
   esac
 fi
 test -s t.E || rm -f t.E
- $xx -s -f3- $srcdir/u.I > u.O 2> u.E
+$xx -s -f3- $srcdir/u.I > u.O 2> u.E
 code=$?
 if test $code != 0; then
   $echo "Test u(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1602,7 +1602,7 @@ else
   esac
 fi
 test -s u.E || rm -f u.E
-cat $srcdir/u.I |  $xx -s -f3- > u.O 2> u.E
+cat $srcdir/u.I | $xx -s -f3- > u.O 2> u.E
 code=$?
 if test $code != 0; then
   $echo "Test u(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1620,7 +1620,7 @@ else
   esac
 fi
 test -s u.E || rm -f u.E
- $xx -s -f3- < $srcdir/u.I > u.O 2> u.E
+$xx -s -f3- < $srcdir/u.I > u.O 2> u.E
 code=$?
 if test $code != 0; then
   $echo "Test u(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1638,7 +1638,7 @@ else
   esac
 fi
 test -s u.E || rm -f u.E
- $xx -f3- $srcdir/v.I > v.O 2> v.E
+$xx -f3- $srcdir/v.I > v.O 2> v.E
 code=$?
 if test $code != 0; then
   $echo "Test v(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1656,7 +1656,7 @@ else
   esac
 fi
 test -s v.E || rm -f v.E
-cat $srcdir/v.I |  $xx -f3- > v.O 2> v.E
+cat $srcdir/v.I | $xx -f3- > v.O 2> v.E
 code=$?
 if test $code != 0; then
   $echo "Test v(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1674,7 +1674,7 @@ else
   esac
 fi
 test -s v.E || rm -f v.E
- $xx -f3- < $srcdir/v.I > v.O 2> v.E
+$xx -f3- < $srcdir/v.I > v.O 2> v.E
 code=$?
 if test $code != 0; then
   $echo "Test v(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1692,7 +1692,7 @@ else
   esac
 fi
 test -s v.E || rm -f v.E
- $xx -b 1 $srcdir/w.I > w.O 2> w.E
+$xx -b 1 $srcdir/w.I > w.O 2> w.E
 code=$?
 if test $code != 0; then
   $echo "Test w(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1710,7 +1710,7 @@ else
   esac
 fi
 test -s w.E || rm -f w.E
-cat $srcdir/w.I |  $xx -b 1 > w.O 2> w.E
+cat $srcdir/w.I | $xx -b 1 > w.O 2> w.E
 code=$?
 if test $code != 0; then
   $echo "Test w(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1728,7 +1728,7 @@ else
   esac
 fi
 test -s w.E || rm -f w.E
- $xx -b 1 < $srcdir/w.I > w.O 2> w.E
+$xx -b 1 < $srcdir/w.I > w.O 2> w.E
 code=$?
 if test $code != 0; then
   $echo "Test w(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1746,7 +1746,7 @@ else
   esac
 fi
 test -s w.E || rm -f w.E
- $xx -s -d: -f2-4 $srcdir/x.I > x.O 2> x.E
+$xx -s -d: -f2-4 $srcdir/x.I > x.O 2> x.E
 code=$?
 if test $code != 0; then
   $echo "Test x(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1764,7 +1764,7 @@ else
   esac
 fi
 test -s x.E || rm -f x.E
-cat $srcdir/x.I |  $xx -s -d: -f2-4 > x.O 2> x.E
+cat $srcdir/x.I | $xx -s -d: -f2-4 > x.O 2> x.E
 code=$?
 if test $code != 0; then
   $echo "Test x(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1782,7 +1782,7 @@ else
   esac
 fi
 test -s x.E || rm -f x.E
- $xx -s -d: -f2-4 < $srcdir/x.I > x.O 2> x.E
+$xx -s -d: -f2-4 < $srcdir/x.I > x.O 2> x.E
 code=$?
 if test $code != 0; then
   $echo "Test x(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -1800,7 +1800,7 @@ else
   esac
 fi
 test -s x.E || rm -f x.E
- $xx -s -b4 $srcdir/y.I > y.O 2> y.E
+$xx -s -b4 $srcdir/y.I > y.O 2> y.E
 code=$?
 if test $code != 1; then
   $echo "Test y(F) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
@@ -1818,7 +1818,7 @@ else
   esac
 fi
 test -s y.E || rm -f y.E
- $xx -s -b4 < $srcdir/y.I > y.O 2> y.E
+$xx -s -b4 < $srcdir/y.I > y.O 2> y.E
 code=$?
 if test $code != 1; then
   $echo "Test y(<) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
@@ -1836,7 +1836,7 @@ else
   esac
 fi
 test -s y.E || rm -f y.E
- $xx  $srcdir/z.I > z.O 2> z.E
+$xx  $srcdir/z.I > z.O 2> z.E
 code=$?
 if test $code != 1; then
   $echo "Test z(F) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
@@ -1854,7 +1854,7 @@ else
   esac
 fi
 test -s z.E || rm -f z.E
- $xx  < $srcdir/z.I > z.O 2> z.E
+$xx  < $srcdir/z.I > z.O 2> z.E
 code=$?
 if test $code != 1; then
   $echo "Test z(<) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
@@ -1872,7 +1872,7 @@ else
   esac
 fi
 test -s z.E || rm -f z.E
- $xx -f '' $srcdir/empty-fl.I > empty-fl.O 2> empty-fl.E
+$xx -f '' $srcdir/empty-fl.I > empty-fl.O 2> empty-fl.E
 code=$?
 if test $code != 1; then
   $echo "Test empty-fl(F) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
@@ -1890,7 +1890,7 @@ else
   esac
 fi
 test -s empty-fl.E || rm -f empty-fl.E
- $xx -f '' < $srcdir/empty-fl.I > empty-fl.O 2> empty-fl.E
+$xx -f '' < $srcdir/empty-fl.I > empty-fl.O 2> empty-fl.E
 code=$?
 if test $code != 1; then
   $echo "Test empty-fl(<) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
@@ -1908,7 +1908,7 @@ else
   esac
 fi
 test -s empty-fl.E || rm -f empty-fl.E
- $xx -f $srcdir/missing-fl.I > missing-fl.O 2> missing-fl.E
+$xx -f $srcdir/missing-fl.I > missing-fl.O 2> missing-fl.E
 code=$?
 if test $code != 1; then
   $echo "Test missing-fl(F) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
@@ -1926,7 +1926,7 @@ else
   esac
 fi
 test -s missing-fl.E || rm -f missing-fl.E
- $xx -f < $srcdir/missing-fl.I > missing-fl.O 2> missing-fl.E
+$xx -f < $srcdir/missing-fl.I > missing-fl.O 2> missing-fl.E
 code=$?
 if test $code != 1; then
   $echo "Test missing-fl(<) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
@@ -1944,7 +1944,7 @@ else
   esac
 fi
 test -s missing-fl.E || rm -f missing-fl.E
- $xx -b '' $srcdir/empty-bl.I > empty-bl.O 2> empty-bl.E
+$xx -b '' $srcdir/empty-bl.I > empty-bl.O 2> empty-bl.E
 code=$?
 if test $code != 1; then
   $echo "Test empty-bl(F) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
@@ -1962,7 +1962,7 @@ else
   esac
 fi
 test -s empty-bl.E || rm -f empty-bl.E
- $xx -b '' < $srcdir/empty-bl.I > empty-bl.O 2> empty-bl.E
+$xx -b '' < $srcdir/empty-bl.I > empty-bl.O 2> empty-bl.E
 code=$?
 if test $code != 1; then
   $echo "Test empty-bl(<) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
@@ -1980,7 +1980,7 @@ else
   esac
 fi
 test -s empty-bl.E || rm -f empty-bl.E
- $xx -b $srcdir/missing-bl.I > missing-bl.O 2> missing-bl.E
+$xx -b $srcdir/missing-bl.I > missing-bl.O 2> missing-bl.E
 code=$?
 if test $code != 1; then
   $echo "Test missing-bl(F) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
@@ -1998,7 +1998,7 @@ else
   esac
 fi
 test -s missing-bl.E || rm -f missing-bl.E
- $xx -b < $srcdir/missing-bl.I > missing-bl.O 2> missing-bl.E
+$xx -b < $srcdir/missing-bl.I > missing-bl.O 2> missing-bl.E
 code=$?
 if test $code != 1; then
   $echo "Test missing-bl(<) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
@@ -2016,7 +2016,7 @@ else
   esac
 fi
 test -s missing-bl.E || rm -f missing-bl.E
- $xx -f1 $srcdir/empty-f1.I > empty-f1.O 2> empty-f1.E
+$xx -f1 $srcdir/empty-f1.I > empty-f1.O 2> empty-f1.E
 code=$?
 if test $code != 0; then
   $echo "Test empty-f1(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2034,7 +2034,7 @@ else
   esac
 fi
 test -s empty-f1.E || rm -f empty-f1.E
-cat $srcdir/empty-f1.I |  $xx -f1 > empty-f1.O 2> empty-f1.E
+cat $srcdir/empty-f1.I | $xx -f1 > empty-f1.O 2> empty-f1.E
 code=$?
 if test $code != 0; then
   $echo "Test empty-f1(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2052,7 +2052,7 @@ else
   esac
 fi
 test -s empty-f1.E || rm -f empty-f1.E
- $xx -f1 < $srcdir/empty-f1.I > empty-f1.O 2> empty-f1.E
+$xx -f1 < $srcdir/empty-f1.I > empty-f1.O 2> empty-f1.E
 code=$?
 if test $code != 0; then
   $echo "Test empty-f1(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2070,7 +2070,7 @@ else
   esac
 fi
 test -s empty-f1.E || rm -f empty-f1.E
- $xx -f2 $srcdir/empty-f2.I > empty-f2.O 2> empty-f2.E
+$xx -f2 $srcdir/empty-f2.I > empty-f2.O 2> empty-f2.E
 code=$?
 if test $code != 0; then
   $echo "Test empty-f2(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2088,7 +2088,7 @@ else
   esac
 fi
 test -s empty-f2.E || rm -f empty-f2.E
-cat $srcdir/empty-f2.I |  $xx -f2 > empty-f2.O 2> empty-f2.E
+cat $srcdir/empty-f2.I | $xx -f2 > empty-f2.O 2> empty-f2.E
 code=$?
 if test $code != 0; then
   $echo "Test empty-f2(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2106,7 +2106,7 @@ else
   esac
 fi
 test -s empty-f2.E || rm -f empty-f2.E
- $xx -f2 < $srcdir/empty-f2.I > empty-f2.O 2> empty-f2.E
+$xx -f2 < $srcdir/empty-f2.I > empty-f2.O 2> empty-f2.E
 code=$?
 if test $code != 0; then
   $echo "Test empty-f2(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2124,7 +2124,7 @@ else
   esac
 fi
 test -s empty-f2.E || rm -f empty-f2.E
- $xx -d: -f2,3 --out=_ $srcdir/o-delim.I > o-delim.O 2> o-delim.E
+$xx -d: -f2,3 --out=_ $srcdir/o-delim.I > o-delim.O 2> o-delim.E
 code=$?
 if test $code != 0; then
   $echo "Test o-delim(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2142,7 +2142,7 @@ else
   esac
 fi
 test -s o-delim.E || rm -f o-delim.E
-cat $srcdir/o-delim.I |  $xx -d: -f2,3 --out=_ > o-delim.O 2> o-delim.E
+cat $srcdir/o-delim.I | $xx -d: -f2,3 --out=_ > o-delim.O 2> o-delim.E
 code=$?
 if test $code != 0; then
   $echo "Test o-delim(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2160,7 +2160,7 @@ else
   esac
 fi
 test -s o-delim.E || rm -f o-delim.E
- $xx -d: -f2,3 --out=_ < $srcdir/o-delim.I > o-delim.O 2> o-delim.E
+$xx -d: -f2,3 --out=_ < $srcdir/o-delim.I > o-delim.O 2> o-delim.E
 code=$?
 if test $code != 0; then
   $echo "Test o-delim(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2178,7 +2178,7 @@ else
   esac
 fi
 test -s o-delim.E || rm -f o-delim.E
- $xx -d '' -f2,3 --out=_ $srcdir/nul-idelim.I > nul-idelim.O 2> nul-idelim.E
+$xx -d '' -f2,3 --out=_ $srcdir/nul-idelim.I > nul-idelim.O 2> nul-idelim.E
 code=$?
 if test $code != 0; then
   $echo "Test nul-idelim(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2196,7 +2196,7 @@ else
   esac
 fi
 test -s nul-idelim.E || rm -f nul-idelim.E
-cat $srcdir/nul-idelim.I |  $xx -d '' -f2,3 --out=_ > nul-idelim.O 2> nul-idelim.E
+cat $srcdir/nul-idelim.I | $xx -d '' -f2,3 --out=_ > nul-idelim.O 2> nul-idelim.E
 code=$?
 if test $code != 0; then
   $echo "Test nul-idelim(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2214,7 +2214,7 @@ else
   esac
 fi
 test -s nul-idelim.E || rm -f nul-idelim.E
- $xx -d '' -f2,3 --out=_ < $srcdir/nul-idelim.I > nul-idelim.O 2> nul-idelim.E
+$xx -d '' -f2,3 --out=_ < $srcdir/nul-idelim.I > nul-idelim.O 2> nul-idelim.E
 code=$?
 if test $code != 0; then
   $echo "Test nul-idelim(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2232,7 +2232,7 @@ else
   esac
 fi
 test -s nul-idelim.E || rm -f nul-idelim.E
- $xx -d: -f2,3 --out= $srcdir/nul-odelim.I > nul-odelim.O 2> nul-odelim.E
+$xx -d: -f2,3 --out= $srcdir/nul-odelim.I > nul-odelim.O 2> nul-odelim.E
 code=$?
 if test $code != 0; then
   $echo "Test nul-odelim(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2250,7 +2250,7 @@ else
   esac
 fi
 test -s nul-odelim.E || rm -f nul-odelim.E
-cat $srcdir/nul-odelim.I |  $xx -d: -f2,3 --out= > nul-odelim.O 2> nul-odelim.E
+cat $srcdir/nul-odelim.I | $xx -d: -f2,3 --out= > nul-odelim.O 2> nul-odelim.E
 code=$?
 if test $code != 0; then
   $echo "Test nul-odelim(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2268,7 +2268,7 @@ else
   esac
 fi
 test -s nul-odelim.E || rm -f nul-odelim.E
- $xx -d: -f2,3 --out= < $srcdir/nul-odelim.I > nul-odelim.O 2> nul-odelim.E
+$xx -d: -f2,3 --out= < $srcdir/nul-odelim.I > nul-odelim.O 2> nul-odelim.E
 code=$?
 if test $code != 0; then
   $echo "Test nul-odelim(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2286,7 +2286,7 @@ else
   esac
 fi
 test -s nul-odelim.E || rm -f nul-odelim.E
- $xx -d: -f2,3 --out=_._ $srcdir/multichar-od.I > multichar-od.O 2> multichar-od.E
+$xx -d: -f2,3 --out=_._ $srcdir/multichar-od.I > multichar-od.O 2> multichar-od.E
 code=$?
 if test $code != 0; then
   $echo "Test multichar-od(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2304,7 +2304,7 @@ else
   esac
 fi
 test -s multichar-od.E || rm -f multichar-od.E
-cat $srcdir/multichar-od.I |  $xx -d: -f2,3 --out=_._ > multichar-od.O 2> multichar-od.E
+cat $srcdir/multichar-od.I | $xx -d: -f2,3 --out=_._ > multichar-od.O 2> multichar-od.E
 code=$?
 if test $code != 0; then
   $echo "Test multichar-od(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2322,7 +2322,7 @@ else
   esac
 fi
 test -s multichar-od.E || rm -f multichar-od.E
- $xx -d: -f2,3 --out=_._ < $srcdir/multichar-od.I > multichar-od.O 2> multichar-od.E
+$xx -d: -f2,3 --out=_._ < $srcdir/multichar-od.I > multichar-od.O 2> multichar-od.E
 code=$?
 if test $code != 0; then
   $echo "Test multichar-od(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2340,7 +2340,7 @@ else
   esac
 fi
 test -s multichar-od.E || rm -f multichar-od.E
- $xx '-d­' -f2,3 --out=_ $srcdir/8bit-delim.I > 8bit-delim.O 2> 8bit-delim.E
+$xx '-d­' -f2,3 --out=_ $srcdir/8bit-delim.I > 8bit-delim.O 2> 8bit-delim.E
 code=$?
 if test $code != 0; then
   $echo "Test 8bit-delim(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2358,7 +2358,7 @@ else
   esac
 fi
 test -s 8bit-delim.E || rm -f 8bit-delim.E
-cat $srcdir/8bit-delim.I |  $xx '-d­' -f2,3 --out=_ > 8bit-delim.O 2> 8bit-delim.E
+cat $srcdir/8bit-delim.I | $xx '-d­' -f2,3 --out=_ > 8bit-delim.O 2> 8bit-delim.E
 code=$?
 if test $code != 0; then
   $echo "Test 8bit-delim(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
@@ -2376,7 +2376,7 @@ else
   esac
 fi
 test -s 8bit-delim.E || rm -f 8bit-delim.E
- $xx '-d­' -f2,3 --out=_ < $srcdir/8bit-delim.I > 8bit-delim.O 2> 8bit-delim.E
+$xx '-d­' -f2,3 --out=_ < $srcdir/8bit-delim.I > 8bit-delim.O 2> 8bit-delim.E
 code=$?
 if test $code != 0; then
   $echo "Test 8bit-delim(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
diff --git a/tests/join/join-tests b/tests/join/join-tests
index 18d01cde6..e79c23ea7 100755
--- a/tests/join/join-tests
+++ b/tests/join/join-tests
@@ -18,7 +18,7 @@ export LC_ALL
 LANG=C
 export LANG
 
- $xx -a1 $srcdir/1a.I1 $srcdir/1a.I2 > 1a.O 2> 1a.E
+$xx -a1 $srcdir/1a.I1 $srcdir/1a.I2 > 1a.O 2> 1a.E
 code=$?
 if test $code != 0; then
   $echo "Test 1a failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -36,7 +36,7 @@ else
   esac
 fi
 test -s 1a.E || rm -f 1a.E
- $xx -a2 $srcdir/1b.I1 $srcdir/1b.I2 > 1b.O 2> 1b.E
+$xx -a2 $srcdir/1b.I1 $srcdir/1b.I2 > 1b.O 2> 1b.E
 code=$?
 if test $code != 0; then
   $echo "Test 1b failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -54,7 +54,7 @@ else
   esac
 fi
 test -s 1b.E || rm -f 1b.E
- $xx -a1 -a2 $srcdir/1c.I1 $srcdir/1c.I2 > 1c.O 2> 1c.E
+$xx -a1 -a2 $srcdir/1c.I1 $srcdir/1c.I2 > 1c.O 2> 1c.E
 code=$?
 if test $code != 0; then
   $echo "Test 1c failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -72,7 +72,7 @@ else
   esac
 fi
 test -s 1c.E || rm -f 1c.E
- $xx -a1 $srcdir/1d.I1 $srcdir/1d.I2 > 1d.O 2> 1d.E
+$xx -a1 $srcdir/1d.I1 $srcdir/1d.I2 > 1d.O 2> 1d.E
 code=$?
 if test $code != 0; then
   $echo "Test 1d failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -90,7 +90,7 @@ else
   esac
 fi
 test -s 1d.E || rm -f 1d.E
- $xx -a2 $srcdir/1e.I1 $srcdir/1e.I2 > 1e.O 2> 1e.E
+$xx -a2 $srcdir/1e.I1 $srcdir/1e.I2 > 1e.O 2> 1e.E
 code=$?
 if test $code != 0; then
   $echo "Test 1e failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -108,7 +108,7 @@ else
   esac
 fi
 test -s 1e.E || rm -f 1e.E
- $xx -a2 $srcdir/1f.I1 $srcdir/1f.I2 > 1f.O 2> 1f.E
+$xx -a2 $srcdir/1f.I1 $srcdir/1f.I2 > 1f.O 2> 1f.E
 code=$?
 if test $code != 0; then
   $echo "Test 1f failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -126,7 +126,7 @@ else
   esac
 fi
 test -s 1f.E || rm -f 1f.E
- $xx -a1 -e . $srcdir/2a.I1 $srcdir/2a.I2 > 2a.O 2> 2a.E
+$xx -a1 -e . $srcdir/2a.I1 $srcdir/2a.I2 > 2a.O 2> 2a.E
 code=$?
 if test $code != 0; then
   $echo "Test 2a failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -144,7 +144,7 @@ else
   esac
 fi
 test -s 2a.E || rm -f 2a.E
- $xx -a1 -e . -o 2.1,2.2,2.3 $srcdir/2b.I1 $srcdir/2b.I2 > 2b.O 2> 2b.E
+$xx -a1 -e . -o 2.1,2.2,2.3 $srcdir/2b.I1 $srcdir/2b.I2 > 2b.O 2> 2b.E
 code=$?
 if test $code != 0; then
   $echo "Test 2b failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -162,7 +162,7 @@ else
   esac
 fi
 test -s 2b.E || rm -f 2b.E
- $xx -a1 -e . -o 2.1,2.2,2.3 $srcdir/2c.I1 $srcdir/2c.I2 > 2c.O 2> 2c.E
+$xx -a1 -e . -o 2.1,2.2,2.3 $srcdir/2c.I1 $srcdir/2c.I2 > 2c.O 2> 2c.E
 code=$?
 if test $code != 0; then
   $echo "Test 2c failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -180,7 +180,7 @@ else
   esac
 fi
 test -s 2c.E || rm -f 2c.E
- $xx -t: $srcdir/3a.I1 $srcdir/3a.I2 > 3a.O 2> 3a.E
+$xx -t: $srcdir/3a.I1 $srcdir/3a.I2 > 3a.O 2> 3a.E
 code=$?
 if test $code != 0; then
   $echo "Test 3a failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -198,7 +198,7 @@ else
   esac
 fi
 test -s 3a.E || rm -f 3a.E
- $xx -v 1 $srcdir/4a.I1 $srcdir/4a.I2 > 4a.O 2> 4a.E
+$xx -v 1 $srcdir/4a.I1 $srcdir/4a.I2 > 4a.O 2> 4a.E
 code=$?
 if test $code != 0; then
   $echo "Test 4a failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -216,7 +216,7 @@ else
   esac
 fi
 test -s 4a.E || rm -f 4a.E
- $xx -v 2 $srcdir/4b.I1 $srcdir/4b.I2 > 4b.O 2> 4b.E
+$xx -v 2 $srcdir/4b.I1 $srcdir/4b.I2 > 4b.O 2> 4b.E
 code=$?
 if test $code != 0; then
   $echo "Test 4b failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -234,7 +234,7 @@ else
   esac
 fi
 test -s 4b.E || rm -f 4b.E
- $xx -v 1 $srcdir/4c.I1 $srcdir/4c.I2 > 4c.O 2> 4c.E
+$xx -v 1 $srcdir/4c.I1 $srcdir/4c.I2 > 4c.O 2> 4c.E
 code=$?
 if test $code != 0; then
   $echo "Test 4c failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -252,7 +252,7 @@ else
   esac
 fi
 test -s 4c.E || rm -f 4c.E
- $xx -v 2 $srcdir/4d.I1 $srcdir/4d.I2 > 4d.O 2> 4d.E
+$xx -v 2 $srcdir/4d.I1 $srcdir/4d.I2 > 4d.O 2> 4d.E
 code=$?
 if test $code != 0; then
   $echo "Test 4d failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -270,7 +270,7 @@ else
   esac
 fi
 test -s 4d.E || rm -f 4d.E
- $xx -v 2 $srcdir/4e.I1 $srcdir/4e.I2 > 4e.O 2> 4e.E
+$xx -v 2 $srcdir/4e.I1 $srcdir/4e.I2 > 4e.O 2> 4e.E
 code=$?
 if test $code != 0; then
   $echo "Test 4e failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -288,7 +288,7 @@ else
   esac
 fi
 test -s 4e.E || rm -f 4e.E
- $xx -a1 -e - -o 1.1 2.2 $srcdir/5a.I1 $srcdir/5a.I2 > 5a.O 2> 5a.E
+$xx -a1 -e - -o 1.1 2.2 $srcdir/5a.I1 $srcdir/5a.I2 > 5a.O 2> 5a.E
 code=$?
 if test $code != 0; then
   $echo "Test 5a failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -306,7 +306,7 @@ else
   esac
 fi
 test -s 5a.E || rm -f 5a.E
- $xx -a1 -e - -o 1.1 2.2 $srcdir/5b.I1 $srcdir/5b.I2 > 5b.O 2> 5b.E
+$xx -a1 -e - -o 1.1 2.2 $srcdir/5b.I1 $srcdir/5b.I2 > 5b.O 2> 5b.E
 code=$?
 if test $code != 0; then
   $echo "Test 5b failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -324,7 +324,7 @@ else
   esac
 fi
 test -s 5b.E || rm -f 5b.E
- $xx -a1 -e - -o 1.1 2.2 $srcdir/5c.I1 $srcdir/5c.I2 > 5c.O 2> 5c.E
+$xx -a1 -e - -o 1.1 2.2 $srcdir/5c.I1 $srcdir/5c.I2 > 5c.O 2> 5c.E
 code=$?
 if test $code != 0; then
   $echo "Test 5c failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -342,7 +342,7 @@ else
   esac
 fi
 test -s 5c.E || rm -f 5c.E
- $xx -a1 -e - -o 1.1 2.2 $srcdir/5d.I1 $srcdir/5d.I2 > 5d.O 2> 5d.E
+$xx -a1 -e - -o 1.1 2.2 $srcdir/5d.I1 $srcdir/5d.I2 > 5d.O 2> 5d.E
 code=$?
 if test $code != 0; then
   $echo "Test 5d failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -360,7 +360,7 @@ else
   esac
 fi
 test -s 5d.E || rm -f 5d.E
- $xx -a2 -e - -o 1.1 2.2 $srcdir/5e.I1 $srcdir/5e.I2 > 5e.O 2> 5e.E
+$xx -a2 -e - -o 1.1 2.2 $srcdir/5e.I1 $srcdir/5e.I2 > 5e.O 2> 5e.E
 code=$?
 if test $code != 0; then
   $echo "Test 5e failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -378,7 +378,7 @@ else
   esac
 fi
 test -s 5e.E || rm -f 5e.E
- $xx -a2 -e - -o 2.2 1.1 $srcdir/5f.I1 $srcdir/5f.I2 > 5f.O 2> 5f.E
+$xx -a2 -e - -o 2.2 1.1 $srcdir/5f.I1 $srcdir/5f.I2 > 5f.O 2> 5f.E
 code=$?
 if test $code != 0; then
   $echo "Test 5f failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -396,7 +396,7 @@ else
   esac
 fi
 test -s 5f.E || rm -f 5f.E
- $xx -a1 -e - -o 2.2 1.1 $srcdir/5g.I1 $srcdir/5g.I2 > 5g.O 2> 5g.E
+$xx -a1 -e - -o 2.2 1.1 $srcdir/5g.I1 $srcdir/5g.I2 > 5g.O 2> 5g.E
 code=$?
 if test $code != 0; then
   $echo "Test 5g failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -414,7 +414,7 @@ else
   esac
 fi
 test -s 5g.E || rm -f 5g.E
- $xx -a1 -e - -o 2.2 1.1 $srcdir/5h.I1 $srcdir/5h.I2 > 5h.O 2> 5h.E
+$xx -a1 -e - -o 2.2 1.1 $srcdir/5h.I1 $srcdir/5h.I2 > 5h.O 2> 5h.E
 code=$?
 if test $code != 0; then
   $echo "Test 5h failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -432,7 +432,7 @@ else
   esac
 fi
 test -s 5h.E || rm -f 5h.E
- $xx -a1 -e - -o 1.1 2.2 $srcdir/5i.I1 $srcdir/5i.I2 > 5i.O 2> 5i.E
+$xx -a1 -e - -o 1.1 2.2 $srcdir/5i.I1 $srcdir/5i.I2 > 5i.O 2> 5i.E
 code=$?
 if test $code != 0; then
   $echo "Test 5i failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -450,7 +450,7 @@ else
   esac
 fi
 test -s 5i.E || rm -f 5i.E
- $xx -a2 -e - -o 2.2 1.1 $srcdir/5j.I1 $srcdir/5j.I2 > 5j.O 2> 5j.E
+$xx -a2 -e - -o 2.2 1.1 $srcdir/5j.I1 $srcdir/5j.I2 > 5j.O 2> 5j.E
 code=$?
 if test $code != 0; then
   $echo "Test 5j failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -468,7 +468,7 @@ else
   esac
 fi
 test -s 5j.E || rm -f 5j.E
- $xx -a2 -e - -o 2.2 1.1 $srcdir/5k.I1 $srcdir/5k.I2 > 5k.O 2> 5k.E
+$xx -a2 -e - -o 2.2 1.1 $srcdir/5k.I1 $srcdir/5k.I2 > 5k.O 2> 5k.E
 code=$?
 if test $code != 0; then
   $echo "Test 5k failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -486,7 +486,7 @@ else
   esac
 fi
 test -s 5k.E || rm -f 5k.E
- $xx -a1 -e - -o 2.2 1.1 $srcdir/5l.I1 $srcdir/5l.I2 > 5l.O 2> 5l.E
+$xx -a1 -e - -o 2.2 1.1 $srcdir/5l.I1 $srcdir/5l.I2 > 5l.O 2> 5l.E
 code=$?
 if test $code != 0; then
   $echo "Test 5l failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -504,7 +504,7 @@ else
   esac
 fi
 test -s 5l.E || rm -f 5l.E
- $xx -a2 -e - -o 2.2 1.1 $srcdir/5m.I1 $srcdir/5m.I2 > 5m.O 2> 5m.E
+$xx -a2 -e - -o 2.2 1.1 $srcdir/5m.I1 $srcdir/5m.I2 > 5m.O 2> 5m.E
 code=$?
 if test $code != 0; then
   $echo "Test 5m failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -522,7 +522,7 @@ else
   esac
 fi
 test -s 5m.E || rm -f 5m.E
- $xx -e - $srcdir/6a.I1 $srcdir/6a.I2 > 6a.O 2> 6a.E
+$xx -e - $srcdir/6a.I1 $srcdir/6a.I2 > 6a.O 2> 6a.E
 code=$?
 if test $code != 0; then
   $echo "Test 6a failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -540,7 +540,7 @@ else
   esac
 fi
 test -s 6a.E || rm -f 6a.E
- $xx -a1 -e - $srcdir/6b.I1 $srcdir/6b.I2 > 6b.O 2> 6b.E
+$xx -a1 -e - $srcdir/6b.I1 $srcdir/6b.I2 > 6b.O 2> 6b.E
 code=$?
 if test $code != 0; then
   $echo "Test 6b failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -558,7 +558,7 @@ else
   esac
 fi
 test -s 6b.E || rm -f 6b.E
- $xx -a1 -e - $srcdir/6c.I1 $srcdir/6c.I2 > 6c.O 2> 6c.E
+$xx -a1 -e - $srcdir/6c.I1 $srcdir/6c.I2 > 6c.O 2> 6c.E
 code=$?
 if test $code != 0; then
   $echo "Test 6c failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -576,7 +576,7 @@ else
   esac
 fi
 test -s 6c.E || rm -f 6c.E
- $xx -a1 -e . -o 2.7 $srcdir/7a.I1 $srcdir/7a.I2 > 7a.O 2> 7a.E
+$xx -a1 -e . -o 2.7 $srcdir/7a.I1 $srcdir/7a.I2 > 7a.O 2> 7a.E
 code=$?
 if test $code != 0; then
   $echo "Test 7a failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -594,7 +594,7 @@ else
   esac
 fi
 test -s 7a.E || rm -f 7a.E
- $xx -a1 -e . -o 0,1.2 $srcdir/8a.I1 $srcdir/8a.I2 > 8a.O 2> 8a.E
+$xx -a1 -e . -o 0,1.2 $srcdir/8a.I1 $srcdir/8a.I2 > 8a.O 2> 8a.E
 code=$?
 if test $code != 0; then
   $echo "Test 8a failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -612,7 +612,7 @@ else
   esac
 fi
 test -s 8a.E || rm -f 8a.E
- $xx -a1 -a2 -e . -o 0,1.2 $srcdir/8b.I1 $srcdir/8b.I2 > 8b.O 2> 8b.E
+$xx -a1 -a2 -e . -o 0,1.2 $srcdir/8b.I1 $srcdir/8b.I2 > 8b.O 2> 8b.E
 code=$?
 if test $code != 0; then
   $echo "Test 8b failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -630,7 +630,7 @@ else
   esac
 fi
 test -s 8b.E || rm -f 8b.E
- $xx  $srcdir/9a.I1 $srcdir/9a.I2 > 9a.O 2> 9a.E
+$xx  $srcdir/9a.I1 $srcdir/9a.I2 > 9a.O 2> 9a.E
 code=$?
 if test $code != 0; then
   $echo "Test 9a failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -648,7 +648,7 @@ else
   esac
 fi
 test -s 9a.E || rm -f 9a.E
- $xx -t: -1 1 -2 1 $srcdir/trailing-sp.I1 $srcdir/trailing-sp.I2 > trailing-sp.O 2> trailing-sp.E
+$xx -t: -1 1 -2 1 $srcdir/trailing-sp.I1 $srcdir/trailing-sp.I2 > trailing-sp.O 2> trailing-sp.E
 code=$?
 if test $code != 0; then
   $echo "Test trailing-sp failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -666,7 +666,7 @@ else
   esac
 fi
 test -s trailing-sp.E || rm -f trailing-sp.E
- $xx  $srcdir/sp-vs-blank.I1 $srcdir/sp-vs-blank.I2 > sp-vs-blank.O 2> sp-vs-blank.E
+$xx  $srcdir/sp-vs-blank.I1 $srcdir/sp-vs-blank.I2 > sp-vs-blank.O 2> sp-vs-blank.E
 code=$?
 if test $code != 0; then
   $echo "Test sp-vs-blank failed: ../../src/join return code $code differs from expected value 0" 1>&2
@@ -684,7 +684,7 @@ else
   esac
 fi
 test -s sp-vs-blank.E || rm -f sp-vs-blank.E
- $xx -t§ $srcdir/8-bit-t.I1 $srcdir/8-bit-t.I2 > 8-bit-t.O 2> 8-bit-t.E
+$xx -t§ $srcdir/8-bit-t.I1 $srcdir/8-bit-t.I2 > 8-bit-t.O 2> 8-bit-t.E
 code=$?
 if test $code != 0; then
   $echo "Test 8-bit-t failed: ../../src/join return code $code differs from expected value 0" 1>&2
diff --git a/tests/tac/tac-tests b/tests/tac/tac-tests
index 29f4c86f0..32c08613b 100755
--- a/tests/tac/tac-tests
+++ b/tests/tac/tac-tests
@@ -18,7 +18,7 @@ export LC_ALL
 LANG=C
 export LANG
 
- $xx  $srcdir/basic-0.I > basic-0.O 2> basic-0.E
+$xx  $srcdir/basic-0.I > basic-0.O 2> basic-0.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-0(F) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -36,7 +36,7 @@ else
   esac
 fi
 test -s basic-0.E || rm -f basic-0.E
-cat $srcdir/basic-0.I |  $xx  > basic-0.O 2> basic-0.E
+cat $srcdir/basic-0.I | $xx  > basic-0.O 2> basic-0.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-0(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -54,7 +54,7 @@ else
   esac
 fi
 test -s basic-0.E || rm -f basic-0.E
- $xx  < $srcdir/basic-0.I > basic-0.O 2> basic-0.E
+$xx  < $srcdir/basic-0.I > basic-0.O 2> basic-0.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-0(<) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -72,7 +72,7 @@ else
   esac
 fi
 test -s basic-0.E || rm -f basic-0.E
- $xx  $srcdir/basic-b.I > basic-b.O 2> basic-b.E
+$xx  $srcdir/basic-b.I > basic-b.O 2> basic-b.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-b(F) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -90,7 +90,7 @@ else
   esac
 fi
 test -s basic-b.E || rm -f basic-b.E
-cat $srcdir/basic-b.I |  $xx  > basic-b.O 2> basic-b.E
+cat $srcdir/basic-b.I | $xx  > basic-b.O 2> basic-b.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-b(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -108,7 +108,7 @@ else
   esac
 fi
 test -s basic-b.E || rm -f basic-b.E
- $xx  < $srcdir/basic-b.I > basic-b.O 2> basic-b.E
+$xx  < $srcdir/basic-b.I > basic-b.O 2> basic-b.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-b(<) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -126,7 +126,7 @@ else
   esac
 fi
 test -s basic-b.E || rm -f basic-b.E
- $xx  $srcdir/basic-c.I > basic-c.O 2> basic-c.E
+$xx  $srcdir/basic-c.I > basic-c.O 2> basic-c.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-c(F) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -144,7 +144,7 @@ else
   esac
 fi
 test -s basic-c.E || rm -f basic-c.E
-cat $srcdir/basic-c.I |  $xx  > basic-c.O 2> basic-c.E
+cat $srcdir/basic-c.I | $xx  > basic-c.O 2> basic-c.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-c(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -162,7 +162,7 @@ else
   esac
 fi
 test -s basic-c.E || rm -f basic-c.E
- $xx  < $srcdir/basic-c.I > basic-c.O 2> basic-c.E
+$xx  < $srcdir/basic-c.I > basic-c.O 2> basic-c.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-c(<) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -180,7 +180,7 @@ else
   esac
 fi
 test -s basic-c.E || rm -f basic-c.E
- $xx  $srcdir/basic-e.I > basic-e.O 2> basic-e.E
+$xx  $srcdir/basic-e.I > basic-e.O 2> basic-e.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-e(F) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -198,7 +198,7 @@ else
   esac
 fi
 test -s basic-e.E || rm -f basic-e.E
-cat $srcdir/basic-e.I |  $xx  > basic-e.O 2> basic-e.E
+cat $srcdir/basic-e.I | $xx  > basic-e.O 2> basic-e.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-e(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -216,7 +216,7 @@ else
   esac
 fi
 test -s basic-e.E || rm -f basic-e.E
- $xx  < $srcdir/basic-e.I > basic-e.O 2> basic-e.E
+$xx  < $srcdir/basic-e.I > basic-e.O 2> basic-e.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-e(<) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -234,7 +234,7 @@ else
   esac
 fi
 test -s basic-e.E || rm -f basic-e.E
- $xx  $srcdir/basic-f.I > basic-f.O 2> basic-f.E
+$xx  $srcdir/basic-f.I > basic-f.O 2> basic-f.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-f(F) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -252,7 +252,7 @@ else
   esac
 fi
 test -s basic-f.E || rm -f basic-f.E
-cat $srcdir/basic-f.I |  $xx  > basic-f.O 2> basic-f.E
+cat $srcdir/basic-f.I | $xx  > basic-f.O 2> basic-f.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-f(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -270,7 +270,7 @@ else
   esac
 fi
 test -s basic-f.E || rm -f basic-f.E
- $xx  < $srcdir/basic-f.I > basic-f.O 2> basic-f.E
+$xx  < $srcdir/basic-f.I > basic-f.O 2> basic-f.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-f(<) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -288,7 +288,7 @@ else
   esac
 fi
 test -s basic-f.E || rm -f basic-f.E
- $xx  $srcdir/basic-g.I > basic-g.O 2> basic-g.E
+$xx  $srcdir/basic-g.I > basic-g.O 2> basic-g.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-g(F) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -306,7 +306,7 @@ else
   esac
 fi
 test -s basic-g.E || rm -f basic-g.E
-cat $srcdir/basic-g.I |  $xx  > basic-g.O 2> basic-g.E
+cat $srcdir/basic-g.I | $xx  > basic-g.O 2> basic-g.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-g(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -324,7 +324,7 @@ else
   esac
 fi
 test -s basic-g.E || rm -f basic-g.E
- $xx  < $srcdir/basic-g.I > basic-g.O 2> basic-g.E
+$xx  < $srcdir/basic-g.I > basic-g.O 2> basic-g.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-g(<) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -342,7 +342,7 @@ else
   esac
 fi
 test -s basic-g.E || rm -f basic-g.E
- $xx  $srcdir/basic-h.I > basic-h.O 2> basic-h.E
+$xx  $srcdir/basic-h.I > basic-h.O 2> basic-h.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-h(F) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -360,7 +360,7 @@ else
   esac
 fi
 test -s basic-h.E || rm -f basic-h.E
-cat $srcdir/basic-h.I |  $xx  > basic-h.O 2> basic-h.E
+cat $srcdir/basic-h.I | $xx  > basic-h.O 2> basic-h.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-h(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -378,7 +378,7 @@ else
   esac
 fi
 test -s basic-h.E || rm -f basic-h.E
- $xx  < $srcdir/basic-h.I > basic-h.O 2> basic-h.E
+$xx  < $srcdir/basic-h.I > basic-h.O 2> basic-h.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-h(<) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -396,7 +396,7 @@ else
   esac
 fi
 test -s basic-h.E || rm -f basic-h.E
- $xx  $srcdir/basic-i.I > basic-i.O 2> basic-i.E
+$xx  $srcdir/basic-i.I > basic-i.O 2> basic-i.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-i(F) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -414,7 +414,7 @@ else
   esac
 fi
 test -s basic-i.E || rm -f basic-i.E
-cat $srcdir/basic-i.I |  $xx  > basic-i.O 2> basic-i.E
+cat $srcdir/basic-i.I | $xx  > basic-i.O 2> basic-i.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-i(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -432,7 +432,7 @@ else
   esac
 fi
 test -s basic-i.E || rm -f basic-i.E
- $xx  < $srcdir/basic-i.I > basic-i.O 2> basic-i.E
+$xx  < $srcdir/basic-i.I > basic-i.O 2> basic-i.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-i(<) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -450,7 +450,7 @@ else
   esac
 fi
 test -s basic-i.E || rm -f basic-i.E
- $xx  $srcdir/basic-j.I > basic-j.O 2> basic-j.E
+$xx  $srcdir/basic-j.I > basic-j.O 2> basic-j.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-j(F) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -468,7 +468,7 @@ else
   esac
 fi
 test -s basic-j.E || rm -f basic-j.E
-cat $srcdir/basic-j.I |  $xx  > basic-j.O 2> basic-j.E
+cat $srcdir/basic-j.I | $xx  > basic-j.O 2> basic-j.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-j(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -486,7 +486,7 @@ else
   esac
 fi
 test -s basic-j.E || rm -f basic-j.E
- $xx  < $srcdir/basic-j.I > basic-j.O 2> basic-j.E
+$xx  < $srcdir/basic-j.I > basic-j.O 2> basic-j.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-j(<) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -504,7 +504,7 @@ else
   esac
 fi
 test -s basic-j.E || rm -f basic-j.E
- $xx  $srcdir/basic-k.I > basic-k.O 2> basic-k.E
+$xx  $srcdir/basic-k.I > basic-k.O 2> basic-k.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-k(F) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -522,7 +522,7 @@ else
   esac
 fi
 test -s basic-k.E || rm -f basic-k.E
-cat $srcdir/basic-k.I |  $xx  > basic-k.O 2> basic-k.E
+cat $srcdir/basic-k.I | $xx  > basic-k.O 2> basic-k.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-k(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -540,7 +540,7 @@ else
   esac
 fi
 test -s basic-k.E || rm -f basic-k.E
- $xx  < $srcdir/basic-k.I > basic-k.O 2> basic-k.E
+$xx  < $srcdir/basic-k.I > basic-k.O 2> basic-k.E
 code=$?
 if test $code != 0; then
   $echo "Test basic-k(<) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -558,7 +558,7 @@ else
   esac
 fi
 test -s basic-k.E || rm -f basic-k.E
- $xx -b $srcdir/opt-b.I > opt-b.O 2> opt-b.E
+$xx -b $srcdir/opt-b.I > opt-b.O 2> opt-b.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-b(F) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -576,7 +576,7 @@ else
   esac
 fi
 test -s opt-b.E || rm -f opt-b.E
-cat $srcdir/opt-b.I |  $xx -b > opt-b.O 2> opt-b.E
+cat $srcdir/opt-b.I | $xx -b > opt-b.O 2> opt-b.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-b(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -594,7 +594,7 @@ else
   esac
 fi
 test -s opt-b.E || rm -f opt-b.E
- $xx -b < $srcdir/opt-b.I > opt-b.O 2> opt-b.E
+$xx -b < $srcdir/opt-b.I > opt-b.O 2> opt-b.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-b(<) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -612,7 +612,7 @@ else
   esac
 fi
 test -s opt-b.E || rm -f opt-b.E
- $xx -s: $srcdir/opt-s.I > opt-s.O 2> opt-s.E
+$xx -s: $srcdir/opt-s.I > opt-s.O 2> opt-s.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-s(F) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -630,7 +630,7 @@ else
   esac
 fi
 test -s opt-s.E || rm -f opt-s.E
-cat $srcdir/opt-s.I |  $xx -s: > opt-s.O 2> opt-s.E
+cat $srcdir/opt-s.I | $xx -s: > opt-s.O 2> opt-s.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-s(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -648,7 +648,7 @@ else
   esac
 fi
 test -s opt-s.E || rm -f opt-s.E
- $xx -s: < $srcdir/opt-s.I > opt-s.O 2> opt-s.E
+$xx -s: < $srcdir/opt-s.I > opt-s.O 2> opt-s.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-s(<) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -666,7 +666,7 @@ else
   esac
 fi
 test -s opt-s.E || rm -f opt-s.E
- $xx -s : -b $srcdir/opt-sb.I > opt-sb.O 2> opt-sb.E
+$xx -s : -b $srcdir/opt-sb.I > opt-sb.O 2> opt-sb.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-sb(F) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -684,7 +684,7 @@ else
   esac
 fi
 test -s opt-sb.E || rm -f opt-sb.E
-cat $srcdir/opt-sb.I |  $xx -s : -b > opt-sb.O 2> opt-sb.E
+cat $srcdir/opt-sb.I | $xx -s : -b > opt-sb.O 2> opt-sb.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-sb(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -702,7 +702,7 @@ else
   esac
 fi
 test -s opt-sb.E || rm -f opt-sb.E
- $xx -s : -b < $srcdir/opt-sb.I > opt-sb.O 2> opt-sb.E
+$xx -s : -b < $srcdir/opt-sb.I > opt-sb.O 2> opt-sb.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-sb(<) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -720,7 +720,7 @@ else
   esac
 fi
 test -s opt-sb.E || rm -f opt-sb.E
- $xx -r -s '\._+' $srcdir/opt-r.I > opt-r.O 2> opt-r.E
+$xx -r -s '\._+' $srcdir/opt-r.I > opt-r.O 2> opt-r.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-r(F) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -738,7 +738,7 @@ else
   esac
 fi
 test -s opt-r.E || rm -f opt-r.E
-cat $srcdir/opt-r.I |  $xx -r -s '\._+' > opt-r.O 2> opt-r.E
+cat $srcdir/opt-r.I | $xx -r -s '\._+' > opt-r.O 2> opt-r.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-r(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -756,7 +756,7 @@ else
   esac
 fi
 test -s opt-r.E || rm -f opt-r.E
- $xx -r -s '\._+' < $srcdir/opt-r.I > opt-r.O 2> opt-r.E
+$xx -r -s '\._+' < $srcdir/opt-r.I > opt-r.O 2> opt-r.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-r(<) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -774,7 +774,7 @@ else
   esac
 fi
 test -s opt-r.E || rm -f opt-r.E
- $xx -r -s '\._+' $srcdir/opt-r2.I > opt-r2.O 2> opt-r2.E
+$xx -r -s '\._+' $srcdir/opt-r2.I > opt-r2.O 2> opt-r2.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-r2(F) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -792,7 +792,7 @@ else
   esac
 fi
 test -s opt-r2.E || rm -f opt-r2.E
-cat $srcdir/opt-r2.I |  $xx -r -s '\._+' > opt-r2.O 2> opt-r2.E
+cat $srcdir/opt-r2.I | $xx -r -s '\._+' > opt-r2.O 2> opt-r2.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-r2(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -810,7 +810,7 @@ else
   esac
 fi
 test -s opt-r2.E || rm -f opt-r2.E
- $xx -r -s '\._+' < $srcdir/opt-r2.I > opt-r2.O 2> opt-r2.E
+$xx -r -s '\._+' < $srcdir/opt-r2.I > opt-r2.O 2> opt-r2.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-r2(<) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -828,7 +828,7 @@ else
   esac
 fi
 test -s opt-r2.E || rm -f opt-r2.E
- $xx -b -r -s '\._+' $srcdir/opt-br.I > opt-br.O 2> opt-br.E
+$xx -b -r -s '\._+' $srcdir/opt-br.I > opt-br.O 2> opt-br.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-br(F) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -846,7 +846,7 @@ else
   esac
 fi
 test -s opt-br.E || rm -f opt-br.E
-cat $srcdir/opt-br.I |  $xx -b -r -s '\._+' > opt-br.O 2> opt-br.E
+cat $srcdir/opt-br.I | $xx -b -r -s '\._+' > opt-br.O 2> opt-br.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-br(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -864,7 +864,7 @@ else
   esac
 fi
 test -s opt-br.E || rm -f opt-br.E
- $xx -b -r -s '\._+' < $srcdir/opt-br.I > opt-br.O 2> opt-br.E
+$xx -b -r -s '\._+' < $srcdir/opt-br.I > opt-br.O 2> opt-br.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-br(<) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -882,7 +882,7 @@ else
   esac
 fi
 test -s opt-br.E || rm -f opt-br.E
- $xx -b -r -s '\._+' $srcdir/opt-br2.I > opt-br2.O 2> opt-br2.E
+$xx -b -r -s '\._+' $srcdir/opt-br2.I > opt-br2.O 2> opt-br2.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-br2(F) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -900,7 +900,7 @@ else
   esac
 fi
 test -s opt-br2.E || rm -f opt-br2.E
-cat $srcdir/opt-br2.I |  $xx -b -r -s '\._+' > opt-br2.O 2> opt-br2.E
+cat $srcdir/opt-br2.I | $xx -b -r -s '\._+' > opt-br2.O 2> opt-br2.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-br2(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
@@ -918,7 +918,7 @@ else
   esac
 fi
 test -s opt-br2.E || rm -f opt-br2.E
- $xx -b -r -s '\._+' < $srcdir/opt-br2.I > opt-br2.O 2> opt-br2.E
+$xx -b -r -s '\._+' < $srcdir/opt-br2.I > opt-br2.O 2> opt-br2.E
 code=$?
 if test $code != 0; then
   $echo "Test opt-br2(<) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
diff --git a/tests/tail/tail-tests b/tests/tail/tail-tests
index 938bba9eb..67909c525 100755
--- a/tests/tail/tail-tests
+++ b/tests/tail/tail-tests
@@ -1044,7 +1044,7 @@ else
   esac
 fi
 test -s err-1.E || rm -f err-1.E
- $xx -cl $srcdir/err-2.I > err-2.O 2> err-2.E
+$xx -cl $srcdir/err-2.I > err-2.O 2> err-2.E
 code=$?
 if test $code != 1; then
   $echo "Test err-2(F) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
@@ -1062,7 +1062,7 @@ else
   esac
 fi
 test -s err-2.E || rm -f err-2.E
-cat $srcdir/err-2.I |  $xx -cl > err-2.O 2> err-2.E
+cat $srcdir/err-2.I | $xx -cl > err-2.O 2> err-2.E
 code=$?
 if test $code != 1; then
   $echo "Test err-2(|) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
@@ -1080,7 +1080,7 @@ else
   esac
 fi
 test -s err-2.E || rm -f err-2.E
- $xx -cl < $srcdir/err-2.I > err-2.O 2> err-2.E
+$xx -cl < $srcdir/err-2.I > err-2.O 2> err-2.E
 code=$?
 if test $code != 1; then
   $echo "Test err-2(<) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
@@ -1206,7 +1206,7 @@ else
   esac
 fi
 test -s err-4.E || rm -f err-4.E
- $xx -c99999999999999999999 $srcdir/err-5.I > err-5.O 2> err-5.E
+$xx -c99999999999999999999 $srcdir/err-5.I > err-5.O 2> err-5.E
 code=$?
 if test $code != 1; then
   $echo "Test err-5(F) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
@@ -1224,7 +1224,7 @@ else
   esac
 fi
 test -s err-5.E || rm -f err-5.E
-cat $srcdir/err-5.I |  $xx -c99999999999999999999 > err-5.O 2> err-5.E
+cat $srcdir/err-5.I | $xx -c99999999999999999999 > err-5.O 2> err-5.E
 code=$?
 if test $code != 1; then
   $echo "Test err-5(|) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
@@ -1242,7 +1242,7 @@ else
   esac
 fi
 test -s err-5.E || rm -f err-5.E
- $xx -c99999999999999999999 < $srcdir/err-5.I > err-5.O 2> err-5.E
+$xx -c99999999999999999999 < $srcdir/err-5.I > err-5.O 2> err-5.E
 code=$?
 if test $code != 1; then
   $echo "Test err-5(<) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
@@ -1260,7 +1260,7 @@ else
   esac
 fi
 test -s err-5.E || rm -f err-5.E
- $xx -c $srcdir/err-6.I > err-6.O 2> err-6.E
+$xx -c $srcdir/err-6.I > err-6.O 2> err-6.E
 code=$?
 if test $code != 1; then
   $echo "Test err-6(F) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
@@ -1278,7 +1278,7 @@ else
   esac
 fi
 test -s err-6.E || rm -f err-6.E
-cat $srcdir/err-6.I |  $xx -c > err-6.O 2> err-6.E
+cat $srcdir/err-6.I | $xx -c > err-6.O 2> err-6.E
 code=$?
 if test $code != 1; then
   $echo "Test err-6(|) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
@@ -1296,7 +1296,7 @@ else
   esac
 fi
 test -s err-6.E || rm -f err-6.E
- $xx -c < $srcdir/err-6.I > err-6.O 2> err-6.E
+$xx -c < $srcdir/err-6.I > err-6.O 2> err-6.E
 code=$?
 if test $code != 1; then
   $echo "Test err-6(<) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
@@ -1314,7 +1314,7 @@ else
   esac
 fi
 test -s err-6.E || rm -f err-6.E
-cat $srcdir/minus-1.I |  $xx - > minus-1.O 2> minus-1.E
+cat $srcdir/minus-1.I | $xx - > minus-1.O 2> minus-1.E
 code=$?
 if test $code != 0; then
   $echo "Test minus-1(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1332,7 +1332,7 @@ else
   esac
 fi
 test -s minus-1.E || rm -f minus-1.E
- $xx - < $srcdir/minus-1.I > minus-1.O 2> minus-1.E
+$xx - < $srcdir/minus-1.I > minus-1.O 2> minus-1.E
 code=$?
 if test $code != 0; then
   $echo "Test minus-1(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1350,7 +1350,7 @@ else
   esac
 fi
 test -s minus-1.E || rm -f minus-1.E
-cat $srcdir/minus-2.I |  $xx - > minus-2.O 2> minus-2.E
+cat $srcdir/minus-2.I | $xx - > minus-2.O 2> minus-2.E
 code=$?
 if test $code != 0; then
   $echo "Test minus-2(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1368,7 +1368,7 @@ else
   esac
 fi
 test -s minus-2.E || rm -f minus-2.E
- $xx - < $srcdir/minus-2.I > minus-2.O 2> minus-2.E
+$xx - < $srcdir/minus-2.I > minus-2.O 2> minus-2.E
 code=$?
 if test $code != 0; then
   $echo "Test minus-2(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1386,7 +1386,7 @@ else
   esac
 fi
 test -s minus-2.E || rm -f minus-2.E
- $xx -n 10 $srcdir/n-1.I > n-1.O 2> n-1.E
+$xx -n 10 $srcdir/n-1.I > n-1.O 2> n-1.E
 code=$?
 if test $code != 0; then
   $echo "Test n-1(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1404,7 +1404,7 @@ else
   esac
 fi
 test -s n-1.E || rm -f n-1.E
-cat $srcdir/n-1.I |  $xx -n 10 > n-1.O 2> n-1.E
+cat $srcdir/n-1.I | $xx -n 10 > n-1.O 2> n-1.E
 code=$?
 if test $code != 0; then
   $echo "Test n-1(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1422,7 +1422,7 @@ else
   esac
 fi
 test -s n-1.E || rm -f n-1.E
- $xx -n 10 < $srcdir/n-1.I > n-1.O 2> n-1.E
+$xx -n 10 < $srcdir/n-1.I > n-1.O 2> n-1.E
 code=$?
 if test $code != 0; then
   $echo "Test n-1(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1440,7 +1440,7 @@ else
   esac
 fi
 test -s n-1.E || rm -f n-1.E
- $xx -n -10 $srcdir/n-2.I > n-2.O 2> n-2.E
+$xx -n -10 $srcdir/n-2.I > n-2.O 2> n-2.E
 code=$?
 if test $code != 0; then
   $echo "Test n-2(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1458,7 +1458,7 @@ else
   esac
 fi
 test -s n-2.E || rm -f n-2.E
-cat $srcdir/n-2.I |  $xx -n -10 > n-2.O 2> n-2.E
+cat $srcdir/n-2.I | $xx -n -10 > n-2.O 2> n-2.E
 code=$?
 if test $code != 0; then
   $echo "Test n-2(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1476,7 +1476,7 @@ else
   esac
 fi
 test -s n-2.E || rm -f n-2.E
- $xx -n -10 < $srcdir/n-2.I > n-2.O 2> n-2.E
+$xx -n -10 < $srcdir/n-2.I > n-2.O 2> n-2.E
 code=$?
 if test $code != 0; then
   $echo "Test n-2(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1494,7 +1494,7 @@ else
   esac
 fi
 test -s n-2.E || rm -f n-2.E
- $xx -n +10 $srcdir/n-3.I > n-3.O 2> n-3.E
+$xx -n +10 $srcdir/n-3.I > n-3.O 2> n-3.E
 code=$?
 if test $code != 0; then
   $echo "Test n-3(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1512,7 +1512,7 @@ else
   esac
 fi
 test -s n-3.E || rm -f n-3.E
-cat $srcdir/n-3.I |  $xx -n +10 > n-3.O 2> n-3.E
+cat $srcdir/n-3.I | $xx -n +10 > n-3.O 2> n-3.E
 code=$?
 if test $code != 0; then
   $echo "Test n-3(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1530,7 +1530,7 @@ else
   esac
 fi
 test -s n-3.E || rm -f n-3.E
- $xx -n +10 < $srcdir/n-3.I > n-3.O 2> n-3.E
+$xx -n +10 < $srcdir/n-3.I > n-3.O 2> n-3.E
 code=$?
 if test $code != 0; then
   $echo "Test n-3(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1548,7 +1548,7 @@ else
   esac
 fi
 test -s n-3.E || rm -f n-3.E
- $xx -n +0 $srcdir/n-4.I > n-4.O 2> n-4.E
+$xx -n +0 $srcdir/n-4.I > n-4.O 2> n-4.E
 code=$?
 if test $code != 0; then
   $echo "Test n-4(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1566,7 +1566,7 @@ else
   esac
 fi
 test -s n-4.E || rm -f n-4.E
-cat $srcdir/n-4.I |  $xx -n +0 > n-4.O 2> n-4.E
+cat $srcdir/n-4.I | $xx -n +0 > n-4.O 2> n-4.E
 code=$?
 if test $code != 0; then
   $echo "Test n-4(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1584,7 +1584,7 @@ else
   esac
 fi
 test -s n-4.E || rm -f n-4.E
- $xx -n +0 < $srcdir/n-4.I > n-4.O 2> n-4.E
+$xx -n +0 < $srcdir/n-4.I > n-4.O 2> n-4.E
 code=$?
 if test $code != 0; then
   $echo "Test n-4(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1602,7 +1602,7 @@ else
   esac
 fi
 test -s n-4.E || rm -f n-4.E
- $xx -n +1 $srcdir/n-4a.I > n-4a.O 2> n-4a.E
+$xx -n +1 $srcdir/n-4a.I > n-4a.O 2> n-4a.E
 code=$?
 if test $code != 0; then
   $echo "Test n-4a(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1620,7 +1620,7 @@ else
   esac
 fi
 test -s n-4a.E || rm -f n-4a.E
-cat $srcdir/n-4a.I |  $xx -n +1 > n-4a.O 2> n-4a.E
+cat $srcdir/n-4a.I | $xx -n +1 > n-4a.O 2> n-4a.E
 code=$?
 if test $code != 0; then
   $echo "Test n-4a(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1638,7 +1638,7 @@ else
   esac
 fi
 test -s n-4a.E || rm -f n-4a.E
- $xx -n +1 < $srcdir/n-4a.I > n-4a.O 2> n-4a.E
+$xx -n +1 < $srcdir/n-4a.I > n-4a.O 2> n-4a.E
 code=$?
 if test $code != 0; then
   $echo "Test n-4a(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1656,7 +1656,7 @@ else
   esac
 fi
 test -s n-4a.E || rm -f n-4a.E
- $xx -n -0 $srcdir/n-5.I > n-5.O 2> n-5.E
+$xx -n -0 $srcdir/n-5.I > n-5.O 2> n-5.E
 code=$?
 if test $code != 0; then
   $echo "Test n-5(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1674,7 +1674,7 @@ else
   esac
 fi
 test -s n-5.E || rm -f n-5.E
-cat $srcdir/n-5.I |  $xx -n -0 > n-5.O 2> n-5.E
+cat $srcdir/n-5.I | $xx -n -0 > n-5.O 2> n-5.E
 code=$?
 if test $code != 0; then
   $echo "Test n-5(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1692,7 +1692,7 @@ else
   esac
 fi
 test -s n-5.E || rm -f n-5.E
- $xx -n -0 < $srcdir/n-5.I > n-5.O 2> n-5.E
+$xx -n -0 < $srcdir/n-5.I > n-5.O 2> n-5.E
 code=$?
 if test $code != 0; then
   $echo "Test n-5(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1710,7 +1710,7 @@ else
   esac
 fi
 test -s n-5.E || rm -f n-5.E
- $xx -n -1 $srcdir/n-5a.I > n-5a.O 2> n-5a.E
+$xx -n -1 $srcdir/n-5a.I > n-5a.O 2> n-5a.E
 code=$?
 if test $code != 0; then
   $echo "Test n-5a(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1728,7 +1728,7 @@ else
   esac
 fi
 test -s n-5a.E || rm -f n-5a.E
-cat $srcdir/n-5a.I |  $xx -n -1 > n-5a.O 2> n-5a.E
+cat $srcdir/n-5a.I | $xx -n -1 > n-5a.O 2> n-5a.E
 code=$?
 if test $code != 0; then
   $echo "Test n-5a(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1746,7 +1746,7 @@ else
   esac
 fi
 test -s n-5a.E || rm -f n-5a.E
- $xx -n -1 < $srcdir/n-5a.I > n-5a.O 2> n-5a.E
+$xx -n -1 < $srcdir/n-5a.I > n-5a.O 2> n-5a.E
 code=$?
 if test $code != 0; then
   $echo "Test n-5a(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1764,7 +1764,7 @@ else
   esac
 fi
 test -s n-5a.E || rm -f n-5a.E
- $xx -n  0 $srcdir/n-5b.I > n-5b.O 2> n-5b.E
+$xx -n  0 $srcdir/n-5b.I > n-5b.O 2> n-5b.E
 code=$?
 if test $code != 0; then
   $echo "Test n-5b(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1782,7 +1782,7 @@ else
   esac
 fi
 test -s n-5b.E || rm -f n-5b.E
-cat $srcdir/n-5b.I |  $xx -n  0 > n-5b.O 2> n-5b.E
+cat $srcdir/n-5b.I | $xx -n  0 > n-5b.O 2> n-5b.E
 code=$?
 if test $code != 0; then
   $echo "Test n-5b(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
@@ -1800,7 +1800,7 @@ else
   esac
 fi
 test -s n-5b.E || rm -f n-5b.E
- $xx -n  0 < $srcdir/n-5b.I > n-5b.O 2> n-5b.E
+$xx -n  0 < $srcdir/n-5b.I > n-5b.O 2> n-5b.E
 code=$?
 if test $code != 0; then
   $echo "Test n-5b(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
diff --git a/tests/tr/tr-tests b/tests/tr/tr-tests
index 4f3bc0514..92f62dfa6 100755
--- a/tests/tr/tr-tests
+++ b/tests/tr/tr-tests
@@ -18,7 +18,7 @@ export LC_ALL
 LANG=C
 export LANG
 
-cat $srcdir/1.I |  $xx 'abcd' '[]*]' > 1.O 2> 1.E
+cat $srcdir/1.I | $xx 'abcd' '[]*]' > 1.O 2> 1.E
 code=$?
 if test $code != 0; then
   $echo "Test 1(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -36,7 +36,7 @@ else
   esac
 fi
 test -s 1.E || rm -f 1.E
- $xx 'abcd' '[]*]' < $srcdir/1.I > 1.O 2> 1.E
+$xx 'abcd' '[]*]' < $srcdir/1.I > 1.O 2> 1.E
 code=$?
 if test $code != 0; then
   $echo "Test 1(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -54,7 +54,7 @@ else
   esac
 fi
 test -s 1.E || rm -f 1.E
-cat $srcdir/2.I |  $xx 'abc' '[%*]xyz' > 2.O 2> 2.E
+cat $srcdir/2.I | $xx 'abc' '[%*]xyz' > 2.O 2> 2.E
 code=$?
 if test $code != 0; then
   $echo "Test 2(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -72,7 +72,7 @@ else
   esac
 fi
 test -s 2.E || rm -f 2.E
- $xx 'abc' '[%*]xyz' < $srcdir/2.I > 2.O 2> 2.E
+$xx 'abc' '[%*]xyz' < $srcdir/2.I > 2.O 2> 2.E
 code=$?
 if test $code != 0; then
   $echo "Test 2(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -90,7 +90,7 @@ else
   esac
 fi
 test -s 2.E || rm -f 2.E
-cat $srcdir/3.I |  $xx '' '[.*]' > 3.O 2> 3.E
+cat $srcdir/3.I | $xx '' '[.*]' > 3.O 2> 3.E
 code=$?
 if test $code != 0; then
   $echo "Test 3(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -108,7 +108,7 @@ else
   esac
 fi
 test -s 3.E || rm -f 3.E
- $xx '' '[.*]' < $srcdir/3.I > 3.O 2> 3.E
+$xx '' '[.*]' < $srcdir/3.I > 3.O 2> 3.E
 code=$?
 if test $code != 0; then
   $echo "Test 3(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -126,7 +126,7 @@ else
   esac
 fi
 test -s 3.E || rm -f 3.E
-cat $srcdir/4.I |  $xx -t 'abcd' 'xy' > 4.O 2> 4.E
+cat $srcdir/4.I | $xx -t 'abcd' 'xy' > 4.O 2> 4.E
 code=$?
 if test $code != 0; then
   $echo "Test 4(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -144,7 +144,7 @@ else
   esac
 fi
 test -s 4.E || rm -f 4.E
- $xx -t 'abcd' 'xy' < $srcdir/4.I > 4.O 2> 4.E
+$xx -t 'abcd' 'xy' < $srcdir/4.I > 4.O 2> 4.E
 code=$?
 if test $code != 0; then
   $echo "Test 4(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -162,7 +162,7 @@ else
   esac
 fi
 test -s 4.E || rm -f 4.E
-cat $srcdir/5.I |  $xx 'abcd' 'xy' > 5.O 2> 5.E
+cat $srcdir/5.I | $xx 'abcd' 'xy' > 5.O 2> 5.E
 code=$?
 if test $code != 0; then
   $echo "Test 5(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -180,7 +180,7 @@ else
   esac
 fi
 test -s 5.E || rm -f 5.E
- $xx 'abcd' 'xy' < $srcdir/5.I > 5.O 2> 5.E
+$xx 'abcd' 'xy' < $srcdir/5.I > 5.O 2> 5.E
 code=$?
 if test $code != 0; then
   $echo "Test 5(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -198,7 +198,7 @@ else
   esac
 fi
 test -s 5.E || rm -f 5.E
-cat $srcdir/6.I |  $xx 'abcd' 'x[y*]' > 6.O 2> 6.E
+cat $srcdir/6.I | $xx 'abcd' 'x[y*]' > 6.O 2> 6.E
 code=$?
 if test $code != 0; then
   $echo "Test 6(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -216,7 +216,7 @@ else
   esac
 fi
 test -s 6.E || rm -f 6.E
- $xx 'abcd' 'x[y*]' < $srcdir/6.I > 6.O 2> 6.E
+$xx 'abcd' 'x[y*]' < $srcdir/6.I > 6.O 2> 6.E
 code=$?
 if test $code != 0; then
   $echo "Test 6(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -234,7 +234,7 @@ else
   esac
 fi
 test -s 6.E || rm -f 6.E
-cat $srcdir/7.I |  $xx -s 'a-p' '%[.*]$' > 7.O 2> 7.E
+cat $srcdir/7.I | $xx -s 'a-p' '%[.*]$' > 7.O 2> 7.E
 code=$?
 if test $code != 0; then
   $echo "Test 7(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -252,7 +252,7 @@ else
   esac
 fi
 test -s 7.E || rm -f 7.E
- $xx -s 'a-p' '%[.*]$' < $srcdir/7.I > 7.O 2> 7.E
+$xx -s 'a-p' '%[.*]$' < $srcdir/7.I > 7.O 2> 7.E
 code=$?
 if test $code != 0; then
   $echo "Test 7(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -270,7 +270,7 @@ else
   esac
 fi
 test -s 7.E || rm -f 7.E
-cat $srcdir/8.I |  $xx -s 'a-p' '[.*]$' > 8.O 2> 8.E
+cat $srcdir/8.I | $xx -s 'a-p' '[.*]$' > 8.O 2> 8.E
 code=$?
 if test $code != 0; then
   $echo "Test 8(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -288,7 +288,7 @@ else
   esac
 fi
 test -s 8.E || rm -f 8.E
- $xx -s 'a-p' '[.*]$' < $srcdir/8.I > 8.O 2> 8.E
+$xx -s 'a-p' '[.*]$' < $srcdir/8.I > 8.O 2> 8.E
 code=$?
 if test $code != 0; then
   $echo "Test 8(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -306,7 +306,7 @@ else
   esac
 fi
 test -s 8.E || rm -f 8.E
-cat $srcdir/9.I |  $xx -s 'a-p' '%[.*]' > 9.O 2> 9.E
+cat $srcdir/9.I | $xx -s 'a-p' '%[.*]' > 9.O 2> 9.E
 code=$?
 if test $code != 0; then
   $echo "Test 9(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -324,7 +324,7 @@ else
   esac
 fi
 test -s 9.E || rm -f 9.E
- $xx -s 'a-p' '%[.*]' < $srcdir/9.I > 9.O 2> 9.E
+$xx -s 'a-p' '%[.*]' < $srcdir/9.I > 9.O 2> 9.E
 code=$?
 if test $code != 0; then
   $echo "Test 9(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -342,7 +342,7 @@ else
   esac
 fi
 test -s 9.E || rm -f 9.E
-cat $srcdir/a.I |  $xx -s '[a-z]' > a.O 2> a.E
+cat $srcdir/a.I | $xx -s '[a-z]' > a.O 2> a.E
 code=$?
 if test $code != 0; then
   $echo "Test a(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -360,7 +360,7 @@ else
   esac
 fi
 test -s a.E || rm -f a.E
- $xx -s '[a-z]' < $srcdir/a.I > a.O 2> a.E
+$xx -s '[a-z]' < $srcdir/a.I > a.O 2> a.E
 code=$?
 if test $code != 0; then
   $echo "Test a(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -378,7 +378,7 @@ else
   esac
 fi
 test -s a.E || rm -f a.E
-cat $srcdir/b.I |  $xx -s '[a-c]' > b.O 2> b.E
+cat $srcdir/b.I | $xx -s '[a-c]' > b.O 2> b.E
 code=$?
 if test $code != 0; then
   $echo "Test b(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -396,7 +396,7 @@ else
   esac
 fi
 test -s b.E || rm -f b.E
- $xx -s '[a-c]' < $srcdir/b.I > b.O 2> b.E
+$xx -s '[a-c]' < $srcdir/b.I > b.O 2> b.E
 code=$?
 if test $code != 0; then
   $echo "Test b(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -414,7 +414,7 @@ else
   esac
 fi
 test -s b.E || rm -f b.E
-cat $srcdir/c.I |  $xx -s '[a-b]' > c.O 2> c.E
+cat $srcdir/c.I | $xx -s '[a-b]' > c.O 2> c.E
 code=$?
 if test $code != 0; then
   $echo "Test c(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -432,7 +432,7 @@ else
   esac
 fi
 test -s c.E || rm -f c.E
- $xx -s '[a-b]' < $srcdir/c.I > c.O 2> c.E
+$xx -s '[a-b]' < $srcdir/c.I > c.O 2> c.E
 code=$?
 if test $code != 0; then
   $echo "Test c(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -450,7 +450,7 @@ else
   esac
 fi
 test -s c.E || rm -f c.E
-cat $srcdir/d.I |  $xx -s '[b-c]' > d.O 2> d.E
+cat $srcdir/d.I | $xx -s '[b-c]' > d.O 2> d.E
 code=$?
 if test $code != 0; then
   $echo "Test d(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -468,7 +468,7 @@ else
   esac
 fi
 test -s d.E || rm -f d.E
- $xx -s '[b-c]' < $srcdir/d.I > d.O 2> d.E
+$xx -s '[b-c]' < $srcdir/d.I > d.O 2> d.E
 code=$?
 if test $code != 0; then
   $echo "Test d(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -486,7 +486,7 @@ else
   esac
 fi
 test -s d.E || rm -f d.E
-cat $srcdir/e.I |  $xx -s '[\0-\5]' > e.O 2> e.E
+cat $srcdir/e.I | $xx -s '[\0-\5]' > e.O 2> e.E
 code=$?
 if test $code != 0; then
   $echo "Test e(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -504,7 +504,7 @@ else
   esac
 fi
 test -s e.E || rm -f e.E
- $xx -s '[\0-\5]' < $srcdir/e.I > e.O 2> e.E
+$xx -s '[\0-\5]' < $srcdir/e.I > e.O 2> e.E
 code=$?
 if test $code != 0; then
   $echo "Test e(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -522,7 +522,7 @@ else
   esac
 fi
 test -s e.E || rm -f e.E
-cat $srcdir/f.I |  $xx -d '[=[=]' > f.O 2> f.E
+cat $srcdir/f.I | $xx -d '[=[=]' > f.O 2> f.E
 code=$?
 if test $code != 0; then
   $echo "Test f(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -540,7 +540,7 @@ else
   esac
 fi
 test -s f.E || rm -f f.E
- $xx -d '[=[=]' < $srcdir/f.I > f.O 2> f.E
+$xx -d '[=[=]' < $srcdir/f.I > f.O 2> f.E
 code=$?
 if test $code != 0; then
   $echo "Test f(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -558,7 +558,7 @@ else
   esac
 fi
 test -s f.E || rm -f f.E
-cat $srcdir/g.I |  $xx -d '[=]=]' > g.O 2> g.E
+cat $srcdir/g.I | $xx -d '[=]=]' > g.O 2> g.E
 code=$?
 if test $code != 0; then
   $echo "Test g(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -576,7 +576,7 @@ else
   esac
 fi
 test -s g.E || rm -f g.E
- $xx -d '[=]=]' < $srcdir/g.I > g.O 2> g.E
+$xx -d '[=]=]' < $srcdir/g.I > g.O 2> g.E
 code=$?
 if test $code != 0; then
   $echo "Test g(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -594,7 +594,7 @@ else
   esac
 fi
 test -s g.E || rm -f g.E
-cat $srcdir/h.I |  $xx -d '[:xdigit:]' > h.O 2> h.E
+cat $srcdir/h.I | $xx -d '[:xdigit:]' > h.O 2> h.E
 code=$?
 if test $code != 0; then
   $echo "Test h(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -612,7 +612,7 @@ else
   esac
 fi
 test -s h.E || rm -f h.E
- $xx -d '[:xdigit:]' < $srcdir/h.I > h.O 2> h.E
+$xx -d '[:xdigit:]' < $srcdir/h.I > h.O 2> h.E
 code=$?
 if test $code != 0; then
   $echo "Test h(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -630,7 +630,7 @@ else
   esac
 fi
 test -s h.E || rm -f h.E
-cat $srcdir/i.I |  $xx -d '[:xdigit:]' > i.O 2> i.E
+cat $srcdir/i.I | $xx -d '[:xdigit:]' > i.O 2> i.E
 code=$?
 if test $code != 0; then
   $echo "Test i(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -648,7 +648,7 @@ else
   esac
 fi
 test -s i.E || rm -f i.E
- $xx -d '[:xdigit:]' < $srcdir/i.I > i.O 2> i.E
+$xx -d '[:xdigit:]' < $srcdir/i.I > i.O 2> i.E
 code=$?
 if test $code != 0; then
   $echo "Test i(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -666,7 +666,7 @@ else
   esac
 fi
 test -s i.E || rm -f i.E
-cat $srcdir/j.I |  $xx -d '[:digit:]' > j.O 2> j.E
+cat $srcdir/j.I | $xx -d '[:digit:]' > j.O 2> j.E
 code=$?
 if test $code != 0; then
   $echo "Test j(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -684,7 +684,7 @@ else
   esac
 fi
 test -s j.E || rm -f j.E
- $xx -d '[:digit:]' < $srcdir/j.I > j.O 2> j.E
+$xx -d '[:digit:]' < $srcdir/j.I > j.O 2> j.E
 code=$?
 if test $code != 0; then
   $echo "Test j(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -702,7 +702,7 @@ else
   esac
 fi
 test -s j.E || rm -f j.E
-cat $srcdir/k.I |  $xx -d '[:digit:]' > k.O 2> k.E
+cat $srcdir/k.I | $xx -d '[:digit:]' > k.O 2> k.E
 code=$?
 if test $code != 0; then
   $echo "Test k(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -720,7 +720,7 @@ else
   esac
 fi
 test -s k.E || rm -f k.E
- $xx -d '[:digit:]' < $srcdir/k.I > k.O 2> k.E
+$xx -d '[:digit:]' < $srcdir/k.I > k.O 2> k.E
 code=$?
 if test $code != 0; then
   $echo "Test k(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -738,7 +738,7 @@ else
   esac
 fi
 test -s k.E || rm -f k.E
-cat $srcdir/l.I |  $xx -d '[:lower:]' > l.O 2> l.E
+cat $srcdir/l.I | $xx -d '[:lower:]' > l.O 2> l.E
 code=$?
 if test $code != 0; then
   $echo "Test l(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -756,7 +756,7 @@ else
   esac
 fi
 test -s l.E || rm -f l.E
- $xx -d '[:lower:]' < $srcdir/l.I > l.O 2> l.E
+$xx -d '[:lower:]' < $srcdir/l.I > l.O 2> l.E
 code=$?
 if test $code != 0; then
   $echo "Test l(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -774,7 +774,7 @@ else
   esac
 fi
 test -s l.E || rm -f l.E
-cat $srcdir/m.I |  $xx -d '[:upper:]' > m.O 2> m.E
+cat $srcdir/m.I | $xx -d '[:upper:]' > m.O 2> m.E
 code=$?
 if test $code != 0; then
   $echo "Test m(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -792,7 +792,7 @@ else
   esac
 fi
 test -s m.E || rm -f m.E
- $xx -d '[:upper:]' < $srcdir/m.I > m.O 2> m.E
+$xx -d '[:upper:]' < $srcdir/m.I > m.O 2> m.E
 code=$?
 if test $code != 0; then
   $echo "Test m(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -810,7 +810,7 @@ else
   esac
 fi
 test -s m.E || rm -f m.E
-cat $srcdir/n.I |  $xx -d '[:lower:][:upper:]' > n.O 2> n.E
+cat $srcdir/n.I | $xx -d '[:lower:][:upper:]' > n.O 2> n.E
 code=$?
 if test $code != 0; then
   $echo "Test n(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -828,7 +828,7 @@ else
   esac
 fi
 test -s n.E || rm -f n.E
- $xx -d '[:lower:][:upper:]' < $srcdir/n.I > n.O 2> n.E
+$xx -d '[:lower:][:upper:]' < $srcdir/n.I > n.O 2> n.E
 code=$?
 if test $code != 0; then
   $echo "Test n(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -846,7 +846,7 @@ else
   esac
 fi
 test -s n.E || rm -f n.E
-cat $srcdir/o.I |  $xx -d '[:alpha:]' > o.O 2> o.E
+cat $srcdir/o.I | $xx -d '[:alpha:]' > o.O 2> o.E
 code=$?
 if test $code != 0; then
   $echo "Test o(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -864,7 +864,7 @@ else
   esac
 fi
 test -s o.E || rm -f o.E
- $xx -d '[:alpha:]' < $srcdir/o.I > o.O 2> o.E
+$xx -d '[:alpha:]' < $srcdir/o.I > o.O 2> o.E
 code=$?
 if test $code != 0; then
   $echo "Test o(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -882,7 +882,7 @@ else
   esac
 fi
 test -s o.E || rm -f o.E
-cat $srcdir/p.I |  $xx -d '[:alnum:]' > p.O 2> p.E
+cat $srcdir/p.I | $xx -d '[:alnum:]' > p.O 2> p.E
 code=$?
 if test $code != 0; then
   $echo "Test p(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -900,7 +900,7 @@ else
   esac
 fi
 test -s p.E || rm -f p.E
- $xx -d '[:alnum:]' < $srcdir/p.I > p.O 2> p.E
+$xx -d '[:alnum:]' < $srcdir/p.I > p.O 2> p.E
 code=$?
 if test $code != 0; then
   $echo "Test p(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -918,7 +918,7 @@ else
   esac
 fi
 test -s p.E || rm -f p.E
-cat $srcdir/q.I |  $xx -d '[:alnum:]' > q.O 2> q.E
+cat $srcdir/q.I | $xx -d '[:alnum:]' > q.O 2> q.E
 code=$?
 if test $code != 0; then
   $echo "Test q(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -936,7 +936,7 @@ else
   esac
 fi
 test -s q.E || rm -f q.E
- $xx -d '[:alnum:]' < $srcdir/q.I > q.O 2> q.E
+$xx -d '[:alnum:]' < $srcdir/q.I > q.O 2> q.E
 code=$?
 if test $code != 0; then
   $echo "Test q(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -954,7 +954,7 @@ else
   esac
 fi
 test -s q.E || rm -f q.E
-cat $srcdir/r.I |  $xx -ds '[:alnum:]' '.' > r.O 2> r.E
+cat $srcdir/r.I | $xx -ds '[:alnum:]' '.' > r.O 2> r.E
 code=$?
 if test $code != 0; then
   $echo "Test r(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -972,7 +972,7 @@ else
   esac
 fi
 test -s r.E || rm -f r.E
- $xx -ds '[:alnum:]' '.' < $srcdir/r.I > r.O 2> r.E
+$xx -ds '[:alnum:]' '.' < $srcdir/r.I > r.O 2> r.E
 code=$?
 if test $code != 0; then
   $echo "Test r(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -990,7 +990,7 @@ else
   esac
 fi
 test -s r.E || rm -f r.E
-cat $srcdir/s.I |  $xx -cs '[:alnum:]' '\n' > s.O 2> s.E
+cat $srcdir/s.I | $xx -cs '[:alnum:]' '\n' > s.O 2> s.E
 code=$?
 if test $code != 0; then
   $echo "Test s(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1008,7 +1008,7 @@ else
   esac
 fi
 test -s s.E || rm -f s.E
- $xx -cs '[:alnum:]' '\n' < $srcdir/s.I > s.O 2> s.E
+$xx -cs '[:alnum:]' '\n' < $srcdir/s.I > s.O 2> s.E
 code=$?
 if test $code != 0; then
   $echo "Test s(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1026,7 +1026,7 @@ else
   esac
 fi
 test -s s.E || rm -f s.E
-cat $srcdir/t.I |  $xx -cs '[:alnum:]' '[\n*]' > t.O 2> t.E
+cat $srcdir/t.I | $xx -cs '[:alnum:]' '[\n*]' > t.O 2> t.E
 code=$?
 if test $code != 0; then
   $echo "Test t(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1044,7 +1044,7 @@ else
   esac
 fi
 test -s t.E || rm -f t.E
- $xx -cs '[:alnum:]' '[\n*]' < $srcdir/t.I > t.O 2> t.E
+$xx -cs '[:alnum:]' '[\n*]' < $srcdir/t.I > t.O 2> t.E
 code=$?
 if test $code != 0; then
   $echo "Test t(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1062,7 +1062,7 @@ else
   esac
 fi
 test -s t.E || rm -f t.E
-cat $srcdir/u.I |  $xx -ds 'b' 'a' > u.O 2> u.E
+cat $srcdir/u.I | $xx -ds 'b' 'a' > u.O 2> u.E
 code=$?
 if test $code != 0; then
   $echo "Test u(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1080,7 +1080,7 @@ else
   esac
 fi
 test -s u.E || rm -f u.E
- $xx -ds 'b' 'a' < $srcdir/u.I > u.O 2> u.E
+$xx -ds 'b' 'a' < $srcdir/u.I > u.O 2> u.E
 code=$?
 if test $code != 0; then
   $echo "Test u(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1098,7 +1098,7 @@ else
   esac
 fi
 test -s u.E || rm -f u.E
-cat $srcdir/v.I |  $xx -ds '[:xdigit:]' 'Z' > v.O 2> v.E
+cat $srcdir/v.I | $xx -ds '[:xdigit:]' 'Z' > v.O 2> v.E
 code=$?
 if test $code != 0; then
   $echo "Test v(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1116,7 +1116,7 @@ else
   esac
 fi
 test -s v.E || rm -f v.E
- $xx -ds '[:xdigit:]' 'Z' < $srcdir/v.I > v.O 2> v.E
+$xx -ds '[:xdigit:]' 'Z' < $srcdir/v.I > v.O 2> v.E
 code=$?
 if test $code != 0; then
   $echo "Test v(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1134,7 +1134,7 @@ else
   esac
 fi
 test -s v.E || rm -f v.E
-cat $srcdir/w.I |  $xx -ds '\350' '\345' > w.O 2> w.E
+cat $srcdir/w.I | $xx -ds '\350' '\345' > w.O 2> w.E
 code=$?
 if test $code != 0; then
   $echo "Test w(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1152,7 +1152,7 @@ else
   esac
 fi
 test -s w.E || rm -f w.E
- $xx -ds '\350' '\345' < $srcdir/w.I > w.O 2> w.E
+$xx -ds '\350' '\345' < $srcdir/w.I > w.O 2> w.E
 code=$?
 if test $code != 0; then
   $echo "Test w(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1170,7 +1170,7 @@ else
   esac
 fi
 test -s w.E || rm -f w.E
-cat $srcdir/x.I |  $xx -s 'abcdefghijklmn' '[:*016]' > x.O 2> x.E
+cat $srcdir/x.I | $xx -s 'abcdefghijklmn' '[:*016]' > x.O 2> x.E
 code=$?
 if test $code != 0; then
   $echo "Test x(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1188,7 +1188,7 @@ else
   esac
 fi
 test -s x.E || rm -f x.E
- $xx -s 'abcdefghijklmn' '[:*016]' < $srcdir/x.I > x.O 2> x.E
+$xx -s 'abcdefghijklmn' '[:*016]' < $srcdir/x.I > x.O 2> x.E
 code=$?
 if test $code != 0; then
   $echo "Test x(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1206,7 +1206,7 @@ else
   esac
 fi
 test -s x.E || rm -f x.E
-cat $srcdir/y.I |  $xx -d 'a-z' > y.O 2> y.E
+cat $srcdir/y.I | $xx -d 'a-z' > y.O 2> y.E
 code=$?
 if test $code != 0; then
   $echo "Test y(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1224,7 +1224,7 @@ else
   esac
 fi
 test -s y.E || rm -f y.E
- $xx -d 'a-z' < $srcdir/y.I > y.O 2> y.E
+$xx -d 'a-z' < $srcdir/y.I > y.O 2> y.E
 code=$?
 if test $code != 0; then
   $echo "Test y(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1242,7 +1242,7 @@ else
   esac
 fi
 test -s y.E || rm -f y.E
-cat $srcdir/z.I |  $xx -ds 'a-z' '$.' > z.O 2> z.E
+cat $srcdir/z.I | $xx -ds 'a-z' '$.' > z.O 2> z.E
 code=$?
 if test $code != 0; then
   $echo "Test z(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1260,7 +1260,7 @@ else
   esac
 fi
 test -s z.E || rm -f z.E
- $xx -ds 'a-z' '$.' < $srcdir/z.I > z.O 2> z.E
+$xx -ds 'a-z' '$.' < $srcdir/z.I > z.O 2> z.E
 code=$?
 if test $code != 0; then
   $echo "Test z(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1278,7 +1278,7 @@ else
   esac
 fi
 test -s z.E || rm -f z.E
-cat $srcdir/range-a-a.I |  $xx 'a-a' 'z' > range-a-a.O 2> range-a-a.E
+cat $srcdir/range-a-a.I | $xx 'a-a' 'z' > range-a-a.O 2> range-a-a.E
 code=$?
 if test $code != 0; then
   $echo "Test range-a-a(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1296,7 +1296,7 @@ else
   esac
 fi
 test -s range-a-a.E || rm -f range-a-a.E
- $xx 'a-a' 'z' < $srcdir/range-a-a.I > range-a-a.O 2> range-a-a.E
+$xx 'a-a' 'z' < $srcdir/range-a-a.I > range-a-a.O 2> range-a-a.E
 code=$?
 if test $code != 0; then
   $echo "Test range-a-a(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1314,7 +1314,7 @@ else
   esac
 fi
 test -s range-a-a.E || rm -f range-a-a.E
-cat $srcdir/null.I |  $xx 'a' '''' > null.O 2> null.E
+cat $srcdir/null.I | $xx 'a' '''' > null.O 2> null.E
 code=$?
 if test $code != 1; then
   $echo "Test null(|) failed: ../../src/tr return code $code differs from expected value 1" 1>&2
@@ -1332,7 +1332,7 @@ else
   esac
 fi
 test -s null.E || rm -f null.E
- $xx 'a' '''' < $srcdir/null.I > null.O 2> null.E
+$xx 'a' '''' < $srcdir/null.I > null.O 2> null.E
 code=$?
 if test $code != 1; then
   $echo "Test null(<) failed: ../../src/tr return code $code differs from expected value 1" 1>&2
@@ -1350,7 +1350,7 @@ else
   esac
 fi
 test -s null.E || rm -f null.E
-cat $srcdir/upcase.I |  $xx '[:lower:]' '[:upper:]' > upcase.O 2> upcase.E
+cat $srcdir/upcase.I | $xx '[:lower:]' '[:upper:]' > upcase.O 2> upcase.E
 code=$?
 if test $code != 0; then
   $echo "Test upcase(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1368,7 +1368,7 @@ else
   esac
 fi
 test -s upcase.E || rm -f upcase.E
- $xx '[:lower:]' '[:upper:]' < $srcdir/upcase.I > upcase.O 2> upcase.E
+$xx '[:lower:]' '[:upper:]' < $srcdir/upcase.I > upcase.O 2> upcase.E
 code=$?
 if test $code != 0; then
   $echo "Test upcase(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1386,7 +1386,7 @@ else
   esac
 fi
 test -s upcase.E || rm -f upcase.E
-cat $srcdir/dncase.I |  $xx '[:upper:]' '[:lower:]' > dncase.O 2> dncase.E
+cat $srcdir/dncase.I | $xx '[:upper:]' '[:lower:]' > dncase.O 2> dncase.E
 code=$?
 if test $code != 0; then
   $echo "Test dncase(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1404,7 +1404,7 @@ else
   esac
 fi
 test -s dncase.E || rm -f dncase.E
- $xx '[:upper:]' '[:lower:]' < $srcdir/dncase.I > dncase.O 2> dncase.E
+$xx '[:upper:]' '[:lower:]' < $srcdir/dncase.I > dncase.O 2> dncase.E
 code=$?
 if test $code != 0; then
   $echo "Test dncase(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1422,7 +1422,7 @@ else
   esac
 fi
 test -s dncase.E || rm -f dncase.E
-cat $srcdir/rep-cclass.I |  $xx 'a[=*2][=c=]' 'xyyz' > rep-cclass.O 2> rep-cclass.E
+cat $srcdir/rep-cclass.I | $xx 'a[=*2][=c=]' 'xyyz' > rep-cclass.O 2> rep-cclass.E
 code=$?
 if test $code != 0; then
   $echo "Test rep-cclass(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1440,7 +1440,7 @@ else
   esac
 fi
 test -s rep-cclass.E || rm -f rep-cclass.E
- $xx 'a[=*2][=c=]' 'xyyz' < $srcdir/rep-cclass.I > rep-cclass.O 2> rep-cclass.E
+$xx 'a[=*2][=c=]' 'xyyz' < $srcdir/rep-cclass.I > rep-cclass.O 2> rep-cclass.E
 code=$?
 if test $code != 0; then
   $echo "Test rep-cclass(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1458,7 +1458,7 @@ else
   esac
 fi
 test -s rep-cclass.E || rm -f rep-cclass.E
-cat $srcdir/rep-1.I |  $xx '[:*3][:digit:]' 'a-m' > rep-1.O 2> rep-1.E
+cat $srcdir/rep-1.I | $xx '[:*3][:digit:]' 'a-m' > rep-1.O 2> rep-1.E
 code=$?
 if test $code != 0; then
   $echo "Test rep-1(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1476,7 +1476,7 @@ else
   esac
 fi
 test -s rep-1.E || rm -f rep-1.E
- $xx '[:*3][:digit:]' 'a-m' < $srcdir/rep-1.I > rep-1.O 2> rep-1.E
+$xx '[:*3][:digit:]' 'a-m' < $srcdir/rep-1.I > rep-1.O 2> rep-1.E
 code=$?
 if test $code != 0; then
   $echo "Test rep-1(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1494,7 +1494,7 @@ else
   esac
 fi
 test -s rep-1.E || rm -f rep-1.E
-cat $srcdir/rep-2.I |  $xx 'a[b*512]c' '1[x*]2' > rep-2.O 2> rep-2.E
+cat $srcdir/rep-2.I | $xx 'a[b*512]c' '1[x*]2' > rep-2.O 2> rep-2.E
 code=$?
 if test $code != 0; then
   $echo "Test rep-2(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1512,7 +1512,7 @@ else
   esac
 fi
 test -s rep-2.E || rm -f rep-2.E
- $xx 'a[b*512]c' '1[x*]2' < $srcdir/rep-2.I > rep-2.O 2> rep-2.E
+$xx 'a[b*512]c' '1[x*]2' < $srcdir/rep-2.I > rep-2.O 2> rep-2.E
 code=$?
 if test $code != 0; then
   $echo "Test rep-2(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1530,7 +1530,7 @@ else
   esac
 fi
 test -s rep-2.E || rm -f rep-2.E
-cat $srcdir/rep-3.I |  $xx 'a[b*513]c' '1[x*]2' > rep-3.O 2> rep-3.E
+cat $srcdir/rep-3.I | $xx 'a[b*513]c' '1[x*]2' > rep-3.O 2> rep-3.E
 code=$?
 if test $code != 0; then
   $echo "Test rep-3(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1548,7 +1548,7 @@ else
   esac
 fi
 test -s rep-3.E || rm -f rep-3.E
- $xx 'a[b*513]c' '1[x*]2' < $srcdir/rep-3.I > rep-3.O 2> rep-3.E
+$xx 'a[b*513]c' '1[x*]2' < $srcdir/rep-3.I > rep-3.O 2> rep-3.E
 code=$?
 if test $code != 0; then
   $echo "Test rep-3(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1566,7 +1566,7 @@ else
   esac
 fi
 test -s rep-3.E || rm -f rep-3.E
-cat $srcdir/o-rep-1.I |  $xx '[b*08]' '[x*]' > o-rep-1.O 2> o-rep-1.E
+cat $srcdir/o-rep-1.I | $xx '[b*08]' '[x*]' > o-rep-1.O 2> o-rep-1.E
 code=$?
 if test $code != 1; then
   $echo "Test o-rep-1(|) failed: ../../src/tr return code $code differs from expected value 1" 1>&2
@@ -1584,7 +1584,7 @@ else
   esac
 fi
 test -s o-rep-1.E || rm -f o-rep-1.E
- $xx '[b*08]' '[x*]' < $srcdir/o-rep-1.I > o-rep-1.O 2> o-rep-1.E
+$xx '[b*08]' '[x*]' < $srcdir/o-rep-1.I > o-rep-1.O 2> o-rep-1.E
 code=$?
 if test $code != 1; then
   $echo "Test o-rep-1(<) failed: ../../src/tr return code $code differs from expected value 1" 1>&2
@@ -1602,7 +1602,7 @@ else
   esac
 fi
 test -s o-rep-1.E || rm -f o-rep-1.E
-cat $srcdir/o-rep-2.I |  $xx '[b*010]cd' '[a*7]BC[x*]' > o-rep-2.O 2> o-rep-2.E
+cat $srcdir/o-rep-2.I | $xx '[b*010]cd' '[a*7]BC[x*]' > o-rep-2.O 2> o-rep-2.E
 code=$?
 if test $code != 0; then
   $echo "Test o-rep-2(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1620,7 +1620,7 @@ else
   esac
 fi
 test -s o-rep-2.E || rm -f o-rep-2.E
- $xx '[b*010]cd' '[a*7]BC[x*]' < $srcdir/o-rep-2.I > o-rep-2.O 2> o-rep-2.E
+$xx '[b*010]cd' '[a*7]BC[x*]' < $srcdir/o-rep-2.I > o-rep-2.O 2> o-rep-2.E
 code=$?
 if test $code != 0; then
   $echo "Test o-rep-2(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1638,7 +1638,7 @@ else
   esac
 fi
 test -s o-rep-2.E || rm -f o-rep-2.E
-cat $srcdir/esc.I |  $xx 'a\-z' 'A-Z' > esc.O 2> esc.E
+cat $srcdir/esc.I | $xx 'a\-z' 'A-Z' > esc.O 2> esc.E
 code=$?
 if test $code != 0; then
   $echo "Test esc(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1656,7 +1656,7 @@ else
   esac
 fi
 test -s esc.E || rm -f esc.E
- $xx 'a\-z' 'A-Z' < $srcdir/esc.I > esc.O 2> esc.E
+$xx 'a\-z' 'A-Z' < $srcdir/esc.I > esc.O 2> esc.E
 code=$?
 if test $code != 0; then
   $echo "Test esc(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1674,7 +1674,7 @@ else
   esac
 fi
 test -s esc.E || rm -f esc.E
-cat $srcdir/ross-0a.I |  $xx -cs '[:upper:]' 'X[Y*]' > ross-0a.O 2> ross-0a.E
+cat $srcdir/ross-0a.I | $xx -cs '[:upper:]' 'X[Y*]' > ross-0a.O 2> ross-0a.E
 code=$?
 if test $code != 1; then
   $echo "Test ross-0a(|) failed: ../../src/tr return code $code differs from expected value 1" 1>&2
@@ -1692,7 +1692,7 @@ else
   esac
 fi
 test -s ross-0a.E || rm -f ross-0a.E
- $xx -cs '[:upper:]' 'X[Y*]' < $srcdir/ross-0a.I > ross-0a.O 2> ross-0a.E
+$xx -cs '[:upper:]' 'X[Y*]' < $srcdir/ross-0a.I > ross-0a.O 2> ross-0a.E
 code=$?
 if test $code != 1; then
   $echo "Test ross-0a(<) failed: ../../src/tr return code $code differs from expected value 1" 1>&2
@@ -1710,7 +1710,7 @@ else
   esac
 fi
 test -s ross-0a.E || rm -f ross-0a.E
-cat $srcdir/ross-0b.I |  $xx -cs '[:cntrl:]' 'X[Y*]' > ross-0b.O 2> ross-0b.E
+cat $srcdir/ross-0b.I | $xx -cs '[:cntrl:]' 'X[Y*]' > ross-0b.O 2> ross-0b.E
 code=$?
 if test $code != 1; then
   $echo "Test ross-0b(|) failed: ../../src/tr return code $code differs from expected value 1" 1>&2
@@ -1728,7 +1728,7 @@ else
   esac
 fi
 test -s ross-0b.E || rm -f ross-0b.E
- $xx -cs '[:cntrl:]' 'X[Y*]' < $srcdir/ross-0b.I > ross-0b.O 2> ross-0b.E
+$xx -cs '[:cntrl:]' 'X[Y*]' < $srcdir/ross-0b.I > ross-0b.O 2> ross-0b.E
 code=$?
 if test $code != 1; then
   $echo "Test ross-0b(<) failed: ../../src/tr return code $code differs from expected value 1" 1>&2
@@ -1746,7 +1746,7 @@ else
   esac
 fi
 test -s ross-0b.E || rm -f ross-0b.E
-cat $srcdir/ross-1a.I |  $xx -cs '[:upper:]' '[X*]' > ross-1a.O 2> ross-1a.E
+cat $srcdir/ross-1a.I | $xx -cs '[:upper:]' '[X*]' > ross-1a.O 2> ross-1a.E
 code=$?
 if test $code != 0; then
   $echo "Test ross-1a(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1764,7 +1764,7 @@ else
   esac
 fi
 test -s ross-1a.E || rm -f ross-1a.E
- $xx -cs '[:upper:]' '[X*]' < $srcdir/ross-1a.I > ross-1a.O 2> ross-1a.E
+$xx -cs '[:upper:]' '[X*]' < $srcdir/ross-1a.I > ross-1a.O 2> ross-1a.E
 code=$?
 if test $code != 0; then
   $echo "Test ross-1a(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1782,7 +1782,7 @@ else
   esac
 fi
 test -s ross-1a.E || rm -f ross-1a.E
-cat $srcdir/ross-1b.I |  $xx -cs '[:upper:][:digit:]' '[Z*]' > ross-1b.O 2> ross-1b.E
+cat $srcdir/ross-1b.I | $xx -cs '[:upper:][:digit:]' '[Z*]' > ross-1b.O 2> ross-1b.E
 code=$?
 if test $code != 0; then
   $echo "Test ross-1b(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1800,7 +1800,7 @@ else
   esac
 fi
 test -s ross-1b.E || rm -f ross-1b.E
- $xx -cs '[:upper:][:digit:]' '[Z*]' < $srcdir/ross-1b.I > ross-1b.O 2> ross-1b.E
+$xx -cs '[:upper:][:digit:]' '[Z*]' < $srcdir/ross-1b.I > ross-1b.O 2> ross-1b.E
 code=$?
 if test $code != 0; then
   $echo "Test ross-1b(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1818,7 +1818,7 @@ else
   esac
 fi
 test -s ross-1b.E || rm -f ross-1b.E
-cat $srcdir/ross-2.I |  $xx -dcs '[:lower:]' 'n-rs-z' > ross-2.O 2> ross-2.E
+cat $srcdir/ross-2.I | $xx -dcs '[:lower:]' 'n-rs-z' > ross-2.O 2> ross-2.E
 code=$?
 if test $code != 0; then
   $echo "Test ross-2(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1836,7 +1836,7 @@ else
   esac
 fi
 test -s ross-2.E || rm -f ross-2.E
- $xx -dcs '[:lower:]' 'n-rs-z' < $srcdir/ross-2.I > ross-2.O 2> ross-2.E
+$xx -dcs '[:lower:]' 'n-rs-z' < $srcdir/ross-2.I > ross-2.O 2> ross-2.E
 code=$?
 if test $code != 0; then
   $echo "Test ross-2(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1854,7 +1854,7 @@ else
   esac
 fi
 test -s ross-2.E || rm -f ross-2.E
-cat $srcdir/ross-3.I |  $xx -ds '[:xdigit:]' '[:alnum:]' > ross-3.O 2> ross-3.E
+cat $srcdir/ross-3.I | $xx -ds '[:xdigit:]' '[:alnum:]' > ross-3.O 2> ross-3.E
 code=$?
 if test $code != 0; then
   $echo "Test ross-3(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1872,7 +1872,7 @@ else
   esac
 fi
 test -s ross-3.E || rm -f ross-3.E
- $xx -ds '[:xdigit:]' '[:alnum:]' < $srcdir/ross-3.I > ross-3.O 2> ross-3.E
+$xx -ds '[:xdigit:]' '[:alnum:]' < $srcdir/ross-3.I > ross-3.O 2> ross-3.E
 code=$?
 if test $code != 0; then
   $echo "Test ross-3(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1890,7 +1890,7 @@ else
   esac
 fi
 test -s ross-3.E || rm -f ross-3.E
-cat $srcdir/ross-4.I |  $xx -dcs '[:alnum:]' '[:digit:]' > ross-4.O 2> ross-4.E
+cat $srcdir/ross-4.I | $xx -dcs '[:alnum:]' '[:digit:]' > ross-4.O 2> ross-4.E
 code=$?
 if test $code != 0; then
   $echo "Test ross-4(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1908,7 +1908,7 @@ else
   esac
 fi
 test -s ross-4.E || rm -f ross-4.E
- $xx -dcs '[:alnum:]' '[:digit:]' < $srcdir/ross-4.I > ross-4.O 2> ross-4.E
+$xx -dcs '[:alnum:]' '[:digit:]' < $srcdir/ross-4.I > ross-4.O 2> ross-4.E
 code=$?
 if test $code != 0; then
   $echo "Test ross-4(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1926,7 +1926,7 @@ else
   esac
 fi
 test -s ross-4.E || rm -f ross-4.E
-cat $srcdir/ross-5.I |  $xx -dc '[:lower:]' > ross-5.O 2> ross-5.E
+cat $srcdir/ross-5.I | $xx -dc '[:lower:]' > ross-5.O 2> ross-5.E
 code=$?
 if test $code != 0; then
   $echo "Test ross-5(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1944,7 +1944,7 @@ else
   esac
 fi
 test -s ross-5.E || rm -f ross-5.E
- $xx -dc '[:lower:]' < $srcdir/ross-5.I > ross-5.O 2> ross-5.E
+$xx -dc '[:lower:]' < $srcdir/ross-5.I > ross-5.O 2> ross-5.E
 code=$?
 if test $code != 0; then
   $echo "Test ross-5(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1962,7 +1962,7 @@ else
   esac
 fi
 test -s ross-5.E || rm -f ross-5.E
-cat $srcdir/ross-6.I |  $xx -dc '[:upper:]' > ross-6.O 2> ross-6.E
+cat $srcdir/ross-6.I | $xx -dc '[:upper:]' > ross-6.O 2> ross-6.E
 code=$?
 if test $code != 0; then
   $echo "Test ross-6(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1980,7 +1980,7 @@ else
   esac
 fi
 test -s ross-6.E || rm -f ross-6.E
- $xx -dc '[:upper:]' < $srcdir/ross-6.I > ross-6.O 2> ross-6.E
+$xx -dc '[:upper:]' < $srcdir/ross-6.I > ross-6.O 2> ross-6.E
 code=$?
 if test $code != 0; then
   $echo "Test ross-6(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
@@ -1998,7 +1998,7 @@ else
   esac
 fi
 test -s ross-6.E || rm -f ross-6.E
-cat $srcdir/empty-eq.I |  $xx '[==]' x > empty-eq.O 2> empty-eq.E
+cat $srcdir/empty-eq.I | $xx '[==]' x > empty-eq.O 2> empty-eq.E
 code=$?
 if test $code != 1; then
   $echo "Test empty-eq(|) failed: ../../src/tr return code $code differs from expected value 1" 1>&2
@@ -2016,7 +2016,7 @@ else
   esac
 fi
 test -s empty-eq.E || rm -f empty-eq.E
- $xx '[==]' x < $srcdir/empty-eq.I > empty-eq.O 2> empty-eq.E
+$xx '[==]' x < $srcdir/empty-eq.I > empty-eq.O 2> empty-eq.E
 code=$?
 if test $code != 1; then
   $echo "Test empty-eq(<) failed: ../../src/tr return code $code differs from expected value 1" 1>&2
@@ -2034,7 +2034,7 @@ else
   esac
 fi
 test -s empty-eq.E || rm -f empty-eq.E
-cat $srcdir/empty-cc.I |  $xx '[::]' x > empty-cc.O 2> empty-cc.E
+cat $srcdir/empty-cc.I | $xx '[::]' x > empty-cc.O 2> empty-cc.E
 code=$?
 if test $code != 1; then
   $echo "Test empty-cc(|) failed: ../../src/tr return code $code differs from expected value 1" 1>&2
@@ -2052,7 +2052,7 @@ else
   esac
 fi
 test -s empty-cc.E || rm -f empty-cc.E
- $xx '[::]' x < $srcdir/empty-cc.I > empty-cc.O 2> empty-cc.E
+$xx '[::]' x < $srcdir/empty-cc.I > empty-cc.O 2> empty-cc.E
 code=$?
 if test $code != 1; then
   $echo "Test empty-cc(<) failed: ../../src/tr return code $code differs from expected value 1" 1>&2
diff --git a/tests/wc/wc-tests b/tests/wc/wc-tests
index 8a48e89a7..32a0ac2c4 100755
--- a/tests/wc/wc-tests
+++ b/tests/wc/wc-tests
@@ -18,7 +18,7 @@ export LC_ALL
 LANG=C
 export LANG
 
-cat $srcdir/a0.I |  $xx -c > a0.O 2> a0.E
+cat $srcdir/a0.I | $xx -c > a0.O 2> a0.E
 code=$?
 if test $code != 0; then
   $echo "Test a0(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -36,7 +36,7 @@ else
   esac
 fi
 test -s a0.E || rm -f a0.E
- $xx -c < $srcdir/a0.I > a0.O 2> a0.E
+$xx -c < $srcdir/a0.I > a0.O 2> a0.E
 code=$?
 if test $code != 0; then
   $echo "Test a0(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -54,7 +54,7 @@ else
   esac
 fi
 test -s a0.E || rm -f a0.E
-cat $srcdir/a1.I |  $xx -l > a1.O 2> a1.E
+cat $srcdir/a1.I | $xx -l > a1.O 2> a1.E
 code=$?
 if test $code != 0; then
   $echo "Test a1(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -72,7 +72,7 @@ else
   esac
 fi
 test -s a1.E || rm -f a1.E
- $xx -l < $srcdir/a1.I > a1.O 2> a1.E
+$xx -l < $srcdir/a1.I > a1.O 2> a1.E
 code=$?
 if test $code != 0; then
   $echo "Test a1(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -90,7 +90,7 @@ else
   esac
 fi
 test -s a1.E || rm -f a1.E
-cat $srcdir/a2.I |  $xx -w > a2.O 2> a2.E
+cat $srcdir/a2.I | $xx -w > a2.O 2> a2.E
 code=$?
 if test $code != 0; then
   $echo "Test a2(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -108,7 +108,7 @@ else
   esac
 fi
 test -s a2.E || rm -f a2.E
- $xx -w < $srcdir/a2.I > a2.O 2> a2.E
+$xx -w < $srcdir/a2.I > a2.O 2> a2.E
 code=$?
 if test $code != 0; then
   $echo "Test a2(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -126,7 +126,7 @@ else
   esac
 fi
 test -s a2.E || rm -f a2.E
-cat $srcdir/a3.I |  $xx -c > a3.O 2> a3.E
+cat $srcdir/a3.I | $xx -c > a3.O 2> a3.E
 code=$?
 if test $code != 0; then
   $echo "Test a3(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -144,7 +144,7 @@ else
   esac
 fi
 test -s a3.E || rm -f a3.E
- $xx -c < $srcdir/a3.I > a3.O 2> a3.E
+$xx -c < $srcdir/a3.I > a3.O 2> a3.E
 code=$?
 if test $code != 0; then
   $echo "Test a3(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -162,7 +162,7 @@ else
   esac
 fi
 test -s a3.E || rm -f a3.E
-cat $srcdir/a4.I |  $xx -w > a4.O 2> a4.E
+cat $srcdir/a4.I | $xx -w > a4.O 2> a4.E
 code=$?
 if test $code != 0; then
   $echo "Test a4(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -180,7 +180,7 @@ else
   esac
 fi
 test -s a4.E || rm -f a4.E
- $xx -w < $srcdir/a4.I > a4.O 2> a4.E
+$xx -w < $srcdir/a4.I > a4.O 2> a4.E
 code=$?
 if test $code != 0; then
   $echo "Test a4(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -198,7 +198,7 @@ else
   esac
 fi
 test -s a4.E || rm -f a4.E
-cat $srcdir/a5.I |  $xx -w > a5.O 2> a5.E
+cat $srcdir/a5.I | $xx -w > a5.O 2> a5.E
 code=$?
 if test $code != 0; then
   $echo "Test a5(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -216,7 +216,7 @@ else
   esac
 fi
 test -s a5.E || rm -f a5.E
- $xx -w < $srcdir/a5.I > a5.O 2> a5.E
+$xx -w < $srcdir/a5.I > a5.O 2> a5.E
 code=$?
 if test $code != 0; then
   $echo "Test a5(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -234,7 +234,7 @@ else
   esac
 fi
 test -s a5.E || rm -f a5.E
-cat $srcdir/a6.I |  $xx -w > a6.O 2> a6.E
+cat $srcdir/a6.I | $xx -w > a6.O 2> a6.E
 code=$?
 if test $code != 0; then
   $echo "Test a6(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -252,7 +252,7 @@ else
   esac
 fi
 test -s a6.E || rm -f a6.E
- $xx -w < $srcdir/a6.I > a6.O 2> a6.E
+$xx -w < $srcdir/a6.I > a6.O 2> a6.E
 code=$?
 if test $code != 0; then
   $echo "Test a6(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -270,7 +270,7 @@ else
   esac
 fi
 test -s a6.E || rm -f a6.E
-cat $srcdir/a7.I |  $xx -l > a7.O 2> a7.E
+cat $srcdir/a7.I | $xx -l > a7.O 2> a7.E
 code=$?
 if test $code != 0; then
   $echo "Test a7(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -288,7 +288,7 @@ else
   esac
 fi
 test -s a7.E || rm -f a7.E
- $xx -l < $srcdir/a7.I > a7.O 2> a7.E
+$xx -l < $srcdir/a7.I > a7.O 2> a7.E
 code=$?
 if test $code != 0; then
   $echo "Test a7(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -306,7 +306,7 @@ else
   esac
 fi
 test -s a7.E || rm -f a7.E
-cat $srcdir/a8.I |  $xx -l > a8.O 2> a8.E
+cat $srcdir/a8.I | $xx -l > a8.O 2> a8.E
 code=$?
 if test $code != 0; then
   $echo "Test a8(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -324,7 +324,7 @@ else
   esac
 fi
 test -s a8.E || rm -f a8.E
- $xx -l < $srcdir/a8.I > a8.O 2> a8.E
+$xx -l < $srcdir/a8.I > a8.O 2> a8.E
 code=$?
 if test $code != 0; then
   $echo "Test a8(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -342,7 +342,7 @@ else
   esac
 fi
 test -s a8.E || rm -f a8.E
-cat $srcdir/a9.I |  $xx -l > a9.O 2> a9.E
+cat $srcdir/a9.I | $xx -l > a9.O 2> a9.E
 code=$?
 if test $code != 0; then
   $echo "Test a9(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -360,7 +360,7 @@ else
   esac
 fi
 test -s a9.E || rm -f a9.E
- $xx -l < $srcdir/a9.I > a9.O 2> a9.E
+$xx -l < $srcdir/a9.I > a9.O 2> a9.E
 code=$?
 if test $code != 0; then
   $echo "Test a9(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -378,7 +378,7 @@ else
   esac
 fi
 test -s a9.E || rm -f a9.E
-cat $srcdir/b0.I |  $xx  > b0.O 2> b0.E
+cat $srcdir/b0.I | $xx  > b0.O 2> b0.E
 code=$?
 if test $code != 0; then
   $echo "Test b0(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -396,7 +396,7 @@ else
   esac
 fi
 test -s b0.E || rm -f b0.E
- $xx  < $srcdir/b0.I > b0.O 2> b0.E
+$xx  < $srcdir/b0.I > b0.O 2> b0.E
 code=$?
 if test $code != 0; then
   $echo "Test b0(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -414,7 +414,7 @@ else
   esac
 fi
 test -s b0.E || rm -f b0.E
-cat $srcdir/b1.I |  $xx  > b1.O 2> b1.E
+cat $srcdir/b1.I | $xx  > b1.O 2> b1.E
 code=$?
 if test $code != 0; then
   $echo "Test b1(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -432,7 +432,7 @@ else
   esac
 fi
 test -s b1.E || rm -f b1.E
- $xx  < $srcdir/b1.I > b1.O 2> b1.E
+$xx  < $srcdir/b1.I > b1.O 2> b1.E
 code=$?
 if test $code != 0; then
   $echo "Test b1(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -450,7 +450,7 @@ else
   esac
 fi
 test -s b1.E || rm -f b1.E
-cat $srcdir/c0.I |  $xx -L > c0.O 2> c0.E
+cat $srcdir/c0.I | $xx -L > c0.O 2> c0.E
 code=$?
 if test $code != 0; then
   $echo "Test c0(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -468,7 +468,7 @@ else
   esac
 fi
 test -s c0.E || rm -f c0.E
- $xx -L < $srcdir/c0.I > c0.O 2> c0.E
+$xx -L < $srcdir/c0.I > c0.O 2> c0.E
 code=$?
 if test $code != 0; then
   $echo "Test c0(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -486,7 +486,7 @@ else
   esac
 fi
 test -s c0.E || rm -f c0.E
-cat $srcdir/c1.I |  $xx -L > c1.O 2> c1.E
+cat $srcdir/c1.I | $xx -L > c1.O 2> c1.E
 code=$?
 if test $code != 0; then
   $echo "Test c1(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -504,7 +504,7 @@ else
   esac
 fi
 test -s c1.E || rm -f c1.E
- $xx -L < $srcdir/c1.I > c1.O 2> c1.E
+$xx -L < $srcdir/c1.I > c1.O 2> c1.E
 code=$?
 if test $code != 0; then
   $echo "Test c1(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -522,7 +522,7 @@ else
   esac
 fi
 test -s c1.E || rm -f c1.E
-cat $srcdir/c2.I |  $xx -L > c2.O 2> c2.E
+cat $srcdir/c2.I | $xx -L > c2.O 2> c2.E
 code=$?
 if test $code != 0; then
   $echo "Test c2(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
@@ -540,7 +540,7 @@ else
   esac
 fi
 test -s c2.E || rm -f c2.E
- $xx -L < $srcdir/c2.I > c2.O 2> c2.E
+$xx -L < $srcdir/c2.I > c2.O 2> c2.E
 code=$?
 if test $code != 0; then
   $echo "Test c2(<) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
-- 
cgit v1.2.3-54-g00ecf