regenerate

1 files changed, 153 insertions, 153 deletions

diff --git a/tests/cut/cut-tests b/tests/cut/cut-tests
index a92dfce9d..570232512 100755
--- a/tests/cut/cut-tests
+++ b/tests/cut/cut-tests
@@ -21,7 +21,7 @@ export LANG
 $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
+  $echo "Test 1(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1.O $srcdir/1.X > /dev/null 2>&1
@@ -39,7 +39,7 @@ test -s 1.E || rm -f 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
+  $echo "Test 1(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1.O $srcdir/1.X > /dev/null 2>&1
@@ -57,7 +57,7 @@ test -s 1.E || rm -f 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
+  $echo "Test 1(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1.O $srcdir/1.X > /dev/null 2>&1
@@ -75,7 +75,7 @@ test -s 1.E || rm -f 1.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
+  $echo "Test 2(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 2.O $srcdir/2.X > /dev/null 2>&1
@@ -93,7 +93,7 @@ test -s 2.E || rm -f 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
+  $echo "Test 2(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 2.O $srcdir/2.X > /dev/null 2>&1
@@ -111,7 +111,7 @@ test -s 2.E || rm -f 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
+  $echo "Test 2(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 2.O $srcdir/2.X > /dev/null 2>&1
@@ -129,7 +129,7 @@ test -s 2.E || rm -f 2.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
+  $echo "Test 3(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3.O $srcdir/3.X > /dev/null 2>&1
@@ -147,7 +147,7 @@ test -s 3.E || rm -f 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
+  $echo "Test 3(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3.O $srcdir/3.X > /dev/null 2>&1
@@ -165,7 +165,7 @@ test -s 3.E || rm -f 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
+  $echo "Test 3(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3.O $srcdir/3.X > /dev/null 2>&1
@@ -183,7 +183,7 @@ test -s 3.E || rm -f 3.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
+  $echo "Test 4(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4.O $srcdir/4.X > /dev/null 2>&1
@@ -201,7 +201,7 @@ test -s 4.E || rm -f 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
+  $echo "Test 4(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4.O $srcdir/4.X > /dev/null 2>&1
@@ -219,7 +219,7 @@ test -s 4.E || rm -f 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
+  $echo "Test 4(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4.O $srcdir/4.X > /dev/null 2>&1
@@ -237,7 +237,7 @@ test -s 4.E || rm -f 4.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
+  $echo "Test 5(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5.O $srcdir/5.X > /dev/null 2>&1
@@ -255,7 +255,7 @@ test -s 5.E || rm -f 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
+  $echo "Test 5(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5.O $srcdir/5.X > /dev/null 2>&1
@@ -273,7 +273,7 @@ test -s 5.E || rm -f 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
+  $echo "Test 5(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5.O $srcdir/5.X > /dev/null 2>&1
@@ -291,7 +291,7 @@ test -s 5.E || rm -f 5.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
+  $echo "Test 6(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6.O $srcdir/6.X > /dev/null 2>&1
@@ -309,7 +309,7 @@ test -s 6.E || rm -f 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
+  $echo "Test 6(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6.O $srcdir/6.X > /dev/null 2>&1
@@ -327,7 +327,7 @@ test -s 6.E || rm -f 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
+  $echo "Test 6(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6.O $srcdir/6.X > /dev/null 2>&1
@@ -345,7 +345,7 @@ test -s 6.E || rm -f 6.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
+  $echo "Test 7(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 7.O $srcdir/7.X > /dev/null 2>&1
@@ -363,7 +363,7 @@ test -s 7.E || rm -f 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
+  $echo "Test 7(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 7.O $srcdir/7.X > /dev/null 2>&1
@@ -381,7 +381,7 @@ test -s 7.E || rm -f 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
+  $echo "Test 7(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 7.O $srcdir/7.X > /dev/null 2>&1
@@ -399,7 +399,7 @@ test -s 7.E || rm -f 7.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
+  $echo "Test 8(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 8.O $srcdir/8.X > /dev/null 2>&1
@@ -417,7 +417,7 @@ test -s 8.E || rm -f 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
+  $echo "Test 8(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 8.O $srcdir/8.X > /dev/null 2>&1
@@ -435,7 +435,7 @@ test -s 8.E || rm -f 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
+  $echo "Test 8(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 8.O $srcdir/8.X > /dev/null 2>&1
@@ -453,7 +453,7 @@ test -s 8.E || rm -f 8.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
+  $echo "Test 9(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9.O $srcdir/9.X > /dev/null 2>&1
@@ -471,7 +471,7 @@ test -s 9.E || rm -f 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
+  $echo "Test 9(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9.O $srcdir/9.X > /dev/null 2>&1
@@ -489,7 +489,7 @@ test -s 9.E || rm -f 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
+  $echo "Test 9(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9.O $srcdir/9.X > /dev/null 2>&1
@@ -507,7 +507,7 @@ test -s 9.E || rm -f 9.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
+  $echo "Test a(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a.O $srcdir/a.X > /dev/null 2>&1
@@ -525,7 +525,7 @@ test -s a.E || rm -f 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
+  $echo "Test a(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a.O $srcdir/a.X > /dev/null 2>&1
@@ -543,7 +543,7 @@ test -s a.E || rm -f 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
+  $echo "Test a(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a.O $srcdir/a.X > /dev/null 2>&1
@@ -561,7 +561,7 @@ test -s a.E || rm -f a.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
+  $echo "Test b(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp b.O $srcdir/b.X > /dev/null 2>&1
@@ -579,7 +579,7 @@ test -s b.E || rm -f 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
+  $echo "Test b(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp b.O $srcdir/b.X > /dev/null 2>&1
@@ -597,7 +597,7 @@ test -s b.E || rm -f 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
+  $echo "Test b(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp b.O $srcdir/b.X > /dev/null 2>&1
@@ -615,7 +615,7 @@ test -s b.E || rm -f b.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
+  $echo "Test c(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp c.O $srcdir/c.X > /dev/null 2>&1
@@ -633,7 +633,7 @@ test -s c.E || rm -f 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
+  $echo "Test c(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp c.O $srcdir/c.X > /dev/null 2>&1
@@ -651,7 +651,7 @@ test -s c.E || rm -f 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
+  $echo "Test c(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp c.O $srcdir/c.X > /dev/null 2>&1
@@ -669,7 +669,7 @@ test -s c.E || rm -f c.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
+  $echo "Test d(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp d.O $srcdir/d.X > /dev/null 2>&1
@@ -687,7 +687,7 @@ test -s d.E || rm -f 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
+  $echo "Test d(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp d.O $srcdir/d.X > /dev/null 2>&1
@@ -705,7 +705,7 @@ test -s d.E || rm -f 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
+  $echo "Test d(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp d.O $srcdir/d.X > /dev/null 2>&1
@@ -723,7 +723,7 @@ test -s d.E || rm -f d.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
+  $echo "Test e(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp e.O $srcdir/e.X > /dev/null 2>&1
@@ -741,7 +741,7 @@ test -s e.E || rm -f 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
+  $echo "Test e(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp e.O $srcdir/e.X > /dev/null 2>&1
@@ -759,7 +759,7 @@ test -s e.E || rm -f 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
+  $echo "Test e(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp e.O $srcdir/e.X > /dev/null 2>&1
@@ -777,7 +777,7 @@ test -s e.E || rm -f e.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
+  $echo "Test f(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp f.O $srcdir/f.X > /dev/null 2>&1
@@ -795,7 +795,7 @@ test -s f.E || rm -f 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
+  $echo "Test f(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp f.O $srcdir/f.X > /dev/null 2>&1
@@ -813,7 +813,7 @@ test -s f.E || rm -f 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
+  $echo "Test f(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp f.O $srcdir/f.X > /dev/null 2>&1
@@ -831,7 +831,7 @@ test -s f.E || rm -f f.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
+  $echo "Test g(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp g.O $srcdir/g.X > /dev/null 2>&1
@@ -849,7 +849,7 @@ test -s g.E || rm -f 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
+  $echo "Test g(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp g.O $srcdir/g.X > /dev/null 2>&1
@@ -867,7 +867,7 @@ test -s g.E || rm -f 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
+  $echo "Test g(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp g.O $srcdir/g.X > /dev/null 2>&1
@@ -885,7 +885,7 @@ test -s g.E || rm -f g.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
+  $echo "Test h(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp h.O $srcdir/h.X > /dev/null 2>&1
@@ -903,7 +903,7 @@ test -s h.E || rm -f 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
+  $echo "Test h(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp h.O $srcdir/h.X > /dev/null 2>&1
@@ -921,7 +921,7 @@ test -s h.E || rm -f 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
+  $echo "Test h(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp h.O $srcdir/h.X > /dev/null 2>&1
@@ -939,7 +939,7 @@ test -s h.E || rm -f h.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
+  $echo "Test i(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp i.O $srcdir/i.X > /dev/null 2>&1
@@ -957,7 +957,7 @@ test -s i.E || rm -f 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
+  $echo "Test i(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp i.O $srcdir/i.X > /dev/null 2>&1
@@ -975,7 +975,7 @@ test -s i.E || rm -f 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
+  $echo "Test i(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp i.O $srcdir/i.X > /dev/null 2>&1
@@ -993,7 +993,7 @@ test -s i.E || rm -f i.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
+  $echo "Test j(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp j.O $srcdir/j.X > /dev/null 2>&1
@@ -1011,7 +1011,7 @@ test -s j.E || rm -f 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
+  $echo "Test j(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp j.O $srcdir/j.X > /dev/null 2>&1
@@ -1029,7 +1029,7 @@ test -s j.E || rm -f 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
+  $echo "Test j(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp j.O $srcdir/j.X > /dev/null 2>&1
@@ -1047,7 +1047,7 @@ test -s j.E || rm -f j.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
+  $echo "Test k(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp k.O $srcdir/k.X > /dev/null 2>&1
@@ -1065,7 +1065,7 @@ test -s k.E || rm -f 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
+  $echo "Test k(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp k.O $srcdir/k.X > /dev/null 2>&1
@@ -1083,7 +1083,7 @@ test -s k.E || rm -f 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
+  $echo "Test k(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp k.O $srcdir/k.X > /dev/null 2>&1
@@ -1101,7 +1101,7 @@ test -s k.E || rm -f k.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
+  $echo "Test l(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp l.O $srcdir/l.X > /dev/null 2>&1
@@ -1119,7 +1119,7 @@ test -s l.E || rm -f 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
+  $echo "Test l(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp l.O $srcdir/l.X > /dev/null 2>&1
@@ -1137,7 +1137,7 @@ test -s l.E || rm -f 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
+  $echo "Test l(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp l.O $srcdir/l.X > /dev/null 2>&1
@@ -1155,7 +1155,7 @@ test -s l.E || rm -f l.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
+  $echo "Test m(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp m.O $srcdir/m.X > /dev/null 2>&1
@@ -1173,7 +1173,7 @@ test -s m.E || rm -f 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
+  $echo "Test m(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp m.O $srcdir/m.X > /dev/null 2>&1
@@ -1191,7 +1191,7 @@ test -s m.E || rm -f 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
+  $echo "Test m(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp m.O $srcdir/m.X > /dev/null 2>&1
@@ -1209,7 +1209,7 @@ test -s m.E || rm -f m.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
+  $echo "Test n(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n.O $srcdir/n.X > /dev/null 2>&1
@@ -1227,7 +1227,7 @@ test -s n.E || rm -f 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
+  $echo "Test n(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n.O $srcdir/n.X > /dev/null 2>&1
@@ -1245,7 +1245,7 @@ test -s n.E || rm -f 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
+  $echo "Test n(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n.O $srcdir/n.X > /dev/null 2>&1
@@ -1263,7 +1263,7 @@ test -s n.E || rm -f n.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
+  $echo "Test o(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp o.O $srcdir/o.X > /dev/null 2>&1
@@ -1281,7 +1281,7 @@ test -s o.E || rm -f 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
+  $echo "Test o(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp o.O $srcdir/o.X > /dev/null 2>&1
@@ -1299,7 +1299,7 @@ test -s o.E || rm -f 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
+  $echo "Test o(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp o.O $srcdir/o.X > /dev/null 2>&1
@@ -1317,7 +1317,7 @@ test -s o.E || rm -f o.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
+  $echo "Test p(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp p.O $srcdir/p.X > /dev/null 2>&1
@@ -1335,7 +1335,7 @@ test -s p.E || rm -f 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
+  $echo "Test p(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp p.O $srcdir/p.X > /dev/null 2>&1
@@ -1353,7 +1353,7 @@ test -s p.E || rm -f 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
+  $echo "Test p(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp p.O $srcdir/p.X > /dev/null 2>&1
@@ -1371,7 +1371,7 @@ test -s p.E || rm -f p.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
+  $echo "Test q(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp q.O $srcdir/q.X > /dev/null 2>&1
@@ -1389,7 +1389,7 @@ test -s q.E || rm -f 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
+  $echo "Test q(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp q.O $srcdir/q.X > /dev/null 2>&1
@@ -1407,7 +1407,7 @@ test -s q.E || rm -f 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
+  $echo "Test q(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp q.O $srcdir/q.X > /dev/null 2>&1
@@ -1425,7 +1425,7 @@ test -s q.E || rm -f q.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
+  $echo "Test r(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp r.O $srcdir/r.X > /dev/null 2>&1
@@ -1443,7 +1443,7 @@ test -s r.E || rm -f 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
+  $echo "Test r(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp r.O $srcdir/r.X > /dev/null 2>&1
@@ -1461,7 +1461,7 @@ test -s r.E || rm -f 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
+  $echo "Test r(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp r.O $srcdir/r.X > /dev/null 2>&1
@@ -1479,7 +1479,7 @@ test -s r.E || rm -f r.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
+  $echo "Test s(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp s.O $srcdir/s.X > /dev/null 2>&1
@@ -1497,7 +1497,7 @@ test -s s.E || rm -f 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
+  $echo "Test s(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp s.O $srcdir/s.X > /dev/null 2>&1
@@ -1515,7 +1515,7 @@ test -s s.E || rm -f 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
+  $echo "Test s(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp s.O $srcdir/s.X > /dev/null 2>&1
@@ -1533,7 +1533,7 @@ test -s s.E || rm -f s.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
+  $echo "Test t(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t.O $srcdir/t.X > /dev/null 2>&1
@@ -1551,7 +1551,7 @@ test -s t.E || rm -f 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
+  $echo "Test t(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t.O $srcdir/t.X > /dev/null 2>&1
@@ -1569,7 +1569,7 @@ test -s t.E || rm -f 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
+  $echo "Test t(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t.O $srcdir/t.X > /dev/null 2>&1
@@ -1587,7 +1587,7 @@ test -s t.E || rm -f t.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
+  $echo "Test u(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp u.O $srcdir/u.X > /dev/null 2>&1
@@ -1605,7 +1605,7 @@ test -s u.E || rm -f 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
+  $echo "Test u(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp u.O $srcdir/u.X > /dev/null 2>&1
@@ -1623,7 +1623,7 @@ test -s u.E || rm -f 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
+  $echo "Test u(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp u.O $srcdir/u.X > /dev/null 2>&1
@@ -1641,7 +1641,7 @@ test -s u.E || rm -f u.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
+  $echo "Test v(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp v.O $srcdir/v.X > /dev/null 2>&1
@@ -1659,7 +1659,7 @@ test -s v.E || rm -f 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
+  $echo "Test v(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp v.O $srcdir/v.X > /dev/null 2>&1
@@ -1677,7 +1677,7 @@ test -s v.E || rm -f 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
+  $echo "Test v(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp v.O $srcdir/v.X > /dev/null 2>&1
@@ -1695,7 +1695,7 @@ test -s v.E || rm -f v.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
+  $echo "Test w(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp w.O $srcdir/w.X > /dev/null 2>&1
@@ -1713,7 +1713,7 @@ test -s w.E || rm -f 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
+  $echo "Test w(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp w.O $srcdir/w.X > /dev/null 2>&1
@@ -1731,7 +1731,7 @@ test -s w.E || rm -f 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
+  $echo "Test w(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp w.O $srcdir/w.X > /dev/null 2>&1
@@ -1749,7 +1749,7 @@ test -s w.E || rm -f w.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
+  $echo "Test x(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp x.O $srcdir/x.X > /dev/null 2>&1
@@ -1767,7 +1767,7 @@ test -s x.E || rm -f 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
+  $echo "Test x(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp x.O $srcdir/x.X > /dev/null 2>&1
@@ -1785,7 +1785,7 @@ test -s x.E || rm -f 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
+  $echo "Test x(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp x.O $srcdir/x.X > /dev/null 2>&1
@@ -1803,7 +1803,7 @@ test -s x.E || rm -f x.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
+  $echo "Test y(F) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp y.O $srcdir/y.X > /dev/null 2>&1
@@ -1821,7 +1821,7 @@ test -s y.E || rm -f 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
+  $echo "Test y(<) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp y.O $srcdir/y.X > /dev/null 2>&1
@@ -1839,7 +1839,7 @@ test -s y.E || rm -f y.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
+  $echo "Test z(F) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp z.O $srcdir/z.X > /dev/null 2>&1
@@ -1857,7 +1857,7 @@ test -s z.E || rm -f 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
+  $echo "Test z(<) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp z.O $srcdir/z.X > /dev/null 2>&1
@@ -1875,7 +1875,7 @@ test -s z.E || rm -f z.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
+  $echo "Test empty-fl(F) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp empty-fl.O $srcdir/empty-fl.X > /dev/null 2>&1
@@ -1893,7 +1893,7 @@ test -s empty-fl.E || rm -f 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
+  $echo "Test empty-fl(<) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp empty-fl.O $srcdir/empty-fl.X > /dev/null 2>&1
@@ -1911,7 +1911,7 @@ test -s empty-fl.E || rm -f empty-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
+  $echo "Test missing-fl(F) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp missing-fl.O $srcdir/missing-fl.X > /dev/null 2>&1
@@ -1929,7 +1929,7 @@ test -s missing-fl.E || rm -f 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
+  $echo "Test missing-fl(<) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp missing-fl.O $srcdir/missing-fl.X > /dev/null 2>&1
@@ -1947,7 +1947,7 @@ test -s missing-fl.E || rm -f missing-fl.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
+  $echo "Test empty-bl(F) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp empty-bl.O $srcdir/empty-bl.X > /dev/null 2>&1
@@ -1965,7 +1965,7 @@ test -s empty-bl.E || rm -f 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
+  $echo "Test empty-bl(<) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp empty-bl.O $srcdir/empty-bl.X > /dev/null 2>&1
@@ -1983,7 +1983,7 @@ test -s empty-bl.E || rm -f empty-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
+  $echo "Test missing-bl(F) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp missing-bl.O $srcdir/missing-bl.X > /dev/null 2>&1
@@ -2001,7 +2001,7 @@ test -s missing-bl.E || rm -f 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
+  $echo "Test missing-bl(<) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp missing-bl.O $srcdir/missing-bl.X > /dev/null 2>&1
@@ -2019,7 +2019,7 @@ test -s missing-bl.E || rm -f missing-bl.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
+  $echo "Test empty-f1(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp empty-f1.O $srcdir/empty-f1.X > /dev/null 2>&1
@@ -2037,7 +2037,7 @@ test -s empty-f1.E || rm -f 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
+  $echo "Test empty-f1(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp empty-f1.O $srcdir/empty-f1.X > /dev/null 2>&1
@@ -2055,7 +2055,7 @@ test -s empty-f1.E || rm -f 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
+  $echo "Test empty-f1(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp empty-f1.O $srcdir/empty-f1.X > /dev/null 2>&1
@@ -2073,7 +2073,7 @@ test -s empty-f1.E || rm -f empty-f1.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
+  $echo "Test empty-f2(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp empty-f2.O $srcdir/empty-f2.X > /dev/null 2>&1
@@ -2091,7 +2091,7 @@ test -s empty-f2.E || rm -f 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
+  $echo "Test empty-f2(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp empty-f2.O $srcdir/empty-f2.X > /dev/null 2>&1
@@ -2109,7 +2109,7 @@ test -s empty-f2.E || rm -f 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
+  $echo "Test empty-f2(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp empty-f2.O $srcdir/empty-f2.X > /dev/null 2>&1
@@ -2127,7 +2127,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test o-delim(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test o-delim(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp o-delim.O $srcdir/o-delim.X > /dev/null 2>&1
@@ -2145,7 +2145,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test o-delim(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test o-delim(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp o-delim.O $srcdir/o-delim.X > /dev/null 2>&1
@@ -2163,7 +2163,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test o-delim(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test o-delim(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp o-delim.O $srcdir/o-delim.X > /dev/null 2>&1
@@ -2181,7 +2181,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test nul-idelim(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test nul-idelim(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp nul-idelim.O $srcdir/nul-idelim.X > /dev/null 2>&1
@@ -2199,7 +2199,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test nul-idelim(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test nul-idelim(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp nul-idelim.O $srcdir/nul-idelim.X > /dev/null 2>&1
@@ -2217,7 +2217,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test nul-idelim(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test nul-idelim(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp nul-idelim.O $srcdir/nul-idelim.X > /dev/null 2>&1
@@ -2235,7 +2235,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test nul-odelim(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test nul-odelim(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp nul-odelim.O $srcdir/nul-odelim.X > /dev/null 2>&1
@@ -2253,7 +2253,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test nul-odelim(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test nul-odelim(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp nul-odelim.O $srcdir/nul-odelim.X > /dev/null 2>&1
@@ -2271,7 +2271,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test nul-odelim(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test nul-odelim(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp nul-odelim.O $srcdir/nul-odelim.X > /dev/null 2>&1
@@ -2289,7 +2289,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test multichar-od(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test multichar-od(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp multichar-od.O $srcdir/multichar-od.X > /dev/null 2>&1
@@ -2307,7 +2307,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test multichar-od(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test multichar-od(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp multichar-od.O $srcdir/multichar-od.X > /dev/null 2>&1
@@ -2325,7 +2325,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test multichar-od(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test multichar-od(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp multichar-od.O $srcdir/multichar-od.X > /dev/null 2>&1
@@ -2343,7 +2343,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 8bit-delim(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test 8bit-delim(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 8bit-delim.O $srcdir/8bit-delim.X > /dev/null 2>&1
@@ -2361,7 +2361,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 8bit-delim(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test 8bit-delim(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 8bit-delim.O $srcdir/8bit-delim.X > /dev/null 2>&1
@@ -2379,7 +2379,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 8bit-delim(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test 8bit-delim(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 8bit-delim.O $srcdir/8bit-delim.X > /dev/null 2>&1
@@ -2397,7 +2397,7 @@ test -s 8bit-delim.E || rm -f 8bit-delim.E
 $xx -c1-3,5- --output-d=: $srcdir/out-delim1.I > out-delim1.O 2> out-delim1.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim1(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim1(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim1.O $srcdir/out-delim1.X > /dev/null 2>&1
@@ -2415,7 +2415,7 @@ test -s out-delim1.E || rm -f out-delim1.E
 cat $srcdir/out-delim1.I | $xx -c1-3,5- --output-d=: > out-delim1.O 2> out-delim1.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim1(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim1(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim1.O $srcdir/out-delim1.X > /dev/null 2>&1
@@ -2433,7 +2433,7 @@ test -s out-delim1.E || rm -f out-delim1.E
 $xx -c1-3,5- --output-d=: < $srcdir/out-delim1.I > out-delim1.O 2> out-delim1.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim1(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim1(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim1.O $srcdir/out-delim1.X > /dev/null 2>&1
@@ -2451,7 +2451,7 @@ test -s out-delim1.E || rm -f out-delim1.E
 $xx -c1-3,2,5- --output-d=: $srcdir/out-delim2.I > out-delim2.O 2> out-delim2.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim2(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim2(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim2.O $srcdir/out-delim2.X > /dev/null 2>&1
@@ -2469,7 +2469,7 @@ test -s out-delim2.E || rm -f out-delim2.E
 cat $srcdir/out-delim2.I | $xx -c1-3,2,5- --output-d=: > out-delim2.O 2> out-delim2.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim2(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim2(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim2.O $srcdir/out-delim2.X > /dev/null 2>&1
@@ -2487,7 +2487,7 @@ test -s out-delim2.E || rm -f out-delim2.E
 $xx -c1-3,2,5- --output-d=: < $srcdir/out-delim2.I > out-delim2.O 2> out-delim2.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim2(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim2(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim2.O $srcdir/out-delim2.X > /dev/null 2>&1
@@ -2505,7 +2505,7 @@ test -s out-delim2.E || rm -f out-delim2.E
 $xx -c1-3,2-4,6 --output-d=: $srcdir/out-delim3.I > out-delim3.O 2> out-delim3.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim3(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim3(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim3.O $srcdir/out-delim3.X > /dev/null 2>&1
@@ -2523,7 +2523,7 @@ test -s out-delim3.E || rm -f out-delim3.E
 cat $srcdir/out-delim3.I | $xx -c1-3,2-4,6 --output-d=: > out-delim3.O 2> out-delim3.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim3(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim3(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim3.O $srcdir/out-delim3.X > /dev/null 2>&1
@@ -2541,7 +2541,7 @@ test -s out-delim3.E || rm -f out-delim3.E
 $xx -c1-3,2-4,6 --output-d=: < $srcdir/out-delim3.I > out-delim3.O 2> out-delim3.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim3(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim3(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim3.O $srcdir/out-delim3.X > /dev/null 2>&1
@@ -2559,7 +2559,7 @@ test -s out-delim3.E || rm -f out-delim3.E
 $xx -c1-3,2-4,6- --output-d=: $srcdir/out-delim3a.I > out-delim3a.O 2> out-delim3a.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim3a(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim3a(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim3a.O $srcdir/out-delim3a.X > /dev/null 2>&1
@@ -2577,7 +2577,7 @@ test -s out-delim3a.E || rm -f out-delim3a.E
 cat $srcdir/out-delim3a.I | $xx -c1-3,2-4,6- --output-d=: > out-delim3a.O 2> out-delim3a.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim3a(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim3a(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim3a.O $srcdir/out-delim3a.X > /dev/null 2>&1
@@ -2595,7 +2595,7 @@ test -s out-delim3a.E || rm -f out-delim3a.E
 $xx -c1-3,2-4,6- --output-d=: < $srcdir/out-delim3a.I > out-delim3a.O 2> out-delim3a.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim3a(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim3a(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim3a.O $srcdir/out-delim3a.X > /dev/null 2>&1
@@ -2613,7 +2613,7 @@ test -s out-delim3a.E || rm -f out-delim3a.E
 $xx -c4-,2-3 --output-d=: $srcdir/out-delim4.I > out-delim4.O 2> out-delim4.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim4(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim4(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim4.O $srcdir/out-delim4.X > /dev/null 2>&1
@@ -2631,7 +2631,7 @@ test -s out-delim4.E || rm -f out-delim4.E
 cat $srcdir/out-delim4.I | $xx -c4-,2-3 --output-d=: > out-delim4.O 2> out-delim4.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim4(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim4(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim4.O $srcdir/out-delim4.X > /dev/null 2>&1
@@ -2649,7 +2649,7 @@ test -s out-delim4.E || rm -f out-delim4.E
 $xx -c4-,2-3 --output-d=: < $srcdir/out-delim4.I > out-delim4.O 2> out-delim4.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim4(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim4(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim4.O $srcdir/out-delim4.X > /dev/null 2>&1
@@ -2667,7 +2667,7 @@ test -s out-delim4.E || rm -f out-delim4.E
 $xx -c2-3,4- --output-d=: $srcdir/out-delim5.I > out-delim5.O 2> out-delim5.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim5(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim5(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim5.O $srcdir/out-delim5.X > /dev/null 2>&1
@@ -2685,7 +2685,7 @@ test -s out-delim5.E || rm -f out-delim5.E
 cat $srcdir/out-delim5.I | $xx -c2-3,4- --output-d=: > out-delim5.O 2> out-delim5.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim5(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim5(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim5.O $srcdir/out-delim5.X > /dev/null 2>&1
@@ -2703,7 +2703,7 @@ test -s out-delim5.E || rm -f out-delim5.E
 $xx -c2-3,4- --output-d=: < $srcdir/out-delim5.I > out-delim5.O 2> out-delim5.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim5(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim5(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim5.O $srcdir/out-delim5.X > /dev/null 2>&1
@@ -2721,7 +2721,7 @@ test -s out-delim5.E || rm -f out-delim5.E
 $xx -c2,1-3 --output-d=: $srcdir/out-delim6.I > out-delim6.O 2> out-delim6.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim6(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim6(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim6.O $srcdir/out-delim6.X > /dev/null 2>&1
@@ -2739,7 +2739,7 @@ test -s out-delim6.E || rm -f out-delim6.E
 cat $srcdir/out-delim6.I | $xx -c2,1-3 --output-d=: > out-delim6.O 2> out-delim6.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim6(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim6(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim6.O $srcdir/out-delim6.X > /dev/null 2>&1
@@ -2757,7 +2757,7 @@ test -s out-delim6.E || rm -f out-delim6.E
 $xx -c2,1-3 --output-d=: < $srcdir/out-delim6.I > out-delim6.O 2> out-delim6.E
 code=$?
 if test $code != 0; then
-  $echo "Test out-delim6(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test out-delim6(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp out-delim6.O $srcdir/out-delim6.X > /dev/null 2>&1