10 files changed, 1151 insertions, 1151 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
diff --git a/tests/date/date-tests b/tests/date/date-tests
index 2f8cfc041..2c0878ed1 100755
--- a/tests/date/date-tests
+++ b/tests/date/date-tests
@@ -21,7 +21,7 @@ export LANG
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0' +'%% %a %A %b %B'  > 1.O 2> 1.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test 1(LANG=C TZ=UTC0) 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
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0' +'%d_%D_%e_%h_%H'  > 3.O 2> 3.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test 3(LANG=C TZ=UTC0) 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
@@ -57,7 +57,7 @@ test -s 3.E || rm -f 3.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0' +'%I_%j_%k_%l_%m'  > 4.O 2> 4.E
 code=$?
 if test $code != 0; then
-  $echo "Test 4(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test 4(LANG=C TZ=UTC0) 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
@@ -75,7 +75,7 @@ test -s 4.E || rm -f 4.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0' +'%M_%n_%p_%r'  > 5.O 2> 5.E
 code=$?
 if test $code != 0; then
-  $echo "Test 5(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test 5(LANG=C TZ=UTC0) 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
@@ -93,7 +93,7 @@ test -s 5.E || rm -f 5.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0' +'%s_%S_%t_%T'  > 6.O 2> 6.E
 code=$?
 if test $code != 0; then
-  $echo "Test 6(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test 6(LANG=C TZ=UTC0) 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
@@ -111,7 +111,7 @@ test -s 6.E || rm -f 6.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0' +'%U_%V_%w_%W'  > 7.O 2> 7.E
 code=$?
 if test $code != 0; then
-  $echo "Test 7(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test 7(LANG=C TZ=UTC0) 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
@@ -129,7 +129,7 @@ test -s 7.E || rm -f 7.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0' +'%x_%X_%y_%Y'  > 8.O 2> 8.E
 code=$?
 if test $code != 0; then
-  $echo "Test 8(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test 8(LANG=C TZ=UTC0) 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
@@ -147,7 +147,7 @@ test -s 8.E || rm -f 8.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0' +'%z'  > 9.O 2> 9.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test 9(LANG=C TZ=UTC0) 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
@@ -165,7 +165,7 @@ test -s 9.E || rm -f 9.E
 LANG=C TZ=UTC0 $xx --date '02/29/1996 1 year' +%Y-%m-%d  > leap-1.O 2> leap-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test leap-1(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test leap-1(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp leap-1.O $srcdir/leap-1.X > /dev/null 2>&1
@@ -183,7 +183,7 @@ test -s leap-1.E || rm -f leap-1.E
 LANG=C TZ=UTC0 $xx --date '1995-1-1' +%U  > U95-1.O 2> U95-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test U95-1(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test U95-1(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp U95-1.O $srcdir/U95-1.X > /dev/null 2>&1
@@ -201,7 +201,7 @@ test -s U95-1.E || rm -f U95-1.E
 LANG=C TZ=UTC0 $xx --date '1995-1-7' +%U  > U95-2.O 2> U95-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test U95-2(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test U95-2(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp U95-2.O $srcdir/U95-2.X > /dev/null 2>&1
@@ -219,7 +219,7 @@ test -s U95-2.E || rm -f U95-2.E
 LANG=C TZ=UTC0 $xx --date '1995-1-8' +%U  > U95-3.O 2> U95-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test U95-3(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test U95-3(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp U95-3.O $srcdir/U95-3.X > /dev/null 2>&1
@@ -237,7 +237,7 @@ test -s U95-3.E || rm -f U95-3.E
 LANG=C TZ=UTC0 $xx --date '1992-1-1' +%U  > U92-1.O 2> U92-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test U92-1(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test U92-1(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp U92-1.O $srcdir/U92-1.X > /dev/null 2>&1
@@ -255,7 +255,7 @@ test -s U92-1.E || rm -f U92-1.E
 LANG=C TZ=UTC0 $xx --date '1992-1-4' +%U  > U92-2.O 2> U92-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test U92-2(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test U92-2(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp U92-2.O $srcdir/U92-2.X > /dev/null 2>&1
@@ -273,7 +273,7 @@ test -s U92-2.E || rm -f U92-2.E
 LANG=C TZ=UTC0 $xx --date '1992-1-5' +%U  > U92-3.O 2> U92-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test U92-3(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test U92-3(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp U92-3.O $srcdir/U92-3.X > /dev/null 2>&1
@@ -291,7 +291,7 @@ test -s U92-3.E || rm -f U92-3.E
 LANG=C TZ=UTC0 $xx --date '1992-1-1' +%V  > V92-1.O 2> V92-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test V92-1(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test V92-1(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp V92-1.O $srcdir/V92-1.X > /dev/null 2>&1
@@ -309,7 +309,7 @@ test -s V92-1.E || rm -f V92-1.E
 LANG=C TZ=UTC0 $xx --date '1992-1-5' +%V  > V92-2.O 2> V92-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test V92-2(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test V92-2(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp V92-2.O $srcdir/V92-2.X > /dev/null 2>&1
@@ -327,7 +327,7 @@ test -s V92-2.E || rm -f V92-2.E
 LANG=C TZ=UTC0 $xx --date '1992-1-6' +%V  > V92-3.O 2> V92-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test V92-3(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test V92-3(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp V92-3.O $srcdir/V92-3.X > /dev/null 2>&1
@@ -345,7 +345,7 @@ test -s V92-3.E || rm -f V92-3.E
 LANG=C TZ=UTC0 $xx --date '1992-1-1' +%W  > W92-1.O 2> W92-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test W92-1(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test W92-1(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp W92-1.O $srcdir/W92-1.X > /dev/null 2>&1
@@ -363,7 +363,7 @@ test -s W92-1.E || rm -f W92-1.E
 LANG=C TZ=UTC0 $xx --date '1992-1-5' +%W  > W92-2.O 2> W92-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test W92-2(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test W92-2(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp W92-2.O $srcdir/W92-2.X > /dev/null 2>&1
@@ -381,7 +381,7 @@ test -s W92-2.E || rm -f W92-2.E
 LANG=C TZ=UTC0 $xx --date '1992-1-6' +%W  > W92-3.O 2> W92-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test W92-3(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test W92-3(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp W92-3.O $srcdir/W92-3.X > /dev/null 2>&1
@@ -399,7 +399,7 @@ test -s W92-3.E || rm -f W92-3.E
 LANG=C TZ=UTC0 $xx --date '1998-1-1 3 years' +%Y  > millen-1.O 2> millen-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test millen-1(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test millen-1(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp millen-1.O $srcdir/millen-1.X > /dev/null 2>&1
@@ -417,7 +417,7 @@ test -s millen-1.E || rm -f millen-1.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0 now' '+%Y-%m-%d %T'  > rel-0.O 2> rel-0.E
 code=$?
 if test $code != 0; then
-  $echo "Test rel-0(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test rel-0(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rel-0.O $srcdir/rel-0.X > /dev/null 2>&1
@@ -435,7 +435,7 @@ test -s rel-0.E || rm -f rel-0.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0 yesterday' '+%Y-%m-%d %T'  > rel-1a.O 2> rel-1a.E
 code=$?
 if test $code != 0; then
-  $echo "Test rel-1a(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test rel-1a(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rel-1a.O $srcdir/rel-1a.X > /dev/null 2>&1
@@ -453,7 +453,7 @@ test -s rel-1a.E || rm -f rel-1a.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0 tomorrow' '+%Y-%m-%d %T'  > rel-1b.O 2> rel-1b.E
 code=$?
 if test $code != 0; then
-  $echo "Test rel-1b(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test rel-1b(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rel-1b.O $srcdir/rel-1b.X > /dev/null 2>&1
@@ -471,7 +471,7 @@ test -s rel-1b.E || rm -f rel-1b.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0 6 years ago' '+%Y-%m-%d %T'  > rel-2a.O 2> rel-2a.E
 code=$?
 if test $code != 0; then
-  $echo "Test rel-2a(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test rel-2a(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rel-2a.O $srcdir/rel-2a.X > /dev/null 2>&1
@@ -489,7 +489,7 @@ test -s rel-2a.E || rm -f rel-2a.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0 7 months ago' '+%Y-%m-%d %T'  > rel-2b.O 2> rel-2b.E
 code=$?
 if test $code != 0; then
-  $echo "Test rel-2b(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test rel-2b(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rel-2b.O $srcdir/rel-2b.X > /dev/null 2>&1
@@ -507,7 +507,7 @@ test -s rel-2b.E || rm -f rel-2b.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0 8 weeks ago' '+%Y-%m-%d %T'  > rel-2c.O 2> rel-2c.E
 code=$?
 if test $code != 0; then
-  $echo "Test rel-2c(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test rel-2c(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rel-2c.O $srcdir/rel-2c.X > /dev/null 2>&1
@@ -525,7 +525,7 @@ test -s rel-2c.E || rm -f rel-2c.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0 1 day ago' '+%Y-%m-%d %T'  > rel-2d.O 2> rel-2d.E
 code=$?
 if test $code != 0; then
-  $echo "Test rel-2d(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test rel-2d(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rel-2d.O $srcdir/rel-2d.X > /dev/null 2>&1
@@ -543,7 +543,7 @@ test -s rel-2d.E || rm -f rel-2d.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0 2 hours ago' '+%Y-%m-%d %T'  > rel-2e.O 2> rel-2e.E
 code=$?
 if test $code != 0; then
-  $echo "Test rel-2e(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test rel-2e(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rel-2e.O $srcdir/rel-2e.X > /dev/null 2>&1
@@ -561,7 +561,7 @@ test -s rel-2e.E || rm -f rel-2e.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0 3 minutes ago' '+%Y-%m-%d %T'  > rel-2f.O 2> rel-2f.E
 code=$?
 if test $code != 0; then
-  $echo "Test rel-2f(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test rel-2f(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rel-2f.O $srcdir/rel-2f.X > /dev/null 2>&1
@@ -579,7 +579,7 @@ test -s rel-2f.E || rm -f rel-2f.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0 4 seconds ago' '+%Y-%m-%d %T'  > rel-2g.O 2> rel-2g.E
 code=$?
 if test $code != 0; then
-  $echo "Test rel-2g(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test rel-2g(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rel-2g.O $srcdir/rel-2g.X > /dev/null 2>&1
@@ -597,7 +597,7 @@ test -s rel-2g.E || rm -f rel-2g.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0 4 seconds ago' '+%Y-%m-%d %T'  > rel-3a.O 2> rel-3a.E
 code=$?
 if test $code != 0; then
-  $echo "Test rel-3a(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test rel-3a(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rel-3a.O $srcdir/rel-3a.X > /dev/null 2>&1
@@ -615,7 +615,7 @@ test -s rel-3a.E || rm -f rel-3a.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0 next second' '+%Y-%m-%d %T'  > next-s.O 2> next-s.E
 code=$?
 if test $code != 0; then
-  $echo "Test next-s(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test next-s(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp next-s.O $srcdir/next-s.X > /dev/null 2>&1
@@ -633,7 +633,7 @@ test -s next-s.E || rm -f next-s.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0 next minute' '+%Y-%m-%d %T'  > next-m.O 2> next-m.E
 code=$?
 if test $code != 0; then
-  $echo "Test next-m(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test next-m(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp next-m.O $srcdir/next-m.X > /dev/null 2>&1
@@ -651,7 +651,7 @@ test -s next-m.E || rm -f next-m.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0 next hour'   '+%Y-%m-%d %T'  > next-h.O 2> next-h.E
 code=$?
 if test $code != 0; then
-  $echo "Test next-h(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test next-h(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp next-h.O $srcdir/next-h.X > /dev/null 2>&1
@@ -669,7 +669,7 @@ test -s next-h.E || rm -f next-h.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0 next day'    '+%Y-%m-%d %T'  > next-d.O 2> next-d.E
 code=$?
 if test $code != 0; then
-  $echo "Test next-d(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test next-d(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp next-d.O $srcdir/next-d.X > /dev/null 2>&1
@@ -687,7 +687,7 @@ test -s next-d.E || rm -f next-d.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0 next week'   '+%Y-%m-%d %T'  > next-w.O 2> next-w.E
 code=$?
 if test $code != 0; then
-  $echo "Test next-w(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test next-w(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp next-w.O $srcdir/next-w.X > /dev/null 2>&1
@@ -705,7 +705,7 @@ test -s next-w.E || rm -f next-w.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0 next month' '+%Y-%m-%d %T'  > next-mo.O 2> next-mo.E
 code=$?
 if test $code != 0; then
-  $echo "Test next-mo(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test next-mo(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp next-mo.O $srcdir/next-mo.X > /dev/null 2>&1
@@ -723,7 +723,7 @@ test -s next-mo.E || rm -f next-mo.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 +0 next year'   '+%Y-%m-%d %T'  > next-y.O 2> next-y.E
 code=$?
 if test $code != 0; then
-  $echo "Test next-y(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test next-y(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp next-y.O $srcdir/next-y.X > /dev/null 2>&1
@@ -741,7 +741,7 @@ test -s next-y.E || rm -f next-y.E
 TZ=UTC+4 $xx -u -d '08/01/97 6:00' '+%D,%H:%M'  > utc-0.O 2> utc-0.E
 code=$?
 if test $code != 0; then
-  $echo "Test utc-0(TZ=UTC+4) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test utc-0(TZ=UTC+4) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp utc-0.O $srcdir/utc-0.X > /dev/null 2>&1
@@ -759,7 +759,7 @@ test -s utc-0.E || rm -f utc-0.E
 LANG=C TZ=UTC0 $xx -u -d '08/01/97 6:00 UTC +4 hours' '+%D,%H:%M'  > utc-0a.O 2> utc-0a.E
 code=$?
 if test $code != 0; then
-  $echo "Test utc-0a(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test utc-0a(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp utc-0a.O $srcdir/utc-0a.X > /dev/null 2>&1
@@ -777,7 +777,7 @@ test -s utc-0a.E || rm -f utc-0a.E
 TZ=UTC+1 $xx -u --file=- '+%Y-%m-%d %T' < $srcdir/utc-1.I > utc-1.O 2> utc-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test utc-1(TZ=UTC+1) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test utc-1(TZ=UTC+1) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp utc-1.O $srcdir/utc-1.X > /dev/null 2>&1
@@ -795,7 +795,7 @@ test -s utc-1.E || rm -f utc-1.E
 LANG=C TZ=UTC0 $xx -u --file=- '+%Y-%m-%d %T' < $srcdir/utc-1a.I > utc-1a.O 2> utc-1a.E
 code=$?
 if test $code != 0; then
-  $echo "Test utc-1a(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test utc-1a(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp utc-1a.O $srcdir/utc-1a.X > /dev/null 2>&1
@@ -813,7 +813,7 @@ test -s utc-1a.E || rm -f utc-1a.E
 TZ=UTC+2 $xx -d '1970-01-01 00:00:01' +%s  > date2sec-0.O 2> date2sec-0.E
 code=$?
 if test $code != 0; then
-  $echo "Test date2sec-0(TZ=UTC+2) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test date2sec-0(TZ=UTC+2) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp date2sec-0.O $srcdir/date2sec-0.X > /dev/null 2>&1
@@ -831,7 +831,7 @@ test -s date2sec-0.E || rm -f date2sec-0.E
 LANG=C TZ=UTC0 $xx -d '1970-01-01 00:00:01 UTC +2 hours' +%s  > date2sec-0a.O 2> date2sec-0a.E
 code=$?
 if test $code != 0; then
-  $echo "Test date2sec-0a(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test date2sec-0a(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp date2sec-0a.O $srcdir/date2sec-0a.X > /dev/null 2>&1
@@ -849,7 +849,7 @@ test -s date2sec-0a.E || rm -f date2sec-0a.E
 LANG=C TZ=UTC0 $xx -d 2000-01-01 +%s  > date2sec-1.O 2> date2sec-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test date2sec-1(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test date2sec-1(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp date2sec-1.O $srcdir/date2sec-1.X > /dev/null 2>&1
@@ -867,7 +867,7 @@ test -s date2sec-1.E || rm -f date2sec-1.E
 LANG=C TZ=UTC0 $xx -d '1970-01-01 UTC 946684800 sec' +'%Y-%m-%d %T %z'  > sec2date-0.O 2> sec2date-0.E
 code=$?
 if test $code != 0; then
-  $echo "Test sec2date-0(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test sec2date-0(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp sec2date-0.O $srcdir/sec2date-0.X > /dev/null 2>&1
@@ -885,7 +885,7 @@ test -s sec2date-0.E || rm -f sec2date-0.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 this minute' '+%Y-%m-%d %T'  > this-m.O 2> this-m.E
 code=$?
 if test $code != 0; then
-  $echo "Test this-m(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test this-m(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp this-m.O $srcdir/this-m.X > /dev/null 2>&1
@@ -903,7 +903,7 @@ test -s this-m.E || rm -f this-m.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 this hour' '+%Y-%m-%d %T'  > this-h.O 2> this-h.E
 code=$?
 if test $code != 0; then
-  $echo "Test this-h(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test this-h(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp this-h.O $srcdir/this-h.X > /dev/null 2>&1
@@ -921,7 +921,7 @@ test -s this-h.E || rm -f this-h.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 this week' '+%Y-%m-%d %T'  > this-w.O 2> this-w.E
 code=$?
 if test $code != 0; then
-  $echo "Test this-w(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test this-w(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp this-w.O $srcdir/this-w.X > /dev/null 2>&1
@@ -939,7 +939,7 @@ test -s this-w.E || rm -f this-w.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 this month' '+%Y-%m-%d %T'  > this-mo.O 2> this-mo.E
 code=$?
 if test $code != 0; then
-  $echo "Test this-mo(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test this-mo(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp this-mo.O $srcdir/this-mo.X > /dev/null 2>&1
@@ -957,7 +957,7 @@ test -s this-mo.E || rm -f this-mo.E
 LANG=C TZ=UTC0 $xx -d '1997-01-19 08:17:48 this year' '+%Y-%m-%d %T'  > this-y.O 2> this-y.E
 code=$?
 if test $code != 0; then
-  $echo "Test this-y(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test this-y(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp this-y.O $srcdir/this-y.X > /dev/null 2>&1
@@ -975,7 +975,7 @@ test -s this-y.E || rm -f this-y.E
 LANG=C TZ=UTC0 $xx -d 'Nov 10 1996' '+%Y-%m-%d %T'  > risks-1.O 2> risks-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test risks-1(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test risks-1(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp risks-1.O $srcdir/risks-1.X > /dev/null 2>&1
@@ -993,7 +993,7 @@ test -s risks-1.E || rm -f risks-1.E
 LANG=C $xx -u -d '1996-11-10 0:00:00 +0' '+%Y-%m-%d %T'  > regress-1.O 2> regress-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test regress-1(LANG=C) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test regress-1(LANG=C) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp regress-1.O $srcdir/regress-1.X > /dev/null 2>&1
@@ -1011,7 +1011,7 @@ test -s regress-1.E || rm -f regress-1.E
 LANG=C TZ=UTC0 $xx -d 000909 '+%Y-%m-%d %T'  > datevtime-1.O 2> datevtime-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test datevtime-1(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test datevtime-1(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp datevtime-1.O $srcdir/datevtime-1.X > /dev/null 2>&1
@@ -1029,7 +1029,7 @@ test -s datevtime-1.E || rm -f datevtime-1.E
 LC_ALL=de_DE TZ=UTC0 $xx -R -d '1997-01-19 08:17:48 +0'  > rfc822-1.O 2> rfc822-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test rfc822-1(LC_ALL=de_DE TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test rfc822-1(LC_ALL=de_DE TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rfc822-1.O $srcdir/rfc822-1.X > /dev/null 2>&1
@@ -1047,7 +1047,7 @@ test -s rfc822-1.E || rm -f rfc822-1.E
 LANG=C TZ=UTC0 $xx --utc -d '1970-01-01 00:00:00 UTC +961062237 sec' '+%Y-%m-%d %T'  > relative-1.O 2> relative-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test relative-1(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test relative-1(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp relative-1.O $srcdir/relative-1.X > /dev/null 2>&1
@@ -1065,7 +1065,7 @@ test -s relative-1.E || rm -f relative-1.E
 TZ=UTC+1 $xx --utc -d '1970-01-01 UTC +961062237 sec' '+%Y-%m-%d %T'  > relative-2.O 2> relative-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test relative-2(TZ=UTC+1) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test relative-2(TZ=UTC+1) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp relative-2.O $srcdir/relative-2.X > /dev/null 2>&1
@@ -1083,7 +1083,7 @@ test -s relative-2.E || rm -f relative-2.E
 LANG=C TZ=UTC0 $xx -d '1999-06-01' +%3004Y  > wide-fmt.O 2> wide-fmt.E
 code=$?
 if test $code != 0; then
-  $echo "Test wide-fmt(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test wide-fmt(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp wide-fmt.O $srcdir/wide-fmt.X > /dev/null 2>&1
@@ -1101,7 +1101,7 @@ test -s wide-fmt.E || rm -f wide-fmt.E
 LANG=C TZ=UTC0 $xx --iso -d May-23-2003  > moname-d-y.O 2> moname-d-y.E
 code=$?
 if test $code != 0; then
-  $echo "Test moname-d-y(LANG=C TZ=UTC0) failed: ../../src/date return code $code differs from expected value 0" 1>&2
+  $echo "Test moname-d-y(LANG=C TZ=UTC0) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp moname-d-y.O $srcdir/moname-d-y.X > /dev/null 2>&1
diff --git a/tests/join/join-tests b/tests/join/join-tests
index e79c23ea7..aa1a277b8 100755
--- a/tests/join/join-tests
+++ b/tests/join/join-tests
@@ -21,7 +21,7 @@ export LANG
 $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
+  $echo "Test 1a failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1a.O $srcdir/1a.X > /dev/null 2>&1
@@ -39,7 +39,7 @@ test -s 1a.E || rm -f 1a.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
+  $echo "Test 1b failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1b.O $srcdir/1b.X > /dev/null 2>&1
@@ -57,7 +57,7 @@ test -s 1b.E || rm -f 1b.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
+  $echo "Test 1c failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1c.O $srcdir/1c.X > /dev/null 2>&1
@@ -75,7 +75,7 @@ test -s 1c.E || rm -f 1c.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
+  $echo "Test 1d failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1d.O $srcdir/1d.X > /dev/null 2>&1
@@ -93,7 +93,7 @@ test -s 1d.E || rm -f 1d.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
+  $echo "Test 1e failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1e.O $srcdir/1e.X > /dev/null 2>&1
@@ -111,7 +111,7 @@ test -s 1e.E || rm -f 1e.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
+  $echo "Test 1f failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1f.O $srcdir/1f.X > /dev/null 2>&1
@@ -129,7 +129,7 @@ test -s 1f.E || rm -f 1f.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
+  $echo "Test 2a failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 2a.O $srcdir/2a.X > /dev/null 2>&1
@@ -147,7 +147,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 2b failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test 2b failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 2b.O $srcdir/2b.X > /dev/null 2>&1
@@ -165,7 +165,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 2c failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test 2c failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 2c.O $srcdir/2c.X > /dev/null 2>&1
@@ -183,7 +183,7 @@ test -s 2c.E || rm -f 2c.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
+  $echo "Test 3a failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3a.O $srcdir/3a.X > /dev/null 2>&1
@@ -201,7 +201,7 @@ test -s 3a.E || rm -f 3a.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
+  $echo "Test 4a failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4a.O $srcdir/4a.X > /dev/null 2>&1
@@ -219,7 +219,7 @@ test -s 4a.E || rm -f 4a.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
+  $echo "Test 4b failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4b.O $srcdir/4b.X > /dev/null 2>&1
@@ -237,7 +237,7 @@ test -s 4b.E || rm -f 4b.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
+  $echo "Test 4c failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4c.O $srcdir/4c.X > /dev/null 2>&1
@@ -255,7 +255,7 @@ test -s 4c.E || rm -f 4c.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
+  $echo "Test 4d failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4d.O $srcdir/4d.X > /dev/null 2>&1
@@ -273,7 +273,7 @@ test -s 4d.E || rm -f 4d.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
+  $echo "Test 4e failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4e.O $srcdir/4e.X > /dev/null 2>&1
@@ -291,7 +291,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 5a failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test 5a failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5a.O $srcdir/5a.X > /dev/null 2>&1
@@ -309,7 +309,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 5b failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test 5b failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5b.O $srcdir/5b.X > /dev/null 2>&1
@@ -327,7 +327,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 5c failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test 5c failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5c.O $srcdir/5c.X > /dev/null 2>&1
@@ -345,7 +345,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 5d failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test 5d failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5d.O $srcdir/5d.X > /dev/null 2>&1
@@ -363,7 +363,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 5e failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test 5e failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5e.O $srcdir/5e.X > /dev/null 2>&1
@@ -381,7 +381,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 5f failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test 5f failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5f.O $srcdir/5f.X > /dev/null 2>&1
@@ -399,7 +399,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 5g failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test 5g failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5g.O $srcdir/5g.X > /dev/null 2>&1
@@ -417,7 +417,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 5h failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test 5h failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5h.O $srcdir/5h.X > /dev/null 2>&1
@@ -435,7 +435,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 5i failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test 5i failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5i.O $srcdir/5i.X > /dev/null 2>&1
@@ -453,7 +453,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 5j failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test 5j failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5j.O $srcdir/5j.X > /dev/null 2>&1
@@ -471,7 +471,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 5k failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test 5k failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5k.O $srcdir/5k.X > /dev/null 2>&1
@@ -489,7 +489,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 5l failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test 5l failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5l.O $srcdir/5l.X > /dev/null 2>&1
@@ -507,7 +507,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 5m failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test 5m failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5m.O $srcdir/5m.X > /dev/null 2>&1
@@ -525,7 +525,7 @@ test -s 5m.E || rm -f 5m.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
+  $echo "Test 6a failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6a.O $srcdir/6a.X > /dev/null 2>&1
@@ -543,7 +543,7 @@ test -s 6a.E || rm -f 6a.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
+  $echo "Test 6b failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6b.O $srcdir/6b.X > /dev/null 2>&1
@@ -561,7 +561,7 @@ test -s 6b.E || rm -f 6b.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
+  $echo "Test 6c failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6c.O $srcdir/6c.X > /dev/null 2>&1
@@ -579,7 +579,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 7a failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test 7a failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 7a.O $srcdir/7a.X > /dev/null 2>&1
@@ -597,7 +597,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 8a failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test 8a failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 8a.O $srcdir/8a.X > /dev/null 2>&1
@@ -615,7 +615,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 8b failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test 8b failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 8b.O $srcdir/8b.X > /dev/null 2>&1
@@ -633,7 +633,7 @@ test -s 8b.E || rm -f 8b.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
+  $echo "Test 9a failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9a.O $srcdir/9a.X > /dev/null 2>&1
@@ -651,7 +651,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test trailing-sp failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test trailing-sp failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp trailing-sp.O $srcdir/trailing-sp.X > /dev/null 2>&1
@@ -669,7 +669,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test sp-vs-blank failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test sp-vs-blank failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp sp-vs-blank.O $srcdir/sp-vs-blank.X > /dev/null 2>&1
@@ -687,7 +687,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test 8-bit-t failed: ../../src/join return code $code differs from expected value 0" 1>&2
+  $echo "Test 8-bit-t failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 8-bit-t.O $srcdir/8-bit-t.X > /dev/null 2>&1
diff --git a/tests/pr/pr-tests b/tests/pr/pr-tests
index 329abd397..cf05d2423 100755
--- a/tests/pr/pr-tests
+++ b/tests/pr/pr-tests
@@ -21,7 +21,7 @@ export LANG
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x $srcdir/0Ft > 1a.O 2> 1a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1a(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 1a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1a.O $srcdir/0F > /dev/null 2>&1
@@ -39,7 +39,7 @@ test -s 1a.E || rm -f 1a.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x $srcdir/0Fnt > 1b.O 2> 1b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1b(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 1b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1b.O $srcdir/0F > /dev/null 2>&1
@@ -57,7 +57,7 @@ test -s 1b.E || rm -f 1b.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 $srcdir/0Ft > 1c.O 2> 1c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1c(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 1c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1c.O $srcdir/3-0F > /dev/null 2>&1
@@ -75,7 +75,7 @@ test -s 1c.E || rm -f 1c.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -f $srcdir/0Ft > 1d.O 2> 1d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1d(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 1d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1d.O $srcdir/3f-0F > /dev/null 2>&1
@@ -93,7 +93,7 @@ test -s 1d.E || rm -f 1d.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -3 $srcdir/0Ft > 1e.O 2> 1e.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1e(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 1e(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1e.O $srcdir/a3-0F > /dev/null 2>&1
@@ -111,7 +111,7 @@ test -s 1e.E || rm -f 1e.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -3 -f $srcdir/0Ft > 1f.O 2> 1f.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1f(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 1f(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1f.O $srcdir/a3f-0F > /dev/null 2>&1
@@ -129,7 +129,7 @@ test -s 1f.E || rm -f 1f.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -3 -f $srcdir/0Fnt > 1g.O 2> 1g.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1g(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 1g(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1g.O $srcdir/a3f-0F > /dev/null 2>&1
@@ -147,7 +147,7 @@ test -s 1g.E || rm -f 1g.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -a -3 -f $srcdir/0Ft > 1h.O 2> 1h.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1h(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 1h(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1h.O $srcdir/3a3f-0F > /dev/null 2>&1
@@ -165,7 +165,7 @@ test -s 1h.E || rm -f 1h.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -3 $srcdir/0Ft > 1i.O 2> 1i.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1i(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 1i(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1i.O $srcdir/b3-0F > /dev/null 2>&1
@@ -183,7 +183,7 @@ test -s 1i.E || rm -f 1i.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -3 -f $srcdir/0Ft > 1j.O 2> 1j.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1j(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 1j(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1j.O $srcdir/b3f-0F > /dev/null 2>&1
@@ -201,7 +201,7 @@ test -s 1j.E || rm -f 1j.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -3 -f $srcdir/0Fnt > 1k.O 2> 1k.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1k(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 1k(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1k.O $srcdir/b3f-0F > /dev/null 2>&1
@@ -219,7 +219,7 @@ test -s 1k.E || rm -f 1k.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -b -3 -f $srcdir/0Ft > 1l.O 2> 1l.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1l(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 1l(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1l.O $srcdir/3b3f-0F > /dev/null 2>&1
@@ -237,7 +237,7 @@ test -s 1l.E || rm -f 1l.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x $srcdir/0FFt > 2a.O 2> 2a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 2a(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 2a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 2a.O $srcdir/0FF > /dev/null 2>&1
@@ -255,7 +255,7 @@ test -s 2a.E || rm -f 2a.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x $srcdir/0FnFnt > 2b.O 2> 2b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 2b(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 2b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 2b.O $srcdir/0FF > /dev/null 2>&1
@@ -273,7 +273,7 @@ test -s 2b.E || rm -f 2b.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -3 -f $srcdir/0FFt > 2c.O 2> 2c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 2c(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 2c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 2c.O $srcdir/a3f-0FF > /dev/null 2>&1
@@ -291,7 +291,7 @@ test -s 2c.E || rm -f 2c.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -3 -f $srcdir/0FFnt > 2d.O 2> 2d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 2d(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 2d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 2d.O $srcdir/a3f-0FF > /dev/null 2>&1
@@ -309,7 +309,7 @@ test -s 2d.E || rm -f 2d.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -3 -f $srcdir/0FFt > 2e.O 2> 2e.E
 code=$?
 if test $code != 0; then
-  $echo "Test 2e(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 2e(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 2e.O $srcdir/b3f-0FF > /dev/null 2>&1
@@ -327,7 +327,7 @@ test -s 2e.E || rm -f 2e.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -3 -f $srcdir/0FFnt > 2f.O 2> 2f.E
 code=$?
 if test $code != 0; then
-  $echo "Test 2f(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 2f(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 2f.O $srcdir/b3f-0FF > /dev/null 2>&1
@@ -345,7 +345,7 @@ test -s 2f.E || rm -f 2f.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -3 -f $srcdir/0FnFt > 2g.O 2> 2g.E
 code=$?
 if test $code != 0; then
-  $echo "Test 2g(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 2g(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 2g.O $srcdir/b3f-0FF > /dev/null 2>&1
@@ -363,7 +363,7 @@ test -s 2g.E || rm -f 2g.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -3 -f $srcdir/0FnFnt > 2h.O 2> 2h.E
 code=$?
 if test $code != 0; then
-  $echo "Test 2h(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 2h(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 2h.O $srcdir/b3f-0FF > /dev/null 2>&1
@@ -381,7 +381,7 @@ test -s 2h.E || rm -f 2h.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -b -3 -f $srcdir/0FFt > 2i.O 2> 2i.E
 code=$?
 if test $code != 0; then
-  $echo "Test 2i(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 2i(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 2i.O $srcdir/3b3f-0FF > /dev/null 2>&1
@@ -399,7 +399,7 @@ test -s 2i.E || rm -f 2i.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -b -3 -f $srcdir/0FFnt > 2j.O 2> 2j.E
 code=$?
 if test $code != 0; then
-  $echo "Test 2j(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 2j(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 2j.O $srcdir/3b3f-0FF > /dev/null 2>&1
@@ -417,7 +417,7 @@ test -s 2j.E || rm -f 2j.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x $srcdir/FFn > 3a.O 2> 3a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3a(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3a.O $srcdir/FF > /dev/null 2>&1
@@ -435,7 +435,7 @@ test -s 3a.E || rm -f 3a.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x $srcdir/FnFn > 3b.O 2> 3b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3b(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3b.O $srcdir/FF > /dev/null 2>&1
@@ -453,7 +453,7 @@ test -s 3b.E || rm -f 3b.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 $srcdir/FFn > 3c.O 2> 3c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3c(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3c.O $srcdir/3-FF > /dev/null 2>&1
@@ -471,7 +471,7 @@ test -s 3c.E || rm -f 3c.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -f $srcdir/FFn > 3d.O 2> 3d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3d(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3d.O $srcdir/3f-FF > /dev/null 2>&1
@@ -489,7 +489,7 @@ test -s 3d.E || rm -f 3d.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -3 -f $srcdir/FFn > 3e.O 2> 3e.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3e(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3e(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3e.O $srcdir/a3f-FF > /dev/null 2>&1
@@ -507,7 +507,7 @@ test -s 3e.E || rm -f 3e.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -3 -f $srcdir/FFtn > 3f.O 2> 3f.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3f(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3f(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3f.O $srcdir/a3f-FF > /dev/null 2>&1
@@ -525,7 +525,7 @@ test -s 3f.E || rm -f 3f.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -3 -f $srcdir/FFn > 3g.O 2> 3g.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3g(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3g(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3g.O $srcdir/b3f-FF > /dev/null 2>&1
@@ -543,7 +543,7 @@ test -s 3g.E || rm -f 3g.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -3 -f $srcdir/FFtn > 3h.O 2> 3h.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3h(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3h(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3h.O $srcdir/b3f-FF > /dev/null 2>&1
@@ -561,7 +561,7 @@ test -s 3h.E || rm -f 3h.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -3 -f $srcdir/FnFn > 3i.O 2> 3i.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3i(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3i(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3i.O $srcdir/b3f-FF > /dev/null 2>&1
@@ -579,7 +579,7 @@ test -s 3i.E || rm -f 3i.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -3 -f $srcdir/tFFn > 3j.O 2> 3j.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3j(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3j(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3j.O $srcdir/b3f-FF > /dev/null 2>&1
@@ -597,7 +597,7 @@ test -s 3j.E || rm -f 3j.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -3 -f $srcdir/tFnFt > 3k.O 2> 3k.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3k(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3k(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3k.O $srcdir/b3f-FF > /dev/null 2>&1
@@ -615,7 +615,7 @@ test -s 3k.E || rm -f 3k.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -b -3 -f $srcdir/FFn > 3l.O 2> 3l.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3l(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3l(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3l.O $srcdir/3b3f-FF > /dev/null 2>&1
@@ -633,7 +633,7 @@ test -s 3l.E || rm -f 3l.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -b -3 -f $srcdir/FFtn > 3m.O 2> 3m.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3m(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3m(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3m.O $srcdir/3b3f-FF > /dev/null 2>&1
@@ -651,7 +651,7 @@ test -s 3m.E || rm -f 3m.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -l 24 $srcdir/FFn > 3la.O 2> 3la.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3la(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3la(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3la.O $srcdir/l24-FF > /dev/null 2>&1
@@ -669,7 +669,7 @@ test -s 3la.E || rm -f 3la.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -l 24 $srcdir/FFtn > 3lb.O 2> 3lb.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3lb(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3lb(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3lb.O $srcdir/l24-FF > /dev/null 2>&1
@@ -687,7 +687,7 @@ test -s 3lb.E || rm -f 3lb.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -l 24 $srcdir/FnFn > 3lc.O 2> 3lc.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3lc(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3lc(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3lc.O $srcdir/l24-FF > /dev/null 2>&1
@@ -705,7 +705,7 @@ test -s 3lc.E || rm -f 3lc.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -l 24 $srcdir/tFFn > 3ld.O 2> 3ld.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3ld(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3ld(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3ld.O $srcdir/l24-FF > /dev/null 2>&1
@@ -723,7 +723,7 @@ test -s 3ld.E || rm -f 3ld.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -l 24 $srcdir/tFnFt > 3le.O 2> 3le.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3le(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3le(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3le.O $srcdir/l24-FF > /dev/null 2>&1
@@ -741,7 +741,7 @@ test -s 3le.E || rm -f 3le.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -l 24 $srcdir/tFFt > 3lf.O 2> 3lf.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3lf(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3lf(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3lf.O $srcdir/l24-FF > /dev/null 2>&1
@@ -759,7 +759,7 @@ test -s 3lf.E || rm -f 3lf.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -2 -l 17 $srcdir/FFn > 3aa.O 2> 3aa.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3aa(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3aa(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3aa.O $srcdir/a2l17-FF > /dev/null 2>&1
@@ -777,7 +777,7 @@ test -s 3aa.E || rm -f 3aa.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -2 -l 17 $srcdir/FFtn > 3ab.O 2> 3ab.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3ab(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3ab(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3ab.O $srcdir/a2l17-FF > /dev/null 2>&1
@@ -795,7 +795,7 @@ test -s 3ab.E || rm -f 3ab.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -2 -l 17 $srcdir/FnFn > 3ac.O 2> 3ac.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3ac(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3ac(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3ac.O $srcdir/a2l17-FF > /dev/null 2>&1
@@ -813,7 +813,7 @@ test -s 3ac.E || rm -f 3ac.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -2 -l 17 $srcdir/tFFn > 3ad.O 2> 3ad.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3ad(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3ad(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3ad.O $srcdir/a2l17-FF > /dev/null 2>&1
@@ -831,7 +831,7 @@ test -s 3ad.E || rm -f 3ad.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -2 -l 17 $srcdir/tFnFt > 3ae.O 2> 3ae.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3ae(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3ae(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3ae.O $srcdir/a2l17-FF > /dev/null 2>&1
@@ -849,7 +849,7 @@ test -s 3ae.E || rm -f 3ae.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -2 -l 17 $srcdir/tFFt > 3af.O 2> 3af.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3af(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3af(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3af.O $srcdir/a2l17-FF > /dev/null 2>&1
@@ -867,7 +867,7 @@ test -s 3af.E || rm -f 3af.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -2 -l 15 $srcdir/FFn > 3ag.O 2> 3ag.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3ag(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3ag(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3ag.O $srcdir/a2l15-FF > /dev/null 2>&1
@@ -885,7 +885,7 @@ test -s 3ag.E || rm -f 3ag.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -2 -l 15 $srcdir/FFtn > 3ah.O 2> 3ah.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3ah(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3ah(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3ah.O $srcdir/a2l15-FF > /dev/null 2>&1
@@ -903,7 +903,7 @@ test -s 3ah.E || rm -f 3ah.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -2 -l 15 $srcdir/FnFn > 3ai.O 2> 3ai.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3ai(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3ai(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3ai.O $srcdir/a2l15-FF > /dev/null 2>&1
@@ -921,7 +921,7 @@ test -s 3ai.E || rm -f 3ai.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -2 -l 15 $srcdir/tFFn > 3aj.O 2> 3aj.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3aj(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3aj(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3aj.O $srcdir/a2l15-FF > /dev/null 2>&1
@@ -939,7 +939,7 @@ test -s 3aj.E || rm -f 3aj.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -2 -l 15 $srcdir/tFnFt > 3ak.O 2> 3ak.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3ak(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3ak(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3ak.O $srcdir/a2l15-FF > /dev/null 2>&1
@@ -957,7 +957,7 @@ test -s 3ak.E || rm -f 3ak.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -2 -l 17 $srcdir/FFn > 3ba.O 2> 3ba.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3ba(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3ba(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3ba.O $srcdir/b2l17-FF > /dev/null 2>&1
@@ -975,7 +975,7 @@ test -s 3ba.E || rm -f 3ba.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -2 -l 17 $srcdir/FFtn > 3bb.O 2> 3bb.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3bb(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3bb(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3bb.O $srcdir/b2l17-FF > /dev/null 2>&1
@@ -993,7 +993,7 @@ test -s 3bb.E || rm -f 3bb.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -2 -l 17 $srcdir/FnFn > 3bc.O 2> 3bc.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3bc(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3bc(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3bc.O $srcdir/b2l17-FF > /dev/null 2>&1
@@ -1011,7 +1011,7 @@ test -s 3bc.E || rm -f 3bc.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -2 -l 17 $srcdir/tFFn > 3bd.O 2> 3bd.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3bd(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3bd(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3bd.O $srcdir/b2l17-FF > /dev/null 2>&1
@@ -1029,7 +1029,7 @@ test -s 3bd.E || rm -f 3bd.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -2 -l 17 $srcdir/tFnFt > 3be.O 2> 3be.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3be(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3be(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3be.O $srcdir/b2l17-FF > /dev/null 2>&1
@@ -1047,7 +1047,7 @@ test -s 3be.E || rm -f 3be.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -2 -l 17 $srcdir/tFFt > 3bf.O 2> 3bf.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3bf(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3bf(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3bf.O $srcdir/b2l17-FF > /dev/null 2>&1
@@ -1065,7 +1065,7 @@ test -s 3bf.E || rm -f 3bf.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -2 -l 15 $srcdir/FFn > 3bg.O 2> 3bg.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3bg(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3bg(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3bg.O $srcdir/b2l15-FF > /dev/null 2>&1
@@ -1083,7 +1083,7 @@ test -s 3bg.E || rm -f 3bg.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -2 -l 15 $srcdir/FFtn > 3bh.O 2> 3bh.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3bh(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3bh(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3bh.O $srcdir/b2l15-FF > /dev/null 2>&1
@@ -1101,7 +1101,7 @@ test -s 3bh.E || rm -f 3bh.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -2 -l 15 $srcdir/FnFn > 3bi.O 2> 3bi.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3bi(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3bi(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3bi.O $srcdir/b2l15-FF > /dev/null 2>&1
@@ -1119,7 +1119,7 @@ test -s 3bi.E || rm -f 3bi.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -2 -l 15 $srcdir/tFFn > 3bj.O 2> 3bj.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3bj(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3bj(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3bj.O $srcdir/b2l15-FF > /dev/null 2>&1
@@ -1137,7 +1137,7 @@ test -s 3bj.E || rm -f 3bj.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -2 -l 15 $srcdir/tFnFt > 3bk.O 2> 3bk.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3bk(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3bk(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3bk.O $srcdir/b2l15-FF > /dev/null 2>&1
@@ -1155,7 +1155,7 @@ test -s 3bk.E || rm -f 3bk.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +4 -l 24 $srcdir/FFn > 3Pa.O 2> 3Pa.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3Pa(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3Pa(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3Pa.O $srcdir/4l24-FF > /dev/null 2>&1
@@ -1173,7 +1173,7 @@ test -s 3Pa.E || rm -f 3Pa.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +4 -l 24 $srcdir/FFtn > 3Pb.O 2> 3Pb.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3Pb(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3Pb(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3Pb.O $srcdir/4l24-FF > /dev/null 2>&1
@@ -1191,7 +1191,7 @@ test -s 3Pb.E || rm -f 3Pb.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +4 -l 24 $srcdir/FnFn > 3Pc.O 2> 3Pc.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3Pc(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3Pc(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3Pc.O $srcdir/4l24-FF > /dev/null 2>&1
@@ -1209,7 +1209,7 @@ test -s 3Pc.E || rm -f 3Pc.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +4 -l 24 $srcdir/tFFn > 3Pd.O 2> 3Pd.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3Pd(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3Pd(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3Pd.O $srcdir/4l24-FF > /dev/null 2>&1
@@ -1227,7 +1227,7 @@ test -s 3Pd.E || rm -f 3Pd.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +4 -l 24 $srcdir/tFnFt > 3Pe.O 2> 3Pe.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3Pe(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3Pe(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3Pe.O $srcdir/4l24-FF > /dev/null 2>&1
@@ -1245,7 +1245,7 @@ test -s 3Pe.E || rm -f 3Pe.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +4 -l 24 $srcdir/tFFt > 3Pf.O 2> 3Pf.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3Pf(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3Pf(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3Pf.O $srcdir/4l24-FF > /dev/null 2>&1
@@ -1263,7 +1263,7 @@ test -s 3Pf.E || rm -f 3Pf.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +4:7 -l 24 $srcdir/tFFt > 3Pg.O 2> 3Pg.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3Pg(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3Pg(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3Pg.O $srcdir/4-7l24-FF > /dev/null 2>&1
@@ -1281,7 +1281,7 @@ test -s 3Pg.E || rm -f 3Pg.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -a -2 -l 17 $srcdir/FFn > 3Paa.O 2> 3Paa.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3Paa(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3Paa(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3Paa.O $srcdir/3a2l17-FF > /dev/null 2>&1
@@ -1299,7 +1299,7 @@ test -s 3Paa.E || rm -f 3Paa.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -a -2 -l 17 $srcdir/FFtn > 3Pab.O 2> 3Pab.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3Pab(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3Pab(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3Pab.O $srcdir/3a2l17-FF > /dev/null 2>&1
@@ -1317,7 +1317,7 @@ test -s 3Pab.E || rm -f 3Pab.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -a -2 -l 17 $srcdir/FnFn > 3Pac.O 2> 3Pac.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3Pac(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3Pac(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3Pac.O $srcdir/3a2l17-FF > /dev/null 2>&1
@@ -1335,7 +1335,7 @@ test -s 3Pac.E || rm -f 3Pac.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -a -2 -l 17 $srcdir/tFFn > 3Pad.O 2> 3Pad.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3Pad(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3Pad(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3Pad.O $srcdir/3a2l17-FF > /dev/null 2>&1
@@ -1353,7 +1353,7 @@ test -s 3Pad.E || rm -f 3Pad.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -a -2 -l 17 $srcdir/tFnFt > 3Pae.O 2> 3Pae.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3Pae(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3Pae(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3Pae.O $srcdir/3a2l17-FF > /dev/null 2>&1
@@ -1371,7 +1371,7 @@ test -s 3Pae.E || rm -f 3Pae.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -a -2 -l 17 $srcdir/tFFt > 3Paf.O 2> 3Paf.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3Paf(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3Paf(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3Paf.O $srcdir/3a2l17-FF > /dev/null 2>&1
@@ -1389,7 +1389,7 @@ test -s 3Paf.E || rm -f 3Paf.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -b -2 -l 17 $srcdir/FFn > 3Pba.O 2> 3Pba.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3Pba(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3Pba(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3Pba.O $srcdir/3b2l17-FF > /dev/null 2>&1
@@ -1407,7 +1407,7 @@ test -s 3Pba.E || rm -f 3Pba.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -b -2 -l 17 $srcdir/FFtn > 3Pbb.O 2> 3Pbb.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3Pbb(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3Pbb(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3Pbb.O $srcdir/3b2l17-FF > /dev/null 2>&1
@@ -1425,7 +1425,7 @@ test -s 3Pbb.E || rm -f 3Pbb.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -b -2 -l 17 $srcdir/FnFn > 3Pbc.O 2> 3Pbc.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3Pbc(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3Pbc(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3Pbc.O $srcdir/3b2l17-FF > /dev/null 2>&1
@@ -1443,7 +1443,7 @@ test -s 3Pbc.E || rm -f 3Pbc.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -b -2 -l 17 $srcdir/tFFn > 3Pbd.O 2> 3Pbd.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3Pbd(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3Pbd(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3Pbd.O $srcdir/3b2l17-FF > /dev/null 2>&1
@@ -1461,7 +1461,7 @@ test -s 3Pbd.E || rm -f 3Pbd.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -b -2 -l 17 $srcdir/tFnFt > 3Pbe.O 2> 3Pbe.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3Pbe(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3Pbe(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3Pbe.O $srcdir/3b2l17-FF > /dev/null 2>&1
@@ -1479,7 +1479,7 @@ test -s 3Pbe.E || rm -f 3Pbe.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -b -2 -l 17 $srcdir/tFFt > 3Pbf.O 2> 3Pbf.E
 code=$?
 if test $code != 0; then
-  $echo "Test 3Pbf(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3Pbf(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3Pbf.O $srcdir/3b2l17-FF > /dev/null 2>&1
@@ -1497,7 +1497,7 @@ test -s 3Pbf.E || rm -f 3Pbf.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -l 24 $srcdir/tn > 4a.O 2> 4a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 4a(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 4a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4a.O $srcdir/l24-t > /dev/null 2>&1
@@ -1515,7 +1515,7 @@ test -s 4a.E || rm -f 4a.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -l 17 -f $srcdir/tn > 4b.O 2> 4b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 4b(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 4b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4b.O $srcdir/l17f-t > /dev/null 2>&1
@@ -1533,7 +1533,7 @@ test -s 4b.E || rm -f 4b.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -l 24 $srcdir/tn > 4c.O 2> 4c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 4c(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 4c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4c.O $srcdir/3l24-t > /dev/null 2>&1
@@ -1551,7 +1551,7 @@ test -s 4c.E || rm -f 4c.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -l 17 -f $srcdir/tn > 4d.O 2> 4d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 4d(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 4d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4d.O $srcdir/3l17f-t > /dev/null 2>&1
@@ -1569,7 +1569,7 @@ test -s 4d.E || rm -f 4d.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3:5 -l 17 -f $srcdir/tn > 4e.O 2> 4e.E
 code=$?
 if test $code != 0; then
-  $echo "Test 4e(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 4e(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4e.O $srcdir/3-5l17f-t > /dev/null 2>&1
@@ -1587,7 +1587,7 @@ test -s 4e.E || rm -f 4e.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -3 -l 15 $srcdir/tn > 4f.O 2> 4f.E
 code=$?
 if test $code != 0; then
-  $echo "Test 4f(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 4f(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4f.O $srcdir/a3l15-t > /dev/null 2>&1
@@ -1605,7 +1605,7 @@ test -s 4f.E || rm -f 4f.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -3 -l 8 -f $srcdir/tn > 4g.O 2> 4g.E
 code=$?
 if test $code != 0; then
-  $echo "Test 4g(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 4g(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4g.O $srcdir/a3l8f-t > /dev/null 2>&1
@@ -1623,7 +1623,7 @@ test -s 4g.E || rm -f 4g.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -a -3 -l 15 $srcdir/tn > 4h.O 2> 4h.E
 code=$?
 if test $code != 0; then
-  $echo "Test 4h(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 4h(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4h.O $srcdir/3a3l15-t > /dev/null 2>&1
@@ -1641,7 +1641,7 @@ test -s 4h.E || rm -f 4h.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -a -3 -l 8 -f $srcdir/tn > 4i.O 2> 4i.E
 code=$?
 if test $code != 0; then
-  $echo "Test 4i(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 4i(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4i.O $srcdir/3a3l8f-t > /dev/null 2>&1
@@ -1659,7 +1659,7 @@ test -s 4i.E || rm -f 4i.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -3 -l 15 $srcdir/tn > 4j.O 2> 4j.E
 code=$?
 if test $code != 0; then
-  $echo "Test 4j(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 4j(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4j.O $srcdir/b3l15-t > /dev/null 2>&1
@@ -1677,7 +1677,7 @@ test -s 4j.E || rm -f 4j.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -3 -l 8 -f $srcdir/tn > 4k.O 2> 4k.E
 code=$?
 if test $code != 0; then
-  $echo "Test 4k(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 4k(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4k.O $srcdir/b3l8f-t > /dev/null 2>&1
@@ -1695,7 +1695,7 @@ test -s 4k.E || rm -f 4k.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -b -3 -l 15 $srcdir/tn > 4l.O 2> 4l.E
 code=$?
 if test $code != 0; then
-  $echo "Test 4l(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 4l(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4l.O $srcdir/3b3l15-t > /dev/null 2>&1
@@ -1713,7 +1713,7 @@ test -s 4l.E || rm -f 4l.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -b -3 -l 8 -f $srcdir/tn > 4m.O 2> 4m.E
 code=$?
 if test $code != 0; then
-  $echo "Test 4m(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 4m(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4m.O $srcdir/3b3l8f-t > /dev/null 2>&1
@@ -1731,7 +1731,7 @@ test -s 4m.E || rm -f 4m.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -m -l 24 $srcdir/tn $srcdir/tn > 5a.O 2> 5a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 5a(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 5a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5a.O $srcdir/ml24-t > /dev/null 2>&1
@@ -1749,7 +1749,7 @@ test -s 5a.E || rm -f 5a.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -m -l 17 -f $srcdir/tn $srcdir/tn > 5b.O 2> 5b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 5b(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 5b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5b.O $srcdir/ml17f-t > /dev/null 2>&1
@@ -1767,7 +1767,7 @@ test -s 5b.E || rm -f 5b.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -m -l 24 $srcdir/tn $srcdir/tn > 5c.O 2> 5c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 5c(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 5c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5c.O $srcdir/3ml24-t > /dev/null 2>&1
@@ -1785,7 +1785,7 @@ test -s 5c.E || rm -f 5c.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -m -l 17 -f $srcdir/tn $srcdir/tn > 5d.O 2> 5d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 5d(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 5d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5d.O $srcdir/3ml17f-t > /dev/null 2>&1
@@ -1803,7 +1803,7 @@ test -s 5d.E || rm -f 5d.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -m -l 17 -f $srcdir/0Ft $srcdir/0Ft > 5e.O 2> 5e.E
 code=$?
 if test $code != 0; then
-  $echo "Test 5e(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 5e(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5e.O $srcdir/ml17f-0F > /dev/null 2>&1
@@ -1821,7 +1821,7 @@ test -s 5e.E || rm -f 5e.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -m -l 17 -f $srcdir/0Ft $srcdir/0Fnt > 5f.O 2> 5f.E
 code=$?
 if test $code != 0; then
-  $echo "Test 5f(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 5f(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5f.O $srcdir/ml17f-0F > /dev/null 2>&1
@@ -1839,7 +1839,7 @@ test -s 5f.E || rm -f 5f.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -m -l 17 -f $srcdir/tn $srcdir/0Ft > 5g.O 2> 5g.E
 code=$?
 if test $code != 0; then
-  $echo "Test 5g(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 5g(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5g.O $srcdir/ml17f-t-0F > /dev/null 2>&1
@@ -1857,7 +1857,7 @@ test -s 5g.E || rm -f 5g.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -m -l 24 $srcdir/tFFn $srcdir/tFnFt > 5ma.O 2> 5ma.E
 code=$?
 if test $code != 0; then
-  $echo "Test 5ma(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 5ma(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5ma.O $srcdir/ml24-FF > /dev/null 2>&1
@@ -1875,7 +1875,7 @@ test -s 5ma.E || rm -f 5ma.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -m -l 24 $srcdir/tFFn $srcdir/FFn > 5mb.O 2> 5mb.E
 code=$?
 if test $code != 0; then
-  $echo "Test 5mb(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 5mb(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5mb.O $srcdir/ml24-FF > /dev/null 2>&1
@@ -1893,7 +1893,7 @@ test -s 5mb.E || rm -f 5mb.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -m -l 24 $srcdir/tn $srcdir/FFn > 5mc.O 2> 5mc.E
 code=$?
 if test $code != 0; then
-  $echo "Test 5mc(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 5mc(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5mc.O $srcdir/ml24-t-FF > /dev/null 2>&1
@@ -1911,7 +1911,7 @@ test -s 5mc.E || rm -f 5mc.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -m -l 20 $srcdir/FFn $srcdir/tn > 5md.O 2> 5md.E
 code=$?
 if test $code != 0; then
-  $echo "Test 5md(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 5md(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5md.O $srcdir/ml20-FF-t > /dev/null 2>&1
@@ -1929,7 +1929,7 @@ test -s 5md.E || rm -f 5md.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -m -l 24 $srcdir/FFn $srcdir/FnFn > 5Pma.O 2> 5Pma.E
 code=$?
 if test $code != 0; then
-  $echo "Test 5Pma(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 5Pma(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5Pma.O $srcdir/3ml24-FF > /dev/null 2>&1
@@ -1947,7 +1947,7 @@ test -s 5Pma.E || rm -f 5Pma.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -m -l 24 $srcdir/tFFn $srcdir/FFn > 5Pmb.O 2> 5Pmb.E
 code=$?
 if test $code != 0; then
-  $echo "Test 5Pmb(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 5Pmb(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5Pmb.O $srcdir/3ml24-FF > /dev/null 2>&1
@@ -1965,7 +1965,7 @@ test -s 5Pmb.E || rm -f 5Pmb.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x +3 -m -l 24 $srcdir/tn $srcdir/FFn > 5Pmc.O 2> 5Pmc.E
 code=$?
 if test $code != 0; then
-  $echo "Test 5Pmc(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 5Pmc(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5Pmc.O $srcdir/3ml24-t-FF > /dev/null 2>&1
@@ -1983,7 +1983,7 @@ test -s 5Pmc.E || rm -f 5Pmc.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -l 24 $srcdir/tn > 6a.O 2> 6a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 6a(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 6a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6a.O $srcdir/t-t > /dev/null 2>&1
@@ -2001,7 +2001,7 @@ test -s 6a.E || rm -f 6a.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -l 17 -f $srcdir/tn > 6b.O 2> 6b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 6b(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 6b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6b.O $srcdir/t-t > /dev/null 2>&1
@@ -2019,7 +2019,7 @@ test -s 6b.E || rm -f 6b.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -l 17 -f $srcdir/tFFt-bl > 6c.O 2> 6c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 6c(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 6c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6c.O $srcdir/t-bl > /dev/null 2>&1
@@ -2037,7 +2037,7 @@ test -s 6c.E || rm -f 6c.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -l 24 $srcdir/0FnFnt > 6d.O 2> 6d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 6d(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 6d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6d.O $srcdir/t-0FF > /dev/null 2>&1
@@ -2055,7 +2055,7 @@ test -s 6d.E || rm -f 6d.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -l 24 $srcdir/FFn > 6e.O 2> 6e.E
 code=$?
 if test $code != 0; then
-  $echo "Test 6e(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 6e(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6e.O $srcdir/t-FF > /dev/null 2>&1
@@ -2073,7 +2073,7 @@ test -s 6e.E || rm -f 6e.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -l 24 $srcdir/FnFn > 6f.O 2> 6f.E
 code=$?
 if test $code != 0; then
-  $echo "Test 6f(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 6f(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6f.O $srcdir/t-FF > /dev/null 2>&1
@@ -2091,7 +2091,7 @@ test -s 6f.E || rm -f 6f.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -l 17 -f $srcdir/FFn > 6g.O 2> 6g.E
 code=$?
 if test $code != 0; then
-  $echo "Test 6g(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 6g(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6g.O $srcdir/t-FF > /dev/null 2>&1
@@ -2109,7 +2109,7 @@ test -s 6g.E || rm -f 6g.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -a -3 $srcdir/0FnFnt > 6aa.O 2> 6aa.E
 code=$?
 if test $code != 0; then
-  $echo "Test 6aa(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 6aa(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6aa.O $srcdir/ta3-0FF > /dev/null 2>&1
@@ -2127,7 +2127,7 @@ test -s 6aa.E || rm -f 6aa.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -a -3 $srcdir/FFn > 6ab.O 2> 6ab.E
 code=$?
 if test $code != 0; then
-  $echo "Test 6ab(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 6ab(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6ab.O $srcdir/ta3-FF > /dev/null 2>&1
@@ -2145,7 +2145,7 @@ test -s 6ab.E || rm -f 6ab.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -a -3 -l 24 $srcdir/FnFn > 6ac.O 2> 6ac.E
 code=$?
 if test $code != 0; then
-  $echo "Test 6ac(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 6ac(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6ac.O $srcdir/ta3-FF > /dev/null 2>&1
@@ -2163,7 +2163,7 @@ test -s 6ac.E || rm -f 6ac.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -b -3 $srcdir/0FnFnt > 6ba.O 2> 6ba.E
 code=$?
 if test $code != 0; then
-  $echo "Test 6ba(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 6ba(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6ba.O $srcdir/tb3-0FF > /dev/null 2>&1
@@ -2181,7 +2181,7 @@ test -s 6ba.E || rm -f 6ba.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -b -3 $srcdir/FFn > 6bb.O 2> 6bb.E
 code=$?
 if test $code != 0; then
-  $echo "Test 6bb(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 6bb(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6bb.O $srcdir/tb3-FF > /dev/null 2>&1
@@ -2199,7 +2199,7 @@ test -s 6bb.E || rm -f 6bb.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -b -3 -l 24 $srcdir/FnFn > 6bc.O 2> 6bc.E
 code=$?
 if test $code != 0; then
-  $echo "Test 6bc(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 6bc(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6bc.O $srcdir/tb3-FF > /dev/null 2>&1
@@ -2217,7 +2217,7 @@ test -s 6bc.E || rm -f 6bc.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -T -l 24 $srcdir/tn > 7a.O 2> 7a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 7a(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 7a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 7a.O $srcdir/tt-t > /dev/null 2>&1
@@ -2235,7 +2235,7 @@ test -s 7a.E || rm -f 7a.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -T -l 17 -f $srcdir/tn > 7b.O 2> 7b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 7b(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 7b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 7b.O $srcdir/tt-t > /dev/null 2>&1
@@ -2253,7 +2253,7 @@ test -s 7b.E || rm -f 7b.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -T -l 17 -f $srcdir/tFFt-bl > 7c.O 2> 7c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 7c(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 7c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 7c.O $srcdir/tt-bl > /dev/null 2>&1
@@ -2271,7 +2271,7 @@ test -s 7c.E || rm -f 7c.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -T -l 24 $srcdir/0FnFnt > 7d.O 2> 7d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 7d(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 7d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 7d.O $srcdir/tt-0FF > /dev/null 2>&1
@@ -2289,7 +2289,7 @@ test -s 7d.E || rm -f 7d.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -T -l 24 $srcdir/FFn > 7e.O 2> 7e.E
 code=$?
 if test $code != 0; then
-  $echo "Test 7e(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 7e(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 7e.O $srcdir/tt-FF > /dev/null 2>&1
@@ -2307,7 +2307,7 @@ test -s 7e.E || rm -f 7e.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -T -l 24 $srcdir/FnFn > 7f.O 2> 7f.E
 code=$?
 if test $code != 0; then
-  $echo "Test 7f(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 7f(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 7f.O $srcdir/tt-FF > /dev/null 2>&1
@@ -2325,7 +2325,7 @@ test -s 7f.E || rm -f 7f.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -T -l 17 -f $srcdir/FFn > 7g.O 2> 7g.E
 code=$?
 if test $code != 0; then
-  $echo "Test 7g(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 7g(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 7g.O $srcdir/tt-FF > /dev/null 2>&1
@@ -2343,7 +2343,7 @@ test -s 7g.E || rm -f 7g.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -T -a -3 $srcdir/0FnFnt > 7aa.O 2> 7aa.E
 code=$?
 if test $code != 0; then
-  $echo "Test 7aa(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 7aa(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 7aa.O $srcdir/tta3-0FF > /dev/null 2>&1
@@ -2361,7 +2361,7 @@ test -s 7aa.E || rm -f 7aa.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -T -a -3 $srcdir/FFn > 7ab.O 2> 7ab.E
 code=$?
 if test $code != 0; then
-  $echo "Test 7ab(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 7ab(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 7ab.O $srcdir/tta3-FF > /dev/null 2>&1
@@ -2379,7 +2379,7 @@ test -s 7ab.E || rm -f 7ab.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -T -a -3 -l 24 $srcdir/FnFn > 7ac.O 2> 7ac.E
 code=$?
 if test $code != 0; then
-  $echo "Test 7ac(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 7ac(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 7ac.O $srcdir/tta3-FF > /dev/null 2>&1
@@ -2397,7 +2397,7 @@ test -s 7ac.E || rm -f 7ac.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -T -b -3 $srcdir/0FnFnt > 7ba.O 2> 7ba.E
 code=$?
 if test $code != 0; then
-  $echo "Test 7ba(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 7ba(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 7ba.O $srcdir/ttb3-0FF > /dev/null 2>&1
@@ -2415,7 +2415,7 @@ test -s 7ba.E || rm -f 7ba.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -T -b -3 $srcdir/FFn > 7bb.O 2> 7bb.E
 code=$?
 if test $code != 0; then
-  $echo "Test 7bb(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 7bb(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 7bb.O $srcdir/ttb3-FF > /dev/null 2>&1
@@ -2433,7 +2433,7 @@ test -s 7bb.E || rm -f 7bb.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -T -b -3 -l 24 $srcdir/FnFn > 7bc.O 2> 7bc.E
 code=$?
 if test $code != 0; then
-  $echo "Test 7bc(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 7bc(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 7bc.O $srcdir/ttb3-FF > /dev/null 2>&1
@@ -2451,7 +2451,7 @@ test -s 7bc.E || rm -f 7bc.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 -l 17 -f $srcdir/tFFt-bl > 9a.O 2> 9a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9a(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9a.O $srcdir/nl17f-bl > /dev/null 2>&1
@@ -2469,7 +2469,7 @@ test -s 9a.E || rm -f 9a.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 -N 15 -l 17 -f $srcdir/tFFt-bl > 9b.O 2> 9b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9b(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9b.O $srcdir/nN15l17f-bl > /dev/null 2>&1
@@ -2487,7 +2487,7 @@ test -s 9b.E || rm -f 9b.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +2 -l 17 -f $srcdir/tFFt-bl > 9Pa.O 2> 9Pa.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pa(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pa(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pa.O $srcdir/n+2l17f-bl > /dev/null 2>&1
@@ -2505,7 +2505,7 @@ test -s 9Pa.E || rm -f 9Pa.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +3 -l 17 -f $srcdir/tFFt-bl > 9Pb.O 2> 9Pb.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pb(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pb(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pb.O $srcdir/n+3l17f-bl > /dev/null 2>&1
@@ -2523,7 +2523,7 @@ test -s 9Pb.E || rm -f 9Pb.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 -N 1 +3 -l 17 -f $srcdir/tFFt-bl > 9Pc.O 2> 9Pc.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pc(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pc(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pc.O $srcdir/nN1+3l17f-bl > /dev/null 2>&1
@@ -2541,7 +2541,7 @@ test -s 9Pc.E || rm -f 9Pc.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +2 -l 17 -f $srcdir/0FFt > 9Pe.O 2> 9Pe.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pe(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pe(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pe.O $srcdir/n+2l17f-0FF > /dev/null 2>&1
@@ -2559,7 +2559,7 @@ test -s 9Pe.E || rm -f 9Pe.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +2 -l 17 -f $srcdir/0FFnt > 9Pf.O 2> 9Pf.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pf(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pf(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pf.O $srcdir/n+2l17f-0FF > /dev/null 2>&1
@@ -2577,7 +2577,7 @@ test -s 9Pf.E || rm -f 9Pf.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +2 -l 17 -f $srcdir/0FnFt > 9Pg.O 2> 9Pg.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pg(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pg(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pg.O $srcdir/n+2l17f-0FF > /dev/null 2>&1
@@ -2595,7 +2595,7 @@ test -s 9Pg.E || rm -f 9Pg.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +2 -l 17 -f $srcdir/0FnFnt > 9Ph.O 2> 9Ph.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Ph(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Ph(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Ph.O $srcdir/n+2l17f-0FF > /dev/null 2>&1
@@ -2613,7 +2613,7 @@ test -s 9Ph.E || rm -f 9Ph.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +2:5 -l 17 -f $srcdir/0FFt > 9Pi.O 2> 9Pi.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pi(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pi(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pi.O $srcdir/n+2-5l17f-0FF > /dev/null 2>&1
@@ -2631,7 +2631,7 @@ test -s 9Pi.E || rm -f 9Pi.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +3 -l 17 -f $srcdir/0FFt > 9Pj.O 2> 9Pj.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pj(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pj(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pj.O $srcdir/n+3l17f-0FF > /dev/null 2>&1
@@ -2649,7 +2649,7 @@ test -s 9Pj.E || rm -f 9Pj.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +3 -l 17 -f $srcdir/0FFnt > 9Pk.O 2> 9Pk.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pk(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pk(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pk.O $srcdir/n+3l17f-0FF > /dev/null 2>&1
@@ -2667,7 +2667,7 @@ test -s 9Pk.E || rm -f 9Pk.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +3 -l 17 -f $srcdir/0FnFt > 9Pl.O 2> 9Pl.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pl(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pl(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pl.O $srcdir/n+3l17f-0FF > /dev/null 2>&1
@@ -2685,7 +2685,7 @@ test -s 9Pl.E || rm -f 9Pl.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +3 -l 17 -f $srcdir/0FnFnt > 9Pm.O 2> 9Pm.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pm(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pm(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pm.O $srcdir/n+3l17f-0FF > /dev/null 2>&1
@@ -2703,7 +2703,7 @@ test -s 9Pm.E || rm -f 9Pm.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +7 -l 24 $srcdir/FFn > 9Pn.O 2> 9Pn.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pn(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pn(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pn.O $srcdir/n+7l24-FF > /dev/null 2>&1
@@ -2721,7 +2721,7 @@ test -s 9Pn.E || rm -f 9Pn.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +7 -l 24 $srcdir/FFtn > 9Po.O 2> 9Po.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Po(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Po(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Po.O $srcdir/n+7l24-FF > /dev/null 2>&1
@@ -2739,7 +2739,7 @@ test -s 9Po.E || rm -f 9Po.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +7 -l 24 $srcdir/FnFn > 9Pp.O 2> 9Pp.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pp(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pp(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pp.O $srcdir/n+7l24-FF > /dev/null 2>&1
@@ -2757,7 +2757,7 @@ test -s 9Pp.E || rm -f 9Pp.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +3:7 -l 24 $srcdir/FnFn > 9Pq.O 2> 9Pq.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pq(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pq(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pq.O $srcdir/n+3-7l24-FF > /dev/null 2>&1
@@ -2775,7 +2775,7 @@ test -s 9Pq.E || rm -f 9Pq.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +8 -l 20 $srcdir/tFFn > 9Pr.O 2> 9Pr.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pr(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pr(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pr.O $srcdir/n+8l20-FF > /dev/null 2>&1
@@ -2793,7 +2793,7 @@ test -s 9Pr.E || rm -f 9Pr.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +8 -l 20 $srcdir/tFnFt > 9Ps.O 2> 9Ps.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Ps(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Ps(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Ps.O $srcdir/n+8l20-FF > /dev/null 2>&1
@@ -2811,7 +2811,7 @@ test -s 9Ps.E || rm -f 9Ps.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +8 -l 20 $srcdir/tFFt > 9Pt.O 2> 9Pt.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pt(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pt(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pt.O $srcdir/n+8l20-FF > /dev/null 2>&1
@@ -2829,7 +2829,7 @@ test -s 9Pt.E || rm -f 9Pt.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +5 -a -3 -l 6 -f $srcdir/0FFt > 9Paa.O 2> 9Paa.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Paa(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Paa(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Paa.O $srcdir/n+5a3l6f-0FF > /dev/null 2>&1
@@ -2847,7 +2847,7 @@ test -s 9Paa.E || rm -f 9Paa.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +5 -a -3 -l 6 -f $srcdir/0FFnt > 9Pab.O 2> 9Pab.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pab(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pab(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pab.O $srcdir/n+5a3l6f-0FF > /dev/null 2>&1
@@ -2865,7 +2865,7 @@ test -s 9Pab.E || rm -f 9Pab.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +5 -a -3 -l 6 -f $srcdir/0FnFt > 9Pac.O 2> 9Pac.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pac(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pac(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pac.O $srcdir/n+5a3l6f-0FF > /dev/null 2>&1
@@ -2883,7 +2883,7 @@ test -s 9Pac.E || rm -f 9Pac.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +5 -a -3 -l 6 -f $srcdir/0FnFnt > 9Pad.O 2> 9Pad.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pad(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pad(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pad.O $srcdir/n+5a3l6f-0FF > /dev/null 2>&1
@@ -2901,7 +2901,7 @@ test -s 9Pad.E || rm -f 9Pad.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +6 -a -2 -l 17 $srcdir/FFn > 9Pae.O 2> 9Pae.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pae(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pae(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pae.O $srcdir/n+6a2l17-FF > /dev/null 2>&1
@@ -2919,7 +2919,7 @@ test -s 9Pae.E || rm -f 9Pae.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +6 -a -2 -l 17 $srcdir/FFtn > 9Paf.O 2> 9Paf.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Paf(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Paf(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Paf.O $srcdir/n+6a2l17-FF > /dev/null 2>&1
@@ -2937,7 +2937,7 @@ test -s 9Paf.E || rm -f 9Paf.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +6 -a -2 -l 17 $srcdir/FnFn > 9Pag.O 2> 9Pag.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pag(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pag(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pag.O $srcdir/n+6a2l17-FF > /dev/null 2>&1
@@ -2955,7 +2955,7 @@ test -s 9Pag.E || rm -f 9Pag.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +6 -a -2 -l 17 $srcdir/tFFn > 9Pah.O 2> 9Pah.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pah(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pah(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pah.O $srcdir/n+6a2l17-FF > /dev/null 2>&1
@@ -2973,7 +2973,7 @@ test -s 9Pah.E || rm -f 9Pah.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +6 -a -2 -l 17 $srcdir/tFnFt > 9Pai.O 2> 9Pai.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pai(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pai(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pai.O $srcdir/n+6a2l17-FF > /dev/null 2>&1
@@ -2991,7 +2991,7 @@ test -s 9Pai.E || rm -f 9Pai.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +6 -a -2 -l 17 $srcdir/tFFt > 9Paj.O 2> 9Paj.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Paj(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Paj(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Paj.O $srcdir/n+6a2l17-FF > /dev/null 2>&1
@@ -3009,7 +3009,7 @@ test -s 9Paj.E || rm -f 9Paj.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +4:8 -a -2 -l 17 $srcdir/tFFt > 9Pak.O 2> 9Pak.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pak(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pak(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pak.O $srcdir/n+4-8a2l17-FF > /dev/null 2>&1
@@ -3027,7 +3027,7 @@ test -s 9Pak.E || rm -f 9Pak.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +4 -b -2 -l 10 -f $srcdir/0FFt > 9Pba.O 2> 9Pba.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pba(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pba(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pba.O $srcdir/n+4b2l10f-0FF > /dev/null 2>&1
@@ -3045,7 +3045,7 @@ test -s 9Pba.E || rm -f 9Pba.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +4 -b -2 -l 10 -f $srcdir/0FFnt > 9Pbb.O 2> 9Pbb.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pbb(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pbb(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pbb.O $srcdir/n+4b2l10f-0FF > /dev/null 2>&1
@@ -3063,7 +3063,7 @@ test -s 9Pbb.E || rm -f 9Pbb.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +4 -b -2 -l 10 -f $srcdir/0FnFt > 9Pbc.O 2> 9Pbc.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pbc(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pbc(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pbc.O $srcdir/n+4b2l10f-0FF > /dev/null 2>&1
@@ -3081,7 +3081,7 @@ test -s 9Pbc.E || rm -f 9Pbc.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +4 -b -2 -l 10 -f $srcdir/0FnFnt > 9Pbd.O 2> 9Pbd.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pbd(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pbd(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pbd.O $srcdir/n+4b2l10f-0FF > /dev/null 2>&1
@@ -3099,7 +3099,7 @@ test -s 9Pbd.E || rm -f 9Pbd.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +6 -b -3 -l 6 -f $srcdir/FFn > 9Pbe.O 2> 9Pbe.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pbe(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pbe(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pbe.O $srcdir/n+6b3l6f-FF > /dev/null 2>&1
@@ -3117,7 +3117,7 @@ test -s 9Pbe.E || rm -f 9Pbe.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +6 -b -3 -l 6 -f $srcdir/FFtn > 9Pbf.O 2> 9Pbf.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pbf(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pbf(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pbf.O $srcdir/n+6b3l6f-FF > /dev/null 2>&1
@@ -3135,7 +3135,7 @@ test -s 9Pbf.E || rm -f 9Pbf.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +6 -b -3 -l 6 -f $srcdir/FnFn > 9Pbg.O 2> 9Pbg.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pbg(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pbg(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pbg.O $srcdir/n+6b3l6f-FF > /dev/null 2>&1
@@ -3153,7 +3153,7 @@ test -s 9Pbg.E || rm -f 9Pbg.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +6 -b -3 -l 6 -f $srcdir/tFFn > 9Pbh.O 2> 9Pbh.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pbh(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pbh(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pbh.O $srcdir/n+6b3l6f-FF > /dev/null 2>&1
@@ -3171,7 +3171,7 @@ test -s 9Pbh.E || rm -f 9Pbh.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +6 -b -3 -l 6 -f $srcdir/tFnFt > 9Pbi.O 2> 9Pbi.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pbi(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pbi(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pbi.O $srcdir/n+6b3l6f-FF > /dev/null 2>&1
@@ -3189,7 +3189,7 @@ test -s 9Pbi.E || rm -f 9Pbi.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +6 -b -3 -l 6 -f $srcdir/tFFt > 9Pbj.O 2> 9Pbj.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pbj(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pbj(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pbj.O $srcdir/n+6b3l6f-FF > /dev/null 2>&1
@@ -3207,7 +3207,7 @@ test -s 9Pbj.E || rm -f 9Pbj.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +5:8 -b -3 -l 10 -f $srcdir/FnFn > 9Pbk.O 2> 9Pbk.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pbk(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pbk(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pbk.O $srcdir/n+5-8b3l10f-FF > /dev/null 2>&1
@@ -3225,7 +3225,7 @@ test -s 9Pbk.E || rm -f 9Pbk.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +3 -m -l 13 -f $srcdir/tFFt-bl $srcdir/FnFn > 9Pma.O 2> 9Pma.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pma(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pma(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pma.O $srcdir/n+3ml13f-bl-FF > /dev/null 2>&1
@@ -3243,7 +3243,7 @@ test -s 9Pma.E || rm -f 9Pma.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +3 -m -l 17 -f $srcdir/tFFt-bl $srcdir/tn > 9Pmb.O 2> 9Pmb.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pmb(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pmb(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pmb.O $srcdir/n+3ml17f-bl-tn > /dev/null 2>&1
@@ -3261,7 +3261,7 @@ test -s 9Pmb.E || rm -f 9Pmb.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 +3 -m -l 17 -f $srcdir/tn $srcdir/tFFt-bl > 9Pmc.O 2> 9Pmc.E
 code=$?
 if test $code != 0; then
-  $echo "Test 9Pmc(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9Pmc(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9Pmc.O $srcdir/n+3ml17f-tn-bl > /dev/null 2>&1
@@ -3279,7 +3279,7 @@ test -s 9Pmc.E || rm -f 9Pmc.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -W 72 -J -l17 -f $srcdir/tFFt-ll > 10wa.O 2> 10wa.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10wa(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10wa(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10wa.O $srcdir/W72Jl17f-ll > /dev/null 2>&1
@@ -3297,7 +3297,7 @@ test -s 10wa.E || rm -f 10wa.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -w 72 -J -l17 -f $srcdir/tFFt-ll > 10wb.O 2> 10wb.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10wb(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10wb(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10wb.O $srcdir/W72Jl17f-ll > /dev/null 2>&1
@@ -3315,7 +3315,7 @@ test -s 10wb.E || rm -f 10wb.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -W 72 -l17 -f $srcdir/tFFt-ll > 10wc.O 2> 10wc.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10wc(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10wc(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10wc.O $srcdir/W-72l17f-ll > /dev/null 2>&1
@@ -3333,7 +3333,7 @@ test -s 10wc.E || rm -f 10wc.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -w 72 -l17 -f $srcdir/tFFt-ll > 10wd.O 2> 10wd.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10wd(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10wd(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10wd.O $srcdir/w72l17f-ll > /dev/null 2>&1
@@ -3351,7 +3351,7 @@ test -s 10wd.E || rm -f 10wd.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -W 28 -l17 -f $srcdir/tFFt-ll > 10we.O 2> 10we.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10we(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10we(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10we.O $srcdir/W28l17f-ll > /dev/null 2>&1
@@ -3369,7 +3369,7 @@ test -s 10we.E || rm -f 10we.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -W 27 -l17 -f $srcdir/tFFt-ll > 10wf.O 2> 10wf.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10wf(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10wf(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10wf.O $srcdir/W27l17f-ll > /dev/null 2>&1
@@ -3387,7 +3387,7 @@ test -s 10wf.E || rm -f 10wf.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -W 26 -l17 -f $srcdir/tFFt-ll > 10wg.O 2> 10wg.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10wg(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10wg(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10wg.O $srcdir/W26l17f-ll > /dev/null 2>&1
@@ -3405,7 +3405,7 @@ test -s 10wg.E || rm -f 10wg.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -W 20 -l17 -f $srcdir/tFFt-ll > 10wh.O 2> 10wh.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10wh(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10wh(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10wh.O $srcdir/W20l17f-ll > /dev/null 2>&1
@@ -3423,7 +3423,7 @@ test -s 10wh.E || rm -f 10wh.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli > 10ma.O 2> 10ma.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10ma(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10ma(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10ma.O $srcdir/ml17f-lm-lo > /dev/null 2>&1
@@ -3441,7 +3441,7 @@ test -s 10ma.E || rm -f 10ma.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -W 35 -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli > 10mb.O 2> 10mb.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10mb(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10mb(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10mb.O $srcdir/W35ml17f-lm-lo > /dev/null 2>&1
@@ -3459,7 +3459,7 @@ test -s 10mb.E || rm -f 10mb.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -w 35 -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli > 10mc.O 2> 10mc.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10mc(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10mc(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10mc.O $srcdir/W35ml17f-lm-lo > /dev/null 2>&1
@@ -3477,7 +3477,7 @@ test -s 10mc.E || rm -f 10mc.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -J -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli > 10md.O 2> 10md.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10md(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10md(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10md.O $srcdir/Jml17f-lm-lo > /dev/null 2>&1
@@ -3495,7 +3495,7 @@ test -s 10md.E || rm -f 10md.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -W 35 -J -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli > 10me.O 2> 10me.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10me(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10me(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10me.O $srcdir/W35Jml17f-lmlo > /dev/null 2>&1
@@ -3513,7 +3513,7 @@ test -s 10me.E || rm -f 10me.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -w 35 -J -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli > 10mf.O 2> 10mf.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10mf(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10mf(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10mf.O $srcdir/W35Jml17f-lmlo > /dev/null 2>&1
@@ -3531,7 +3531,7 @@ test -s 10mf.E || rm -f 10mf.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 -J -m -l 17 -f $srcdir/tFFt-lm $srcdir/tFFt-lm $srcdir/loli > 10mg.O 2> 10mg.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10mg(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10mg(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10mg.O $srcdir/nJml17f-lmlmlo > /dev/null 2>&1
@@ -3549,7 +3549,7 @@ test -s 10mg.E || rm -f 10mg.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 -J -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli $srcdir/tFFt-lm > 10mh.O 2> 10mh.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10mh(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10mh(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10mh.O $srcdir/nJml17f-lmlolm > /dev/null 2>&1
@@ -3567,7 +3567,7 @@ test -s 10mh.E || rm -f 10mh.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -a -3 -l 17 -f $srcdir/tFFt-lm > 10aa.O 2> 10aa.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10aa(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10aa(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10aa.O $srcdir/a3l17f-lm > /dev/null 2>&1
@@ -3585,7 +3585,7 @@ test -s 10aa.E || rm -f 10aa.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -W 35 -a -3 -l 17 -f $srcdir/tFFt-lm > 10ab.O 2> 10ab.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10ab(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10ab(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10ab.O $srcdir/W35a3l17f-lm > /dev/null 2>&1
@@ -3603,7 +3603,7 @@ test -s 10ab.E || rm -f 10ab.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -J -a -3 -l 17 -f $srcdir/tFFt-lm > 10ac.O 2> 10ac.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10ac(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10ac(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10ac.O $srcdir/Ja3l17f-lm > /dev/null 2>&1
@@ -3621,7 +3621,7 @@ test -s 10ac.E || rm -f 10ac.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -W 35 -J -a -3 -l 17 -f $srcdir/tFFt-lm > 10ad.O 2> 10ad.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10ad(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10ad(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10ad.O $srcdir/W35Ja3l17f-lm > /dev/null 2>&1
@@ -3639,7 +3639,7 @@ test -s 10ad.E || rm -f 10ad.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -b -3 -l 17 -f $srcdir/tFFt-lm > 10ba.O 2> 10ba.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10ba(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10ba(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10ba.O $srcdir/b3l17f-lm > /dev/null 2>&1
@@ -3657,7 +3657,7 @@ test -s 10ba.E || rm -f 10ba.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -W 35 -b -3 -l 17 -f $srcdir/tFFt-lm > 10bb.O 2> 10bb.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10bb(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10bb(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10bb.O $srcdir/W35b3l17f-lm > /dev/null 2>&1
@@ -3675,7 +3675,7 @@ test -s 10bb.E || rm -f 10bb.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -J -b -3 -l 17 -f $srcdir/tFFt-lm > 10bc.O 2> 10bc.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10bc(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10bc(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10bc.O $srcdir/Jb3l17f-lm > /dev/null 2>&1
@@ -3693,7 +3693,7 @@ test -s 10bc.E || rm -f 10bc.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -W 35 -J -b -3 -l 17 -f $srcdir/tFFt-lm > 10bd.O 2> 10bd.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10bd(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 10bd(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10bd.O $srcdir/W35Jb3l17f-lm > /dev/null 2>&1
@@ -3711,7 +3711,7 @@ test -s 10bd.E || rm -f 10bd.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 -S:--: -m -l 13 -f $srcdir/tFFt-bl $srcdir/FnFn > 11sa.O 2> 11sa.E
 code=$?
 if test $code != 0; then
-  $echo "Test 11sa(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 11sa(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 11sa.O $srcdir/nSml13-bl-FF > /dev/null 2>&1
@@ -3729,7 +3729,7 @@ test -s 11sa.E || rm -f 11sa.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 -S:--: -m -l 17 -f $srcdir/tFFt-bl $srcdir/FnFn > 11sb.O 2> 11sb.E
 code=$?
 if test $code != 0; then
-  $echo "Test 11sb(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 11sb(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 11sb.O $srcdir/nSml17-bl-FF > /dev/null 2>&1
@@ -3747,7 +3747,7 @@ test -s 11sb.E || rm -f 11sb.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 -S:--: -m -l 13 -f $srcdir/tn $srcdir/tn $srcdir/FnFn > 11se.O 2> 11se.E
 code=$?
 if test $code != 0; then
-  $echo "Test 11se(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 11se(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 11se.O $srcdir/nSml13-t-t-FF > /dev/null 2>&1
@@ -3765,7 +3765,7 @@ test -s 11se.E || rm -f 11se.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 -S:--: -m -l 17 -f $srcdir/tn $srcdir/tn $srcdir/FnFn > 11sf.O 2> 11sf.E
 code=$?
 if test $code != 0; then
-  $echo "Test 11sf(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 11sf(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 11sf.O $srcdir/nSml17-t-t-FF > /dev/null 2>&1
@@ -3783,7 +3783,7 @@ test -s 11sf.E || rm -f 11sf.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 -S:--: -m -l 13 -f $srcdir/tn $srcdir/tn $srcdir/FnFn $srcdir/FnFn > 11sg.O 2> 11sg.E
 code=$?
 if test $code != 0; then
-  $echo "Test 11sg(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 11sg(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 11sg.O $srcdir/nSml13-t-tFFFF > /dev/null 2>&1
@@ -3801,7 +3801,7 @@ test -s 11sg.E || rm -f 11sg.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -n.3 -S:--: -m -l 17 -f $srcdir/tn $srcdir/tn $srcdir/FnFn $srcdir/FnFn > 11sh.O 2> 11sh.E
 code=$?
 if test $code != 0; then
-  $echo "Test 11sh(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 11sh(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 11sh.O $srcdir/nSml17-t-tFFFF > /dev/null 2>&1
@@ -3819,7 +3819,7 @@ test -s 11sh.E || rm -f 11sh.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -o3 -a -3 -l17 -f $srcdir/tn > 12aa.O 2> 12aa.E
 code=$?
 if test $code != 0; then
-  $echo "Test 12aa(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 12aa(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 12aa.O $srcdir/o3a3l17f-tn > /dev/null 2>&1
@@ -3837,7 +3837,7 @@ test -s 12aa.E || rm -f 12aa.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -o3 -a -3 -S:--: -l17 -f $srcdir/tn > 12ab.O 2> 12ab.E
 code=$?
 if test $code != 0; then
-  $echo "Test 12ab(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 12ab(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 12ab.O $srcdir/o3a3Sl17f-tn > /dev/null 2>&1
@@ -3855,7 +3855,7 @@ test -s 12ab.E || rm -f 12ab.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -o3 -a -3 -S:--: -n. -l17 -f $srcdir/tn > 12ac.O 2> 12ac.E
 code=$?
 if test $code != 0; then
-  $echo "Test 12ac(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 12ac(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 12ac.O $srcdir/o3a3Snl17f-tn > /dev/null 2>&1
@@ -3873,7 +3873,7 @@ test -s 12ac.E || rm -f 12ac.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -o3 -b -3 -l17 -f $srcdir/tn > 12ba.O 2> 12ba.E
 code=$?
 if test $code != 0; then
-  $echo "Test 12ba(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 12ba(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 12ba.O $srcdir/o3b3l17f-tn > /dev/null 2>&1
@@ -3891,7 +3891,7 @@ test -s 12ba.E || rm -f 12ba.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -o3 -b -3 -S:--: -l17 -f $srcdir/tn > 12bb.O 2> 12bb.E
 code=$?
 if test $code != 0; then
-  $echo "Test 12bb(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 12bb(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 12bb.O $srcdir/o3b3Sl17f-tn > /dev/null 2>&1
@@ -3909,7 +3909,7 @@ test -s 12bb.E || rm -f 12bb.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -o3 -b -3 -S:--: -n. -l17 -f $srcdir/tn > 12bc.O 2> 12bc.E
 code=$?
 if test $code != 0; then
-  $echo "Test 12bc(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 12bc(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 12bc.O $srcdir/o3b3Snl17f-tn > /dev/null 2>&1
@@ -3927,7 +3927,7 @@ test -s 12bc.E || rm -f 12bc.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -o3 -m -l17 -f $srcdir/tFFt-bl $srcdir/tn > 12ma.O 2> 12ma.E
 code=$?
 if test $code != 0; then
-  $echo "Test 12ma(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 12ma(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 12ma.O $srcdir/o3ml17f-bl-tn > /dev/null 2>&1
@@ -3945,7 +3945,7 @@ test -s 12ma.E || rm -f 12ma.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -o3 -m -S:--: -l17 -f $srcdir/tFFt-bl $srcdir/tn > 12mb.O 2> 12mb.E
 code=$?
 if test $code != 0; then
-  $echo "Test 12mb(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 12mb(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 12mb.O $srcdir/o3mSl17f-bl-tn > /dev/null 2>&1
@@ -3963,7 +3963,7 @@ test -s 12mb.E || rm -f 12mb.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -o3 -m -S:--: -n. -l17 -f $srcdir/tFFt-bl $srcdir/tn > 12mc.O 2> 12mc.E
 code=$?
 if test $code != 0; then
-  $echo "Test 12mc(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 12mc(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 12mc.O $srcdir/o3mSnl17fbltn > /dev/null 2>&1
@@ -3981,7 +3981,7 @@ test -s 12mc.E || rm -f 12mc.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -o3 -J -m -l17 -f $srcdir/tFFt-lm $srcdir/loli > 12md.O 2> 12md.E
 code=$?
 if test $code != 0; then
-  $echo "Test 12md(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 12md(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 12md.O $srcdir/o3Jml17f-lm-lo > /dev/null 2>&1
@@ -3999,7 +3999,7 @@ test -s 12md.E || rm -f 12md.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -n -e8 $srcdir/t_tab > 13a.O 2> 13a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 13a(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 13a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 13a.O $srcdir/tne8-t_tab > /dev/null 2>&1
@@ -4017,7 +4017,7 @@ test -s 13a.E || rm -f 13a.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -n -e8 -o3 $srcdir/t_tab > 13b.O 2> 13b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 13b(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 13b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 13b.O $srcdir/tne8o3-t_tab > /dev/null 2>&1
@@ -4035,7 +4035,7 @@ test -s 13b.E || rm -f 13b.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -n -2 -e8 $srcdir/t_tab > 13ba.O 2> 13ba.E
 code=$?
 if test $code != 0; then
-  $echo "Test 13ba(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 13ba(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 13ba.O $srcdir/tn2e8-t_tab > /dev/null 2>&1
@@ -4053,7 +4053,7 @@ test -s 13ba.E || rm -f 13ba.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -n: -2 -e8 $srcdir/t_tab > 13bb.O 2> 13bb.E
 code=$?
 if test $code != 0; then
-  $echo "Test 13bb(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 13bb(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 13bb.O $srcdir/tn_2e8-t_tab > /dev/null 2>&1
@@ -4071,7 +4071,7 @@ test -s 13bb.E || rm -f 13bb.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -n: -2 -e8 -S---- $srcdir/t_tab > 13bc.O 2> 13bc.E
 code=$?
 if test $code != 0; then
-  $echo "Test 13bc(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 13bc(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 13bc.O $srcdir/tn_2e8S-t_tab > /dev/null 2>&1
@@ -4089,7 +4089,7 @@ test -s 13bc.E || rm -f 13bc.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -n -2 -e8 -o3 $srcdir/t_tab > 13bd.O 2> 13bd.E
 code=$?
 if test $code != 0; then
-  $echo "Test 13bd(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 13bd(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 13bd.O $srcdir/tn2e8o3-t_tab > /dev/null 2>&1
@@ -4107,7 +4107,7 @@ test -s 13bd.E || rm -f 13bd.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -n -2 -e5 -o3 $srcdir/t_tab > 13be.O 2> 13be.E
 code=$?
 if test $code != 0; then
-  $echo "Test 13be(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 13be(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 13be.O $srcdir/tn2e5o3-t_tab > /dev/null 2>&1
@@ -4125,7 +4125,7 @@ test -s 13be.E || rm -f 13be.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -t -n -2 -e:8 $srcdir/t_tab_ > 13bf.O 2> 13bf.E
 code=$?
 if test $code != 0; then
-  $echo "Test 13bf(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 13bf(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 13bf.O $srcdir/tn2e8-t_tab > /dev/null 2>&1
@@ -4143,7 +4143,7 @@ test -s 13bf.E || rm -f 13bf.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -2 -f $srcdir/t_notab > 14a.O 2> 14a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 14a(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 14a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 14a.O $srcdir/2f-t_notab > /dev/null 2>&1
@@ -4161,7 +4161,7 @@ test -s 14a.E || rm -f 14a.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -2 -s -f $srcdir/t_notab > 14b.O 2> 14b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 14b(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 14b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 14b.O $srcdir/2sf-t_notab > /dev/null 2>&1
@@ -4179,7 +4179,7 @@ test -s 14b.E || rm -f 14b.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -2 -s: -f $srcdir/t_notab > 14c.O 2> 14c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 14c(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 14c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 14c.O $srcdir/2s_f-t_notab > /dev/null 2>&1
@@ -4197,7 +4197,7 @@ test -s 14c.E || rm -f 14c.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -2 -w60 -f $srcdir/t_notab > 14d.O 2> 14d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 14d(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 14d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 14d.O $srcdir/2w60f-t_notab > /dev/null 2>&1
@@ -4215,7 +4215,7 @@ test -s 14d.E || rm -f 14d.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -2 -s -w60 -f $srcdir/t_notab > 14e.O 2> 14e.E
 code=$?
 if test $code != 0; then
-  $echo "Test 14e(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 14e(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 14e.O $srcdir/2sw60f-t_notab > /dev/null 2>&1
@@ -4233,7 +4233,7 @@ test -s 14e.E || rm -f 14e.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -2 -s: -w60 -f $srcdir/t_notab > 14f.O 2> 14f.E
 code=$?
 if test $code != 0; then
-  $echo "Test 14f(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 14f(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 14f.O $srcdir/2s_w60f-t_nota > /dev/null 2>&1
@@ -4251,7 +4251,7 @@ test -s 14f.E || rm -f 14f.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -2 -S -f $srcdir/t_notab > 14g.O 2> 14g.E
 code=$?
 if test $code != 0; then
-  $echo "Test 14g(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 14g(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 14g.O $srcdir/2-Sf-t_notab > /dev/null 2>&1
@@ -4269,7 +4269,7 @@ test -s 14g.E || rm -f 14g.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -2 -S"	" -J -f $srcdir/t_notab > 14h.O 2> 14h.E
 code=$?
 if test $code != 0; then
-  $echo "Test 14h(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 14h(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 14h.O $srcdir/2sf-t_notab > /dev/null 2>&1
@@ -4287,7 +4287,7 @@ test -s 14h.E || rm -f 14h.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -2 -S: -f $srcdir/t_notab > 14i.O 2> 14i.E
 code=$?
 if test $code != 0; then
-  $echo "Test 14i(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 14i(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 14i.O $srcdir/2-S_f-t_notab > /dev/null 2>&1
@@ -4305,7 +4305,7 @@ test -s 14i.E || rm -f 14i.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -2 -S: -J -f $srcdir/t_notab > 14j.O 2> 14j.E
 code=$?
 if test $code != 0; then
-  $echo "Test 14j(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 14j(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 14j.O $srcdir/2s_f-t_notab > /dev/null 2>&1
@@ -4323,7 +4323,7 @@ test -s 14j.E || rm -f 14j.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -2 -W60 -f $srcdir/t_notab > 14k.O 2> 14k.E
 code=$?
 if test $code != 0; then
-  $echo "Test 14k(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 14k(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 14k.O $srcdir/2w60f-t_notab > /dev/null 2>&1
@@ -4341,7 +4341,7 @@ test -s 14k.E || rm -f 14k.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -2 -S -W60 -f $srcdir/t_notab > 14l.O 2> 14l.E
 code=$?
 if test $code != 0; then
-  $echo "Test 14l(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 14l(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 14l.O $srcdir/2sw60f-t_notab > /dev/null 2>&1
@@ -4359,7 +4359,7 @@ test -s 14l.E || rm -f 14l.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -2 -S: -W60 -f $srcdir/t_notab > 14m.O 2> 14m.E
 code=$?
 if test $code != 0; then
-  $echo "Test 14m(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test 14m(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 14m.O $srcdir/2s_w60f-t_nota > /dev/null 2>&1
@@ -4377,7 +4377,7 @@ test -s 14m.E || rm -f 14m.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -tn -i5 -h "" $srcdir/i-opt-a.I > i-opt-a.O 2> i-opt-a.E
 code=$?
 if test $code != 0; then
-  $echo "Test i-opt-a(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test i-opt-a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp i-opt-a.O $srcdir/i-opt-a.X > /dev/null 2>&1
@@ -4395,7 +4395,7 @@ test -s i-opt-a.E || rm -f i-opt-a.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -tn -i5 -o9 -h "" $srcdir/i-opt-b.I > i-opt-b.O 2> i-opt-b.E
 code=$?
 if test $code != 0; then
-  $echo "Test i-opt-b(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test i-opt-b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp i-opt-b.O $srcdir/i-opt-b.X > /dev/null 2>&1
@@ -4413,7 +4413,7 @@ test -s i-opt-b.E || rm -f i-opt-b.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -tn2 -N98 $srcdir/ncut-a.I > ncut-a.O 2> ncut-a.E
 code=$?
 if test $code != 0; then
-  $echo "Test ncut-a(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test ncut-a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ncut-a.O $srcdir/ncut-a.X > /dev/null 2>&1
@@ -4431,7 +4431,7 @@ test -s ncut-a.E || rm -f ncut-a.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -tn:2 -N98 $srcdir/ncut-b.I > ncut-b.O 2> ncut-b.E
 code=$?
 if test $code != 0; then
-  $echo "Test ncut-b(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test ncut-b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ncut-b.O $srcdir/ncut-b.X > /dev/null 2>&1
@@ -4449,7 +4449,7 @@ test -s ncut-b.E || rm -f ncut-b.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -o 0 $srcdir/margin-0.I > margin-0.O 2> margin-0.E
 code=$?
 if test $code != 0; then
-  $echo "Test margin-0(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test margin-0(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp margin-0.O $srcdir/margin-0.X > /dev/null 2>&1
@@ -4467,7 +4467,7 @@ test -s margin-0.E || rm -f margin-0.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -d -l 14 -h "" $srcdir/dbl-sp-a.I > dbl-sp-a.O 2> dbl-sp-a.E
 code=$?
 if test $code != 0; then
-  $echo "Test dbl-sp-a(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test dbl-sp-a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp dbl-sp-a.O $srcdir/dbl-sp-a.X > /dev/null 2>&1
@@ -4485,7 +4485,7 @@ test -s dbl-sp-a.E || rm -f dbl-sp-a.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -d -t $srcdir/dbl-sp-b.I > dbl-sp-b.O 2> dbl-sp-b.E
 code=$?
 if test $code != 0; then
-  $echo "Test dbl-sp-b(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test dbl-sp-b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp dbl-sp-b.O $srcdir/dbl-sp-b.X > /dev/null 2>&1
@@ -4503,7 +4503,7 @@ test -s dbl-sp-b.E || rm -f dbl-sp-b.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -W1 -t $srcdir/narrow-1.I > narrow-1.O 2> narrow-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test narrow-1(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test narrow-1(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp narrow-1.O $srcdir/narrow-1.X > /dev/null 2>&1
@@ -4521,7 +4521,7 @@ test -s narrow-1.E || rm -f narrow-1.E
 _POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -W3 -t2 $srcdir/col-last.I > col-last.O 2> col-last.E
 code=$?
 if test $code != 0; then
-  $echo "Test col-last(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2
+  $echo "Test col-last(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp col-last.O $srcdir/col-last.X > /dev/null 2>&1
diff --git a/tests/sort/sort-tests b/tests/sort/sort-tests
index 4f6a760e7..ad173a900 100755
--- a/tests/sort/sort-tests
+++ b/tests/sort/sort-tests
@@ -21,7 +21,7 @@ export LANG
 _POSIX2_VERSION=199209 $xx -n $srcdir/n1.I > n1.O 2> n1.E
 code=$?
 if test $code != 0; then
-  $echo "Test n1(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test n1(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n1.O $srcdir/n1.X > /dev/null 2>&1
@@ -39,7 +39,7 @@ test -s n1.E || rm -f n1.E
 _POSIX2_VERSION=199209 $xx -n $srcdir/n2.I > n2.O 2> n2.E
 code=$?
 if test $code != 0; then
-  $echo "Test n2(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test n2(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n2.O $srcdir/n2.X > /dev/null 2>&1
@@ -57,7 +57,7 @@ test -s n2.E || rm -f n2.E
 _POSIX2_VERSION=199209 $xx -n $srcdir/n3.I > n3.O 2> n3.E
 code=$?
 if test $code != 0; then
-  $echo "Test n3(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test n3(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n3.O $srcdir/n3.X > /dev/null 2>&1
@@ -75,7 +75,7 @@ test -s n3.E || rm -f n3.E
 _POSIX2_VERSION=199209 $xx -n $srcdir/n4.I > n4.O 2> n4.E
 code=$?
 if test $code != 0; then
-  $echo "Test n4(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test n4(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n4.O $srcdir/n4.X > /dev/null 2>&1
@@ -93,7 +93,7 @@ test -s n4.E || rm -f n4.E
 _POSIX2_VERSION=199209 $xx -n $srcdir/n5.I > n5.O 2> n5.E
 code=$?
 if test $code != 0; then
-  $echo "Test n5(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test n5(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n5.O $srcdir/n5.X > /dev/null 2>&1
@@ -111,7 +111,7 @@ test -s n5.E || rm -f n5.E
 _POSIX2_VERSION=199209 $xx -n $srcdir/n6.I > n6.O 2> n6.E
 code=$?
 if test $code != 0; then
-  $echo "Test n6(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test n6(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n6.O $srcdir/n6.X > /dev/null 2>&1
@@ -129,7 +129,7 @@ test -s n6.E || rm -f n6.E
 _POSIX2_VERSION=199209 $xx -n $srcdir/n7.I > n7.O 2> n7.E
 code=$?
 if test $code != 0; then
-  $echo "Test n7(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test n7(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n7.O $srcdir/n7.X > /dev/null 2>&1
@@ -147,7 +147,7 @@ test -s n7.E || rm -f n7.E
 _POSIX2_VERSION=199209 $xx -s -n -k1,1 $srcdir/n8a.I > n8a.O 2> n8a.E
 code=$?
 if test $code != 0; then
-  $echo "Test n8a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test n8a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n8a.O $srcdir/n8a.X > /dev/null 2>&1
@@ -165,7 +165,7 @@ test -s n8a.E || rm -f n8a.E
 _POSIX2_VERSION=199209 $xx -s -n -k1,1 $srcdir/n8b.I > n8b.O 2> n8b.E
 code=$?
 if test $code != 0; then
-  $echo "Test n8b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test n8b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n8b.O $srcdir/n8b.X > /dev/null 2>&1
@@ -183,7 +183,7 @@ test -s n8b.E || rm -f n8b.E
 _POSIX2_VERSION=199209 $xx -s -n -k1,1 $srcdir/n9a.I > n9a.O 2> n9a.E
 code=$?
 if test $code != 0; then
-  $echo "Test n9a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test n9a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n9a.O $srcdir/n9a.X > /dev/null 2>&1
@@ -201,7 +201,7 @@ test -s n9a.E || rm -f n9a.E
 _POSIX2_VERSION=199209 $xx -s -n -k1,1 $srcdir/n9b.I > n9b.O 2> n9b.E
 code=$?
 if test $code != 0; then
-  $echo "Test n9b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test n9b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n9b.O $srcdir/n9b.X > /dev/null 2>&1
@@ -219,7 +219,7 @@ test -s n9b.E || rm -f n9b.E
 _POSIX2_VERSION=199209 $xx -s -n -k1,1 $srcdir/n10a.I > n10a.O 2> n10a.E
 code=$?
 if test $code != 0; then
-  $echo "Test n10a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test n10a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n10a.O $srcdir/n10a.X > /dev/null 2>&1
@@ -237,7 +237,7 @@ test -s n10a.E || rm -f n10a.E
 _POSIX2_VERSION=199209 $xx -s -n -k1,1 $srcdir/n10b.I > n10b.O 2> n10b.E
 code=$?
 if test $code != 0; then
-  $echo "Test n10b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test n10b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n10b.O $srcdir/n10b.X > /dev/null 2>&1
@@ -255,7 +255,7 @@ test -s n10b.E || rm -f n10b.E
 _POSIX2_VERSION=199209 $xx -s -n -k1,1 $srcdir/n11a.I > n11a.O 2> n11a.E
 code=$?
 if test $code != 0; then
-  $echo "Test n11a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test n11a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n11a.O $srcdir/n11a.X > /dev/null 2>&1
@@ -273,7 +273,7 @@ test -s n11a.E || rm -f n11a.E
 _POSIX2_VERSION=199209 $xx -s -n -k1,1 $srcdir/n11b.I > n11b.O 2> n11b.E
 code=$?
 if test $code != 0; then
-  $echo "Test n11b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test n11b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n11b.O $srcdir/n11b.X > /dev/null 2>&1
@@ -291,7 +291,7 @@ test -s n11b.E || rm -f n11b.E
 _POSIX2_VERSION=199209 $xx  $srcdir/01a.I > 01a.O 2> 01a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 01a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 01a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 01a.O $srcdir/01a.X > /dev/null 2>&1
@@ -309,7 +309,7 @@ test -s 01a.E || rm -f 01a.E
 _POSIX2_VERSION=199209 $xx -c $srcdir/02a.I > 02a.O 2> 02a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 02a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 02a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 02a.O $srcdir/02a.X > /dev/null 2>&1
@@ -327,7 +327,7 @@ test -s 02a.E || rm -f 02a.E
 _POSIX2_VERSION=199209 $xx -c $srcdir/02b.I > 02b.O 2> 02b.E
 code=$?
 if test $code != 1; then
-  $echo "Test 02b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 1" 1>&2
+  $echo "Test 02b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 02b.O $srcdir/02b.X > /dev/null 2>&1
@@ -345,7 +345,7 @@ test -s 02b.E || rm -f 02b.E
 _POSIX2_VERSION=199209 $xx -c -k1,1 $srcdir/02c.I > 02c.O 2> 02c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 02c(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 02c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 02c.O $srcdir/02c.X > /dev/null 2>&1
@@ -363,7 +363,7 @@ test -s 02c.E || rm -f 02c.E
 _POSIX2_VERSION=199209 $xx -cu $srcdir/02m.I > 02m.O 2> 02m.E
 code=$?
 if test $code != 1; then
-  $echo "Test 02m(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 1" 1>&2
+  $echo "Test 02m(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 02m.O $srcdir/02m.X > /dev/null 2>&1
@@ -381,7 +381,7 @@ test -s 02m.E || rm -f 02m.E
 _POSIX2_VERSION=199209 $xx -cu $srcdir/02n.I > 02n.O 2> 02n.E
 code=$?
 if test $code != 0; then
-  $echo "Test 02n(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 02n(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 02n.O $srcdir/02n.X > /dev/null 2>&1
@@ -399,7 +399,7 @@ test -s 02n.E || rm -f 02n.E
 _POSIX2_VERSION=199209 $xx -cu $srcdir/02o.I > 02o.O 2> 02o.E
 code=$?
 if test $code != 1; then
-  $echo "Test 02o(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 1" 1>&2
+  $echo "Test 02o(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 02o.O $srcdir/02o.X > /dev/null 2>&1
@@ -417,7 +417,7 @@ test -s 02o.E || rm -f 02o.E
 _POSIX2_VERSION=199209 $xx -cu $srcdir/02p.I > 02p.O 2> 02p.E
 code=$?
 if test $code != 1; then
-  $echo "Test 02p(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 1" 1>&2
+  $echo "Test 02p(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 02p.O $srcdir/02p.X > /dev/null 2>&1
@@ -435,7 +435,7 @@ test -s 02p.E || rm -f 02p.E
 _POSIX2_VERSION=199209 $xx -k1 $srcdir/03a.I > 03a.O 2> 03a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 03a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 03a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 03a.O $srcdir/03a.X > /dev/null 2>&1
@@ -453,7 +453,7 @@ test -s 03a.E || rm -f 03a.E
 _POSIX2_VERSION=199209 $xx -k1,1 $srcdir/03b.I > 03b.O 2> 03b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 03b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 03b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 03b.O $srcdir/03b.X > /dev/null 2>&1
@@ -471,7 +471,7 @@ test -s 03b.E || rm -f 03b.E
 _POSIX2_VERSION=199209 $xx -k1 -k2 $srcdir/03c.I > 03c.O 2> 03c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 03c(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 03c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 03c.O $srcdir/03c.X > /dev/null 2>&1
@@ -489,7 +489,7 @@ test -s 03c.E || rm -f 03c.E
 _POSIX2_VERSION=199209 $xx -k0 $srcdir/03d.I > 03d.O 2> 03d.E
 code=$?
 if test $code != 2; then
-  $echo "Test 03d(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 2" 1>&2
+  $echo "Test 03d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 03d.O $srcdir/03d.X > /dev/null 2>&1
@@ -507,7 +507,7 @@ test -s 03d.E || rm -f 03d.E
 _POSIX2_VERSION=199209 $xx -k1.0 $srcdir/03e.I > 03e.O 2> 03e.E
 code=$?
 if test $code != 2; then
-  $echo "Test 03e(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 2" 1>&2
+  $echo "Test 03e(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 03e.O $srcdir/03e.X > /dev/null 2>&1
@@ -525,7 +525,7 @@ test -s 03e.E || rm -f 03e.E
 _POSIX2_VERSION=199209 $xx -k1.1,-k0 $srcdir/03f.I > 03f.O 2> 03f.E
 code=$?
 if test $code != 2; then
-  $echo "Test 03f(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 2" 1>&2
+  $echo "Test 03f(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 03f.O $srcdir/03f.X > /dev/null 2>&1
@@ -543,7 +543,7 @@ test -s 03f.E || rm -f 03f.E
 _POSIX2_VERSION=199209 $xx -k1.1,1.0 $srcdir/03g.I > 03g.O 2> 03g.E
 code=$?
 if test $code != 0; then
-  $echo "Test 03g(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 03g(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 03g.O $srcdir/03g.X > /dev/null 2>&1
@@ -561,7 +561,7 @@ test -s 03g.E || rm -f 03g.E
 _POSIX2_VERSION=199209 $xx -k1.1,1 $srcdir/03h.I > 03h.O 2> 03h.E
 code=$?
 if test $code != 0; then
-  $echo "Test 03h(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 03h(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 03h.O $srcdir/03h.X > /dev/null 2>&1
@@ -579,7 +579,7 @@ test -s 03h.E || rm -f 03h.E
 _POSIX2_VERSION=199209 $xx -k1,1 $srcdir/03i.I > 03i.O 2> 03i.E
 code=$?
 if test $code != 0; then
-  $echo "Test 03i(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 03i(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 03i.O $srcdir/03i.X > /dev/null 2>&1
@@ -597,7 +597,7 @@ test -s 03i.E || rm -f 03i.E
 _POSIX2_VERSION=199209 $xx -nc $srcdir/04a.I > 04a.O 2> 04a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 04a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 04a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 04a.O $srcdir/04a.X > /dev/null 2>&1
@@ -615,7 +615,7 @@ test -s 04a.E || rm -f 04a.E
 _POSIX2_VERSION=199209 $xx -n $srcdir/04b.I > 04b.O 2> 04b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 04b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 04b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 04b.O $srcdir/04b.X > /dev/null 2>&1
@@ -633,7 +633,7 @@ test -s 04b.E || rm -f 04b.E
 _POSIX2_VERSION=199209 $xx -k1n $srcdir/04c.I > 04c.O 2> 04c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 04c(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 04c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 04c.O $srcdir/04c.X > /dev/null 2>&1
@@ -651,7 +651,7 @@ test -s 04c.E || rm -f 04c.E
 _POSIX2_VERSION=199209 $xx -k1 $srcdir/04d.I > 04d.O 2> 04d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 04d(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 04d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 04d.O $srcdir/04d.X > /dev/null 2>&1
@@ -669,7 +669,7 @@ test -s 04d.E || rm -f 04d.E
 _POSIX2_VERSION=199209 $xx -k2 $srcdir/04e.I > 04e.O 2> 04e.E
 code=$?
 if test $code != 0; then
-  $echo "Test 04e(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 04e(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 04e.O $srcdir/04e.X > /dev/null 2>&1
@@ -687,7 +687,7 @@ test -s 04e.E || rm -f 04e.E
 _POSIX2_VERSION=199209 $xx -k1,2 $srcdir/05a.I > 05a.O 2> 05a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 05a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 05a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 05a.O $srcdir/05a.X > /dev/null 2>&1
@@ -705,7 +705,7 @@ test -s 05a.E || rm -f 05a.E
 _POSIX2_VERSION=199209 $xx -k1,2 $srcdir/05b.I > 05b.O 2> 05b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 05b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 05b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 05b.O $srcdir/05b.X > /dev/null 2>&1
@@ -723,7 +723,7 @@ test -s 05b.E || rm -f 05b.E
 _POSIX2_VERSION=199209 $xx -k1 -k2 $srcdir/05c.I > 05c.O 2> 05c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 05c(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 05c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 05c.O $srcdir/05c.X > /dev/null 2>&1
@@ -741,7 +741,7 @@ test -s 05c.E || rm -f 05c.E
 _POSIX2_VERSION=199209 $xx -k2,2 $srcdir/05d.I > 05d.O 2> 05d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 05d(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 05d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 05d.O $srcdir/05d.X > /dev/null 2>&1
@@ -759,7 +759,7 @@ test -s 05d.E || rm -f 05d.E
 _POSIX2_VERSION=199209 $xx -k2,2 $srcdir/05e.I > 05e.O 2> 05e.E
 code=$?
 if test $code != 0; then
-  $echo "Test 05e(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 05e(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 05e.O $srcdir/05e.X > /dev/null 2>&1
@@ -777,7 +777,7 @@ test -s 05e.E || rm -f 05e.E
 _POSIX2_VERSION=199209 $xx -k2,2 $srcdir/05f.I > 05f.O 2> 05f.E
 code=$?
 if test $code != 0; then
-  $echo "Test 05f(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 05f(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 05f.O $srcdir/05f.X > /dev/null 2>&1
@@ -795,7 +795,7 @@ test -s 05f.E || rm -f 05f.E
 _POSIX2_VERSION=199209 $xx -k 1,2 $srcdir/06a.I > 06a.O 2> 06a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 06a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 06a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 06a.O $srcdir/06a.X > /dev/null 2>&1
@@ -813,7 +813,7 @@ test -s 06a.E || rm -f 06a.E
 _POSIX2_VERSION=199209 $xx -k 1,2 $srcdir/06b.I > 06b.O 2> 06b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 06b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 06b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 06b.O $srcdir/06b.X > /dev/null 2>&1
@@ -831,7 +831,7 @@ test -s 06b.E || rm -f 06b.E
 _POSIX2_VERSION=199209 $xx -k 1 -k 2 $srcdir/06c.I > 06c.O 2> 06c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 06c(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 06c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 06c.O $srcdir/06c.X > /dev/null 2>&1
@@ -849,7 +849,7 @@ test -s 06c.E || rm -f 06c.E
 _POSIX2_VERSION=199209 $xx -k 2,2 $srcdir/06d.I > 06d.O 2> 06d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 06d(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 06d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 06d.O $srcdir/06d.X > /dev/null 2>&1
@@ -867,7 +867,7 @@ test -s 06d.E || rm -f 06d.E
 _POSIX2_VERSION=199209 $xx -k 2,2 $srcdir/06e.I > 06e.O 2> 06e.E
 code=$?
 if test $code != 0; then
-  $echo "Test 06e(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 06e(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 06e.O $srcdir/06e.X > /dev/null 2>&1
@@ -885,7 +885,7 @@ test -s 06e.E || rm -f 06e.E
 _POSIX2_VERSION=199209 $xx -k 2,2 $srcdir/06f.I > 06f.O 2> 06f.E
 code=$?
 if test $code != 0; then
-  $echo "Test 06f(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 06f(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 06f.O $srcdir/06f.X > /dev/null 2>&1
@@ -903,7 +903,7 @@ test -s 06f.E || rm -f 06f.E
 _POSIX2_VERSION=199209 $xx -k 2,3 $srcdir/07a.I > 07a.O 2> 07a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 07a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 07a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 07a.O $srcdir/07a.X > /dev/null 2>&1
@@ -921,7 +921,7 @@ test -s 07a.E || rm -f 07a.E
 _POSIX2_VERSION=199209 $xx -k 2,3 $srcdir/07b.I > 07b.O 2> 07b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 07b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 07b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 07b.O $srcdir/07b.X > /dev/null 2>&1
@@ -939,7 +939,7 @@ test -s 07b.E || rm -f 07b.E
 _POSIX2_VERSION=199209 $xx -k 2,3 $srcdir/07c.I > 07c.O 2> 07c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 07c(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 07c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 07c.O $srcdir/07c.X > /dev/null 2>&1
@@ -957,7 +957,7 @@ test -s 07c.E || rm -f 07c.E
 _POSIX2_VERSION=199209 $xx +1 -3 $srcdir/07d.I > 07d.O 2> 07d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 07d(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 07d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 07d.O $srcdir/07d.X > /dev/null 2>&1
@@ -975,7 +975,7 @@ test -s 07d.E || rm -f 07d.E
 _POSIX2_VERSION=199209 $xx -k 2.,3 $srcdir/08a.I > 08a.O 2> 08a.E
 code=$?
 if test $code != 2; then
-  $echo "Test 08a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 2" 1>&2
+  $echo "Test 08a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 08a.O $srcdir/08a.X > /dev/null 2>&1
@@ -993,7 +993,7 @@ test -s 08a.E || rm -f 08a.E
 _POSIX2_VERSION=199209 $xx -k 2, $srcdir/08b.I > 08b.O 2> 08b.E
 code=$?
 if test $code != 2; then
-  $echo "Test 08b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 2" 1>&2
+  $echo "Test 08b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 08b.O $srcdir/08b.X > /dev/null 2>&1
@@ -1011,7 +1011,7 @@ test -s 08b.E || rm -f 08b.E
 _POSIX2_VERSION=199209 $xx -g $srcdir/09a.I > 09a.O 2> 09a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 09a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 09a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 09a.O $srcdir/09a.X > /dev/null 2>&1
@@ -1029,7 +1029,7 @@ test -s 09a.E || rm -f 09a.E
 _POSIX2_VERSION=199209 $xx -n $srcdir/09b.I > 09b.O 2> 09b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 09b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 09b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 09b.O $srcdir/09b.X > /dev/null 2>&1
@@ -1047,7 +1047,7 @@ test -s 09b.E || rm -f 09b.E
 _POSIX2_VERSION=199209 $xx -n $srcdir/09c.I > 09c.O 2> 09c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 09c(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 09c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 09c.O $srcdir/09c.X > /dev/null 2>&1
@@ -1065,7 +1065,7 @@ test -s 09c.E || rm -f 09c.E
 _POSIX2_VERSION=199209 $xx -k2g $srcdir/09d.I > 09d.O 2> 09d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 09d(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 09d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 09d.O $srcdir/09d.X > /dev/null 2>&1
@@ -1083,7 +1083,7 @@ test -s 09d.E || rm -f 09d.E
 _POSIX2_VERSION=199209 $xx -t : -k 2.2,2.2 $srcdir/10a.I > 10a.O 2> 10a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 10a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10a.O $srcdir/10a.X > /dev/null 2>&1
@@ -1101,7 +1101,7 @@ test -s 10a.E || rm -f 10a.E
 _POSIX2_VERSION=199209 $xx -t : +1.1 -1.2 $srcdir/10b.I > 10b.O 2> 10b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 10b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10b.O $srcdir/10b.X > /dev/null 2>&1
@@ -1119,7 +1119,7 @@ test -s 10b.E || rm -f 10b.E
 _POSIX2_VERSION=199209 $xx -t : -k 2.2,2.2 $srcdir/10c.I > 10c.O 2> 10c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10c(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 10c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10c.O $srcdir/10c.X > /dev/null 2>&1
@@ -1137,7 +1137,7 @@ test -s 10c.E || rm -f 10c.E
 _POSIX2_VERSION=199209 $xx -t : +1.1 -1.2 $srcdir/10d.I > 10d.O 2> 10d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10d(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 10d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10d.O $srcdir/10d.X > /dev/null 2>&1
@@ -1155,7 +1155,7 @@ test -s 10d.E || rm -f 10d.E
 _POSIX2_VERSION=199209 $xx -k 2.3,2.3 $srcdir/10a0.I > 10a0.O 2> 10a0.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10a0(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 10a0(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10a0.O $srcdir/10a0.X > /dev/null 2>&1
@@ -1173,7 +1173,7 @@ test -s 10a0.E || rm -f 10a0.E
 _POSIX2_VERSION=199209 $xx -k 1.2,1.2 $srcdir/10a1.I > 10a1.O 2> 10a1.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10a1(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 10a1(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10a1.O $srcdir/10a1.X > /dev/null 2>&1
@@ -1191,7 +1191,7 @@ test -s 10a1.E || rm -f 10a1.E
 _POSIX2_VERSION=199209 $xx -b -k 2.2,2.2 $srcdir/10a2.I > 10a2.O 2> 10a2.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10a2(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 10a2(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10a2.O $srcdir/10a2.X > /dev/null 2>&1
@@ -1209,7 +1209,7 @@ test -s 10a2.E || rm -f 10a2.E
 _POSIX2_VERSION=199209 $xx -k 1.2,1.2 $srcdir/10e.I > 10e.O 2> 10e.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10e(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 10e(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10e.O $srcdir/10e.X > /dev/null 2>&1
@@ -1227,7 +1227,7 @@ test -s 10e.E || rm -f 10e.E
 _POSIX2_VERSION=199209 $xx -t : -k 1.3,1.3 $srcdir/10f.I > 10f.O 2> 10f.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10f(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 10f(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10f.O $srcdir/10f.X > /dev/null 2>&1
@@ -1245,7 +1245,7 @@ test -s 10f.E || rm -f 10f.E
 _POSIX2_VERSION=199209 $xx -k 1.4,1.4 $srcdir/10g.I > 10g.O 2> 10g.E
 code=$?
 if test $code != 0; then
-  $echo "Test 10g(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 10g(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 10g.O $srcdir/10g.X > /dev/null 2>&1
@@ -1263,7 +1263,7 @@ test -s 10g.E || rm -f 10g.E
 _POSIX2_VERSION=199209 $xx -t: -k1,1b -k2,2 $srcdir/11a.I > 11a.O 2> 11a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 11a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 11a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 11a.O $srcdir/11a.X > /dev/null 2>&1
@@ -1281,7 +1281,7 @@ test -s 11a.E || rm -f 11a.E
 _POSIX2_VERSION=199209 $xx -t: -k1,1b -k2,2 $srcdir/11b.I > 11b.O 2> 11b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 11b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 11b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 11b.O $srcdir/11b.X > /dev/null 2>&1
@@ -1299,7 +1299,7 @@ test -s 11b.E || rm -f 11b.E
 _POSIX2_VERSION=199209 $xx -t: -k2,2b -k3,3 $srcdir/11c.I > 11c.O 2> 11c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 11c(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 11c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 11c.O $srcdir/11c.X > /dev/null 2>&1
@@ -1317,7 +1317,7 @@ test -s 11c.E || rm -f 11c.E
 _POSIX2_VERSION=199209 $xx -t: -k2,2b -k3,3 $srcdir/11d.I > 11d.O 2> 11d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 11d(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 11d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 11d.O $srcdir/11d.X > /dev/null 2>&1
@@ -1335,7 +1335,7 @@ test -s 11d.E || rm -f 11d.E
 _POSIX2_VERSION=199209 $xx -n -t: +1 $srcdir/12a.I > 12a.O 2> 12a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 12a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 12a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 12a.O $srcdir/12a.X > /dev/null 2>&1
@@ -1353,7 +1353,7 @@ test -s 12a.E || rm -f 12a.E
 _POSIX2_VERSION=199209 $xx -n -t: +1 $srcdir/12b.I > 12b.O 2> 12b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 12b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 12b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 12b.O $srcdir/12b.X > /dev/null 2>&1
@@ -1371,7 +1371,7 @@ test -s 12b.E || rm -f 12b.E
 _POSIX2_VERSION=199209 $xx -n -t: +1 $srcdir/12c.I > 12c.O 2> 12c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 12c(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 12c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 12c.O $srcdir/12c.X > /dev/null 2>&1
@@ -1389,7 +1389,7 @@ test -s 12c.E || rm -f 12c.E
 _POSIX2_VERSION=199209 $xx -n -t: +1 $srcdir/12d.I > 12d.O 2> 12d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 12d(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 12d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 12d.O $srcdir/12d.X > /dev/null 2>&1
@@ -1407,7 +1407,7 @@ test -s 12d.E || rm -f 12d.E
 _POSIX2_VERSION=199209 $xx +0.1n $srcdir/13a.I > 13a.O 2> 13a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 13a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 13a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 13a.O $srcdir/13a.X > /dev/null 2>&1
@@ -1425,7 +1425,7 @@ test -s 13a.E || rm -f 13a.E
 _POSIX2_VERSION=199209 $xx +0.1n $srcdir/13b.I > 13b.O 2> 13b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 13b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 13b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 13b.O $srcdir/13b.X > /dev/null 2>&1
@@ -1443,7 +1443,7 @@ test -s 13b.E || rm -f 13b.E
 _POSIX2_VERSION=199209 $xx -d -u $srcdir/14a.I > 14a.O 2> 14a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 14a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 14a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 14a.O $srcdir/14a.X > /dev/null 2>&1
@@ -1461,7 +1461,7 @@ test -s 14a.E || rm -f 14a.E
 _POSIX2_VERSION=199209 $xx -f -d -u $srcdir/14b.I > 14b.O 2> 14b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 14b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 14b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 14b.O $srcdir/14b.X > /dev/null 2>&1
@@ -1479,7 +1479,7 @@ test -s 14b.E || rm -f 14b.E
 _POSIX2_VERSION=199209 $xx -i -u $srcdir/15a.I > 15a.O 2> 15a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 15a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 15a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 15a.O $srcdir/15a.X > /dev/null 2>&1
@@ -1497,7 +1497,7 @@ test -s 15a.E || rm -f 15a.E
 _POSIX2_VERSION=199209 $xx -i -u $srcdir/15b.I > 15b.O 2> 15b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 15b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 15b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 15b.O $srcdir/15b.X > /dev/null 2>&1
@@ -1515,7 +1515,7 @@ test -s 15b.E || rm -f 15b.E
 _POSIX2_VERSION=199209 $xx -i -u $srcdir/15c.I > 15c.O 2> 15c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 15c(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 15c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 15c.O $srcdir/15c.X > /dev/null 2>&1
@@ -1533,7 +1533,7 @@ test -s 15c.E || rm -f 15c.E
 _POSIX2_VERSION=199209 $xx -i -u $srcdir/15d.I > 15d.O 2> 15d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 15d(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 15d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 15d.O $srcdir/15d.X > /dev/null 2>&1
@@ -1551,7 +1551,7 @@ test -s 15d.E || rm -f 15d.E
 _POSIX2_VERSION=199209 $xx -i -u $srcdir/15e.I > 15e.O 2> 15e.E
 code=$?
 if test $code != 0; then
-  $echo "Test 15e(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 15e(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 15e.O $srcdir/15e.X > /dev/null 2>&1
@@ -1569,7 +1569,7 @@ test -s 15e.E || rm -f 15e.E
 _POSIX2_VERSION=199209 $xx -f $srcdir/16a.I > 16a.O 2> 16a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 16a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 16a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 16a.O $srcdir/16a.X > /dev/null 2>&1
@@ -1587,7 +1587,7 @@ test -s 16a.E || rm -f 16a.E
 _POSIX2_VERSION=199209 $xx -c $srcdir/17.I > 17.O 2> 17.E
 code=$?
 if test $code != 0; then
-  $echo "Test 17(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 17(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 17.O $srcdir/17.X > /dev/null 2>&1
@@ -1605,7 +1605,7 @@ test -s 17.E || rm -f 17.E
 _POSIX2_VERSION=199209 $xx -k1.1,1.2n $srcdir/18a.I > 18a.O 2> 18a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 18a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 18a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 18a.O $srcdir/18a.X > /dev/null 2>&1
@@ -1623,7 +1623,7 @@ test -s 18a.E || rm -f 18a.E
 _POSIX2_VERSION=199209 $xx -b -k1.1,1.2n $srcdir/18b.I > 18b.O 2> 18b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 18b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 18b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 18b.O $srcdir/18b.X > /dev/null 2>&1
@@ -1641,7 +1641,7 @@ test -s 18b.E || rm -f 18b.E
 _POSIX2_VERSION=199209 $xx -k1.1,1.2nb $srcdir/18c.I > 18c.O 2> 18c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 18c(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 18c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 18c.O $srcdir/18c.X > /dev/null 2>&1
@@ -1659,7 +1659,7 @@ test -s 18c.E || rm -f 18c.E
 _POSIX2_VERSION=199209 $xx -k1.1b,1.2n $srcdir/18d.I > 18d.O 2> 18d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 18d(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 18d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 18d.O $srcdir/18d.X > /dev/null 2>&1
@@ -1677,7 +1677,7 @@ test -s 18d.E || rm -f 18d.E
 _POSIX2_VERSION=199209 $xx -nb -k1.1,1.2 $srcdir/18e.I > 18e.O 2> 18e.E
 code=$?
 if test $code != 0; then
-  $echo "Test 18e(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 18e(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 18e.O $srcdir/18e.X > /dev/null 2>&1
@@ -1695,7 +1695,7 @@ test -s 18e.E || rm -f 18e.E
 _POSIX2_VERSION=199209 $xx +0 +1nr $srcdir/19a.I > 19a.O 2> 19a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 19a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 19a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 19a.O $srcdir/19a.X > /dev/null 2>&1
@@ -1713,7 +1713,7 @@ test -s 19a.E || rm -f 19a.E
 _POSIX2_VERSION=199209 $xx -k1,1 -k2nr $srcdir/19b.I > 19b.O 2> 19b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 19b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 19b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 19b.O $srcdir/19b.X > /dev/null 2>&1
@@ -1731,7 +1731,7 @@ test -s 19b.E || rm -f 19b.E
 _POSIX2_VERSION=199209 $xx  $srcdir/20a.I > 20a.O 2> 20a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 20a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 20a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 20a.O $srcdir/20a.X > /dev/null 2>&1
@@ -1749,7 +1749,7 @@ test -s 20a.E || rm -f 20a.E
 _POSIX2_VERSION=199209 $xx  $srcdir/21a.I > 21a.O 2> 21a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 21a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 21a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 21a.O $srcdir/21a.X > /dev/null 2>&1
@@ -1767,7 +1767,7 @@ test -s 21a.E || rm -f 21a.E
 _POSIX2_VERSION=199209 $xx -f $srcdir/21b.I > 21b.O 2> 21b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 21b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 21b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 21b.O $srcdir/21b.X > /dev/null 2>&1
@@ -1785,7 +1785,7 @@ test -s 21b.E || rm -f 21b.E
 _POSIX2_VERSION=199209 $xx -f $srcdir/21c.I > 21c.O 2> 21c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 21c(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 21c(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 21c.O $srcdir/21c.X > /dev/null 2>&1
@@ -1803,7 +1803,7 @@ test -s 21c.E || rm -f 21c.E
 _POSIX2_VERSION=199209 $xx -f $srcdir/21d.I > 21d.O 2> 21d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 21d(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 21d(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 21d.O $srcdir/21d.X > /dev/null 2>&1
@@ -1821,7 +1821,7 @@ test -s 21d.E || rm -f 21d.E
 _POSIX2_VERSION=199209 $xx -f $srcdir/21e.I > 21e.O 2> 21e.E
 code=$?
 if test $code != 0; then
-  $echo "Test 21e(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 21e(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 21e.O $srcdir/21e.X > /dev/null 2>&1
@@ -1839,7 +1839,7 @@ test -s 21e.E || rm -f 21e.E
 _POSIX2_VERSION=199209 $xx -fs $srcdir/21f.I > 21f.O 2> 21f.E
 code=$?
 if test $code != 0; then
-  $echo "Test 21f(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 21f(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 21f.O $srcdir/21f.X > /dev/null 2>&1
@@ -1857,7 +1857,7 @@ test -s 21f.E || rm -f 21f.E
 _POSIX2_VERSION=199209 $xx -fu $srcdir/21g.I > 21g.O 2> 21g.E
 code=$?
 if test $code != 0; then
-  $echo "Test 21g(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 21g(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 21g.O $srcdir/21g.X > /dev/null 2>&1
@@ -1875,7 +1875,7 @@ test -s 21g.E || rm -f 21g.E
 _POSIX2_VERSION=199209 $xx -k 2,2fd -k 1,1r $srcdir/22a.I > 22a.O 2> 22a.E
 code=$?
 if test $code != 0; then
-  $echo "Test 22a(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 22a(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 22a.O $srcdir/22a.X > /dev/null 2>&1
@@ -1893,7 +1893,7 @@ test -s 22a.E || rm -f 22a.E
 _POSIX2_VERSION=199209 $xx -k 2,2d  -k 1,1r $srcdir/22b.I > 22b.O 2> 22b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 22b(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test 22b(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 22b.O $srcdir/22b.X > /dev/null 2>&1
@@ -1911,7 +1911,7 @@ test -s 22b.E || rm -f 22b.E
 _POSIX2_VERSION=199209 $xx no-file  > no-file1.O 2> no-file1.E
 code=$?
 if test $code != 2; then
-  $echo "Test no-file1(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 2" 1>&2
+  $echo "Test no-file1(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
   cmp no-file1.O $srcdir/no-file1.X > /dev/null 2>&1
@@ -1929,7 +1929,7 @@ test -s no-file1.E || rm -f no-file1.E
 _POSIX2_VERSION=199209 $xx -o no-such-file no-such-file  > o-no-file1.O 2> o-no-file1.E
 code=$?
 if test $code != 2; then
-  $echo "Test o-no-file1(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 2" 1>&2
+  $echo "Test o-no-file1(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
   cmp o-no-file1.O $srcdir/o-no-file1.X > /dev/null 2>&1
@@ -1947,7 +1947,7 @@ test -s o-no-file1.E || rm -f o-no-file1.E
 _POSIX2_VERSION=199209 $xx -o no/such/file /dev/null  > create-empty.O 2> create-empty.E
 code=$?
 if test $code != 2; then
-  $echo "Test create-empty(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 2" 1>&2
+  $echo "Test create-empty(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
   cmp create-empty.O $srcdir/create-empty.X > /dev/null 2>&1
@@ -1965,7 +1965,7 @@ test -s create-empty.E || rm -f create-empty.E
 _POSIX2_VERSION=199209 $xx -n $srcdir/neg-nls.I > neg-nls.O 2> neg-nls.E
 code=$?
 if test $code != 0; then
-  $echo "Test neg-nls(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test neg-nls(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp neg-nls.O $srcdir/neg-nls.X > /dev/null 2>&1
@@ -1983,7 +1983,7 @@ test -s neg-nls.E || rm -f neg-nls.E
 _POSIX2_VERSION=199209 $xx  $srcdir/nul-nls.I > nul-nls.O 2> nul-nls.E
 code=$?
 if test $code != 0; then
-  $echo "Test nul-nls(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test nul-nls(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp nul-nls.O $srcdir/nul-nls.X > /dev/null 2>&1
@@ -2001,7 +2001,7 @@ test -s nul-nls.E || rm -f nul-nls.E
 _POSIX2_VERSION=199209 $xx  $srcdir/use-nl.I > use-nl.O 2> use-nl.E
 code=$?
 if test $code != 0; then
-  $echo "Test use-nl(_POSIX2_VERSION=199209) failed: ../../src/sort return code $code differs from expected value 0" 1>&2
+  $echo "Test use-nl(_POSIX2_VERSION=199209) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp use-nl.O $srcdir/use-nl.X > /dev/null 2>&1
diff --git a/tests/tac/tac-tests b/tests/tac/tac-tests
index 32c08613b..e5ac9b5de 100755
--- a/tests/tac/tac-tests
+++ b/tests/tac/tac-tests
@@ -21,7 +21,7 @@ export LANG
 $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
+  $echo "Test basic-0(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-0.O $srcdir/basic-0.X > /dev/null 2>&1
@@ -39,7 +39,7 @@ test -s basic-0.E || rm -f 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
+  $echo "Test basic-0(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-0.O $srcdir/basic-0.X > /dev/null 2>&1
@@ -57,7 +57,7 @@ test -s basic-0.E || rm -f 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
+  $echo "Test basic-0(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-0.O $srcdir/basic-0.X > /dev/null 2>&1
@@ -75,7 +75,7 @@ test -s basic-0.E || rm -f basic-0.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
+  $echo "Test basic-b(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-b.O $srcdir/basic-b.X > /dev/null 2>&1
@@ -93,7 +93,7 @@ test -s basic-b.E || rm -f 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
+  $echo "Test basic-b(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-b.O $srcdir/basic-b.X > /dev/null 2>&1
@@ -111,7 +111,7 @@ test -s basic-b.E || rm -f 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
+  $echo "Test basic-b(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-b.O $srcdir/basic-b.X > /dev/null 2>&1
@@ -129,7 +129,7 @@ test -s basic-b.E || rm -f basic-b.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
+  $echo "Test basic-c(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-c.O $srcdir/basic-c.X > /dev/null 2>&1
@@ -147,7 +147,7 @@ test -s basic-c.E || rm -f 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
+  $echo "Test basic-c(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-c.O $srcdir/basic-c.X > /dev/null 2>&1
@@ -165,7 +165,7 @@ test -s basic-c.E || rm -f 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
+  $echo "Test basic-c(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-c.O $srcdir/basic-c.X > /dev/null 2>&1
@@ -183,7 +183,7 @@ test -s basic-c.E || rm -f basic-c.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
+  $echo "Test basic-e(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-e.O $srcdir/basic-e.X > /dev/null 2>&1
@@ -201,7 +201,7 @@ test -s basic-e.E || rm -f 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
+  $echo "Test basic-e(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-e.O $srcdir/basic-e.X > /dev/null 2>&1
@@ -219,7 +219,7 @@ test -s basic-e.E || rm -f 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
+  $echo "Test basic-e(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-e.O $srcdir/basic-e.X > /dev/null 2>&1
@@ -237,7 +237,7 @@ test -s basic-e.E || rm -f basic-e.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
+  $echo "Test basic-f(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-f.O $srcdir/basic-f.X > /dev/null 2>&1
@@ -255,7 +255,7 @@ test -s basic-f.E || rm -f 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
+  $echo "Test basic-f(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-f.O $srcdir/basic-f.X > /dev/null 2>&1
@@ -273,7 +273,7 @@ test -s basic-f.E || rm -f 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
+  $echo "Test basic-f(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-f.O $srcdir/basic-f.X > /dev/null 2>&1
@@ -291,7 +291,7 @@ test -s basic-f.E || rm -f basic-f.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
+  $echo "Test basic-g(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-g.O $srcdir/basic-g.X > /dev/null 2>&1
@@ -309,7 +309,7 @@ test -s basic-g.E || rm -f 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
+  $echo "Test basic-g(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-g.O $srcdir/basic-g.X > /dev/null 2>&1
@@ -327,7 +327,7 @@ test -s basic-g.E || rm -f 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
+  $echo "Test basic-g(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-g.O $srcdir/basic-g.X > /dev/null 2>&1
@@ -345,7 +345,7 @@ test -s basic-g.E || rm -f basic-g.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
+  $echo "Test basic-h(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-h.O $srcdir/basic-h.X > /dev/null 2>&1
@@ -363,7 +363,7 @@ test -s basic-h.E || rm -f 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
+  $echo "Test basic-h(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-h.O $srcdir/basic-h.X > /dev/null 2>&1
@@ -381,7 +381,7 @@ test -s basic-h.E || rm -f 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
+  $echo "Test basic-h(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-h.O $srcdir/basic-h.X > /dev/null 2>&1
@@ -399,7 +399,7 @@ test -s basic-h.E || rm -f basic-h.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
+  $echo "Test basic-i(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-i.O $srcdir/basic-i.X > /dev/null 2>&1
@@ -417,7 +417,7 @@ test -s basic-i.E || rm -f 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
+  $echo "Test basic-i(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-i.O $srcdir/basic-i.X > /dev/null 2>&1
@@ -435,7 +435,7 @@ test -s basic-i.E || rm -f 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
+  $echo "Test basic-i(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-i.O $srcdir/basic-i.X > /dev/null 2>&1
@@ -453,7 +453,7 @@ test -s basic-i.E || rm -f basic-i.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
+  $echo "Test basic-j(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-j.O $srcdir/basic-j.X > /dev/null 2>&1
@@ -471,7 +471,7 @@ test -s basic-j.E || rm -f 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
+  $echo "Test basic-j(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-j.O $srcdir/basic-j.X > /dev/null 2>&1
@@ -489,7 +489,7 @@ test -s basic-j.E || rm -f 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
+  $echo "Test basic-j(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-j.O $srcdir/basic-j.X > /dev/null 2>&1
@@ -507,7 +507,7 @@ test -s basic-j.E || rm -f basic-j.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
+  $echo "Test basic-k(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-k.O $srcdir/basic-k.X > /dev/null 2>&1
@@ -525,7 +525,7 @@ test -s basic-k.E || rm -f 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
+  $echo "Test basic-k(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-k.O $srcdir/basic-k.X > /dev/null 2>&1
@@ -543,7 +543,7 @@ test -s basic-k.E || rm -f 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
+  $echo "Test basic-k(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp basic-k.O $srcdir/basic-k.X > /dev/null 2>&1
@@ -561,7 +561,7 @@ test -s basic-k.E || rm -f basic-k.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
+  $echo "Test opt-b(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-b.O $srcdir/opt-b.X > /dev/null 2>&1
@@ -579,7 +579,7 @@ test -s opt-b.E || rm -f 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
+  $echo "Test opt-b(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-b.O $srcdir/opt-b.X > /dev/null 2>&1
@@ -597,7 +597,7 @@ test -s opt-b.E || rm -f 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
+  $echo "Test opt-b(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-b.O $srcdir/opt-b.X > /dev/null 2>&1
@@ -615,7 +615,7 @@ test -s opt-b.E || rm -f opt-b.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
+  $echo "Test opt-s(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-s.O $srcdir/opt-s.X > /dev/null 2>&1
@@ -633,7 +633,7 @@ test -s opt-s.E || rm -f 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
+  $echo "Test opt-s(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-s.O $srcdir/opt-s.X > /dev/null 2>&1
@@ -651,7 +651,7 @@ test -s opt-s.E || rm -f 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
+  $echo "Test opt-s(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-s.O $srcdir/opt-s.X > /dev/null 2>&1
@@ -669,7 +669,7 @@ test -s opt-s.E || rm -f opt-s.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
+  $echo "Test opt-sb(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-sb.O $srcdir/opt-sb.X > /dev/null 2>&1
@@ -687,7 +687,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test opt-sb(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
+  $echo "Test opt-sb(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-sb.O $srcdir/opt-sb.X > /dev/null 2>&1
@@ -705,7 +705,7 @@ test -s opt-sb.E || rm -f 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
+  $echo "Test opt-sb(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-sb.O $srcdir/opt-sb.X > /dev/null 2>&1
@@ -723,7 +723,7 @@ test -s opt-sb.E || rm -f opt-sb.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
+  $echo "Test opt-r(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-r.O $srcdir/opt-r.X > /dev/null 2>&1
@@ -741,7 +741,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test opt-r(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
+  $echo "Test opt-r(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-r.O $srcdir/opt-r.X > /dev/null 2>&1
@@ -759,7 +759,7 @@ test -s opt-r.E || rm -f 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
+  $echo "Test opt-r(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-r.O $srcdir/opt-r.X > /dev/null 2>&1
@@ -777,7 +777,7 @@ test -s opt-r.E || rm -f opt-r.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
+  $echo "Test opt-r2(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-r2.O $srcdir/opt-r2.X > /dev/null 2>&1
@@ -795,7 +795,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test opt-r2(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
+  $echo "Test opt-r2(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-r2.O $srcdir/opt-r2.X > /dev/null 2>&1
@@ -813,7 +813,7 @@ test -s opt-r2.E || rm -f 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
+  $echo "Test opt-r2(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-r2.O $srcdir/opt-r2.X > /dev/null 2>&1
@@ -831,7 +831,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test opt-br(F) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
+  $echo "Test opt-br(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-br.O $srcdir/opt-br.X > /dev/null 2>&1
@@ -849,7 +849,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test opt-br(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
+  $echo "Test opt-br(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-br.O $srcdir/opt-br.X > /dev/null 2>&1
@@ -867,7 +867,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test opt-br(<) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
+  $echo "Test opt-br(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-br.O $srcdir/opt-br.X > /dev/null 2>&1
@@ -885,7 +885,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test opt-br2(F) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
+  $echo "Test opt-br2(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-br2.O $srcdir/opt-br2.X > /dev/null 2>&1
@@ -903,7 +903,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test opt-br2(|) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
+  $echo "Test opt-br2(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-br2.O $srcdir/opt-br2.X > /dev/null 2>&1
@@ -921,7 +921,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test opt-br2(<) failed: ../../src/tac return code $code differs from expected value 0" 1>&2
+  $echo "Test opt-br2(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp opt-br2.O $srcdir/opt-br2.X > /dev/null 2>&1
diff --git a/tests/tail/tail-tests b/tests/tail/tail-tests
index 67909c525..cbdb37885 100755
--- a/tests/tail/tail-tests
+++ b/tests/tail/tail-tests
@@ -21,7 +21,7 @@ export LANG
 _POSIX2_VERSION=199209 $xx +2c $srcdir/obs-c1.I > obs-c1.O 2> obs-c1.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-c1(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c1(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-c1.O $srcdir/obs-c1.X > /dev/null 2>&1
@@ -39,7 +39,7 @@ test -s obs-c1.E || rm -f obs-c1.E
 cat $srcdir/obs-c1.I | _POSIX2_VERSION=199209 $xx +2c > obs-c1.O 2> obs-c1.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-c1(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c1(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-c1.O $srcdir/obs-c1.X > /dev/null 2>&1
@@ -57,7 +57,7 @@ test -s obs-c1.E || rm -f obs-c1.E
 _POSIX2_VERSION=199209 $xx +2c < $srcdir/obs-c1.I > obs-c1.O 2> obs-c1.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-c1(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c1(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-c1.O $srcdir/obs-c1.X > /dev/null 2>&1
@@ -75,7 +75,7 @@ test -s obs-c1.E || rm -f obs-c1.E
 _POSIX2_VERSION=199209 $xx +8c $srcdir/obs-c2.I > obs-c2.O 2> obs-c2.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-c2(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c2(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-c2.O $srcdir/obs-c2.X > /dev/null 2>&1
@@ -93,7 +93,7 @@ test -s obs-c2.E || rm -f obs-c2.E
 cat $srcdir/obs-c2.I | _POSIX2_VERSION=199209 $xx +8c > obs-c2.O 2> obs-c2.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-c2(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c2(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-c2.O $srcdir/obs-c2.X > /dev/null 2>&1
@@ -111,7 +111,7 @@ test -s obs-c2.E || rm -f obs-c2.E
 _POSIX2_VERSION=199209 $xx +8c < $srcdir/obs-c2.I > obs-c2.O 2> obs-c2.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-c2(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c2(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-c2.O $srcdir/obs-c2.X > /dev/null 2>&1
@@ -129,7 +129,7 @@ test -s obs-c2.E || rm -f obs-c2.E
 _POSIX2_VERSION=199209 $xx -1c $srcdir/obs-c3.I > obs-c3.O 2> obs-c3.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-c3(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c3(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-c3.O $srcdir/obs-c3.X > /dev/null 2>&1
@@ -147,7 +147,7 @@ test -s obs-c3.E || rm -f obs-c3.E
 cat $srcdir/obs-c3.I | _POSIX2_VERSION=199209 $xx -1c > obs-c3.O 2> obs-c3.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-c3(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c3(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-c3.O $srcdir/obs-c3.X > /dev/null 2>&1
@@ -165,7 +165,7 @@ test -s obs-c3.E || rm -f obs-c3.E
 _POSIX2_VERSION=199209 $xx -1c < $srcdir/obs-c3.I > obs-c3.O 2> obs-c3.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-c3(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c3(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-c3.O $srcdir/obs-c3.X > /dev/null 2>&1
@@ -183,7 +183,7 @@ test -s obs-c3.E || rm -f obs-c3.E
 _POSIX2_VERSION=199209 $xx -9c $srcdir/obs-c4.I > obs-c4.O 2> obs-c4.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-c4(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c4(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-c4.O $srcdir/obs-c4.X > /dev/null 2>&1
@@ -201,7 +201,7 @@ test -s obs-c4.E || rm -f obs-c4.E
 cat $srcdir/obs-c4.I | _POSIX2_VERSION=199209 $xx -9c > obs-c4.O 2> obs-c4.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-c4(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c4(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-c4.O $srcdir/obs-c4.X > /dev/null 2>&1
@@ -219,7 +219,7 @@ test -s obs-c4.E || rm -f obs-c4.E
 _POSIX2_VERSION=199209 $xx -9c < $srcdir/obs-c4.I > obs-c4.O 2> obs-c4.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-c4(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c4(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-c4.O $srcdir/obs-c4.X > /dev/null 2>&1
@@ -237,7 +237,7 @@ test -s obs-c4.E || rm -f obs-c4.E
 _POSIX2_VERSION=199209 $xx -12c $srcdir/obs-c5.I > obs-c5.O 2> obs-c5.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-c5(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c5(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-c5.O $srcdir/obs-c5.X > /dev/null 2>&1
@@ -255,7 +255,7 @@ test -s obs-c5.E || rm -f obs-c5.E
 cat $srcdir/obs-c5.I | _POSIX2_VERSION=199209 $xx -12c > obs-c5.O 2> obs-c5.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-c5(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c5(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-c5.O $srcdir/obs-c5.X > /dev/null 2>&1
@@ -273,7 +273,7 @@ test -s obs-c5.E || rm -f obs-c5.E
 _POSIX2_VERSION=199209 $xx -12c < $srcdir/obs-c5.I > obs-c5.O 2> obs-c5.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-c5(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c5(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-c5.O $srcdir/obs-c5.X > /dev/null 2>&1
@@ -291,7 +291,7 @@ test -s obs-c5.E || rm -f obs-c5.E
 _POSIX2_VERSION=199209 $xx -1l $srcdir/obs-l1.I > obs-l1.O 2> obs-l1.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-l1(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l1(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-l1.O $srcdir/obs-l1.X > /dev/null 2>&1
@@ -309,7 +309,7 @@ test -s obs-l1.E || rm -f obs-l1.E
 cat $srcdir/obs-l1.I | _POSIX2_VERSION=199209 $xx -1l > obs-l1.O 2> obs-l1.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-l1(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l1(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-l1.O $srcdir/obs-l1.X > /dev/null 2>&1
@@ -327,7 +327,7 @@ test -s obs-l1.E || rm -f obs-l1.E
 _POSIX2_VERSION=199209 $xx -1l < $srcdir/obs-l1.I > obs-l1.O 2> obs-l1.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-l1(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l1(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-l1.O $srcdir/obs-l1.X > /dev/null 2>&1
@@ -345,7 +345,7 @@ test -s obs-l1.E || rm -f obs-l1.E
 _POSIX2_VERSION=199209 $xx -1l $srcdir/obs-l2.I > obs-l2.O 2> obs-l2.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-l2(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l2(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-l2.O $srcdir/obs-l2.X > /dev/null 2>&1
@@ -363,7 +363,7 @@ test -s obs-l2.E || rm -f obs-l2.E
 cat $srcdir/obs-l2.I | _POSIX2_VERSION=199209 $xx -1l > obs-l2.O 2> obs-l2.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-l2(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l2(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-l2.O $srcdir/obs-l2.X > /dev/null 2>&1
@@ -381,7 +381,7 @@ test -s obs-l2.E || rm -f obs-l2.E
 _POSIX2_VERSION=199209 $xx -1l < $srcdir/obs-l2.I > obs-l2.O 2> obs-l2.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-l2(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l2(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-l2.O $srcdir/obs-l2.X > /dev/null 2>&1
@@ -399,7 +399,7 @@ test -s obs-l2.E || rm -f obs-l2.E
 _POSIX2_VERSION=199209 $xx -1l $srcdir/obs-l3.I > obs-l3.O 2> obs-l3.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-l3(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l3(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-l3.O $srcdir/obs-l3.X > /dev/null 2>&1
@@ -417,7 +417,7 @@ test -s obs-l3.E || rm -f obs-l3.E
 cat $srcdir/obs-l3.I | _POSIX2_VERSION=199209 $xx -1l > obs-l3.O 2> obs-l3.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-l3(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l3(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-l3.O $srcdir/obs-l3.X > /dev/null 2>&1
@@ -435,7 +435,7 @@ test -s obs-l3.E || rm -f obs-l3.E
 _POSIX2_VERSION=199209 $xx -1l < $srcdir/obs-l3.I > obs-l3.O 2> obs-l3.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-l3(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l3(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-l3.O $srcdir/obs-l3.X > /dev/null 2>&1
@@ -453,7 +453,7 @@ test -s obs-l3.E || rm -f obs-l3.E
 _POSIX2_VERSION=199209 $xx +1l $srcdir/obs-l4.I > obs-l4.O 2> obs-l4.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-l4(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l4(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-l4.O $srcdir/obs-l4.X > /dev/null 2>&1
@@ -471,7 +471,7 @@ test -s obs-l4.E || rm -f obs-l4.E
 cat $srcdir/obs-l4.I | _POSIX2_VERSION=199209 $xx +1l > obs-l4.O 2> obs-l4.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-l4(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l4(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-l4.O $srcdir/obs-l4.X > /dev/null 2>&1
@@ -489,7 +489,7 @@ test -s obs-l4.E || rm -f obs-l4.E
 _POSIX2_VERSION=199209 $xx +1l < $srcdir/obs-l4.I > obs-l4.O 2> obs-l4.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-l4(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l4(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-l4.O $srcdir/obs-l4.X > /dev/null 2>&1
@@ -507,7 +507,7 @@ test -s obs-l4.E || rm -f obs-l4.E
 _POSIX2_VERSION=199209 $xx +2l $srcdir/obs-l5.I > obs-l5.O 2> obs-l5.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-l5(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l5(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-l5.O $srcdir/obs-l5.X > /dev/null 2>&1
@@ -525,7 +525,7 @@ test -s obs-l5.E || rm -f obs-l5.E
 cat $srcdir/obs-l5.I | _POSIX2_VERSION=199209 $xx +2l > obs-l5.O 2> obs-l5.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-l5(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l5(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-l5.O $srcdir/obs-l5.X > /dev/null 2>&1
@@ -543,7 +543,7 @@ test -s obs-l5.E || rm -f obs-l5.E
 _POSIX2_VERSION=199209 $xx +2l < $srcdir/obs-l5.I > obs-l5.O 2> obs-l5.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-l5(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l5(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-l5.O $srcdir/obs-l5.X > /dev/null 2>&1
@@ -561,7 +561,7 @@ test -s obs-l5.E || rm -f obs-l5.E
 _POSIX2_VERSION=199209 $xx -1 $srcdir/obs-1.I > obs-1.O 2> obs-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-1(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-1(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-1.O $srcdir/obs-1.X > /dev/null 2>&1
@@ -579,7 +579,7 @@ test -s obs-1.E || rm -f obs-1.E
 cat $srcdir/obs-1.I | _POSIX2_VERSION=199209 $xx -1 > obs-1.O 2> obs-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-1(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-1(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-1.O $srcdir/obs-1.X > /dev/null 2>&1
@@ -597,7 +597,7 @@ test -s obs-1.E || rm -f obs-1.E
 _POSIX2_VERSION=199209 $xx -1 < $srcdir/obs-1.I > obs-1.O 2> obs-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-1(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-1(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-1.O $srcdir/obs-1.X > /dev/null 2>&1
@@ -615,7 +615,7 @@ test -s obs-1.E || rm -f obs-1.E
 _POSIX2_VERSION=199209 $xx -1 $srcdir/obs-2.I > obs-2.O 2> obs-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-2(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-2(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-2.O $srcdir/obs-2.X > /dev/null 2>&1
@@ -633,7 +633,7 @@ test -s obs-2.E || rm -f obs-2.E
 cat $srcdir/obs-2.I | _POSIX2_VERSION=199209 $xx -1 > obs-2.O 2> obs-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-2(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-2(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-2.O $srcdir/obs-2.X > /dev/null 2>&1
@@ -651,7 +651,7 @@ test -s obs-2.E || rm -f obs-2.E
 _POSIX2_VERSION=199209 $xx -1 < $srcdir/obs-2.I > obs-2.O 2> obs-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-2(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-2(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-2.O $srcdir/obs-2.X > /dev/null 2>&1
@@ -669,7 +669,7 @@ test -s obs-2.E || rm -f obs-2.E
 _POSIX2_VERSION=199209 $xx -1 $srcdir/obs-3.I > obs-3.O 2> obs-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-3(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-3(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-3.O $srcdir/obs-3.X > /dev/null 2>&1
@@ -687,7 +687,7 @@ test -s obs-3.E || rm -f obs-3.E
 cat $srcdir/obs-3.I | _POSIX2_VERSION=199209 $xx -1 > obs-3.O 2> obs-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-3(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-3(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-3.O $srcdir/obs-3.X > /dev/null 2>&1
@@ -705,7 +705,7 @@ test -s obs-3.E || rm -f obs-3.E
 _POSIX2_VERSION=199209 $xx -1 < $srcdir/obs-3.I > obs-3.O 2> obs-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-3(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-3(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-3.O $srcdir/obs-3.X > /dev/null 2>&1
@@ -723,7 +723,7 @@ test -s obs-3.E || rm -f obs-3.E
 _POSIX2_VERSION=199209 $xx +1 $srcdir/obs-4.I > obs-4.O 2> obs-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-4(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-4(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-4.O $srcdir/obs-4.X > /dev/null 2>&1
@@ -741,7 +741,7 @@ test -s obs-4.E || rm -f obs-4.E
 cat $srcdir/obs-4.I | _POSIX2_VERSION=199209 $xx +1 > obs-4.O 2> obs-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-4(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-4(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-4.O $srcdir/obs-4.X > /dev/null 2>&1
@@ -759,7 +759,7 @@ test -s obs-4.E || rm -f obs-4.E
 _POSIX2_VERSION=199209 $xx +1 < $srcdir/obs-4.I > obs-4.O 2> obs-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-4(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-4(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-4.O $srcdir/obs-4.X > /dev/null 2>&1
@@ -777,7 +777,7 @@ test -s obs-4.E || rm -f obs-4.E
 _POSIX2_VERSION=199209 $xx +2 $srcdir/obs-5.I > obs-5.O 2> obs-5.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-5(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-5(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-5.O $srcdir/obs-5.X > /dev/null 2>&1
@@ -795,7 +795,7 @@ test -s obs-5.E || rm -f obs-5.E
 cat $srcdir/obs-5.I | _POSIX2_VERSION=199209 $xx +2 > obs-5.O 2> obs-5.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-5(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-5(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-5.O $srcdir/obs-5.X > /dev/null 2>&1
@@ -813,7 +813,7 @@ test -s obs-5.E || rm -f obs-5.E
 _POSIX2_VERSION=199209 $xx +2 < $srcdir/obs-5.I > obs-5.O 2> obs-5.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-5(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-5(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-5.O $srcdir/obs-5.X > /dev/null 2>&1
@@ -831,7 +831,7 @@ test -s obs-5.E || rm -f obs-5.E
 _POSIX2_VERSION=199209 $xx +c $srcdir/obsx-1.I > obsx-1.O 2> obsx-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test obsx-1(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obsx-1(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obsx-1.O $srcdir/obsx-1.X > /dev/null 2>&1
@@ -849,7 +849,7 @@ test -s obsx-1.E || rm -f obsx-1.E
 cat $srcdir/obsx-1.I | _POSIX2_VERSION=199209 $xx +c > obsx-1.O 2> obsx-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test obsx-1(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obsx-1(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obsx-1.O $srcdir/obsx-1.X > /dev/null 2>&1
@@ -867,7 +867,7 @@ test -s obsx-1.E || rm -f obsx-1.E
 _POSIX2_VERSION=199209 $xx +c < $srcdir/obsx-1.I > obsx-1.O 2> obsx-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test obsx-1(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obsx-1(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obsx-1.O $srcdir/obsx-1.X > /dev/null 2>&1
@@ -885,7 +885,7 @@ test -s obsx-1.E || rm -f obsx-1.E
 _POSIX2_VERSION=199209 $xx +l $srcdir/obsx-2.I > obsx-2.O 2> obsx-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test obsx-2(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obsx-2(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obsx-2.O $srcdir/obsx-2.X > /dev/null 2>&1
@@ -903,7 +903,7 @@ test -s obsx-2.E || rm -f obsx-2.E
 cat $srcdir/obsx-2.I | _POSIX2_VERSION=199209 $xx +l > obsx-2.O 2> obsx-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test obsx-2(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obsx-2(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obsx-2.O $srcdir/obsx-2.X > /dev/null 2>&1
@@ -921,7 +921,7 @@ test -s obsx-2.E || rm -f obsx-2.E
 _POSIX2_VERSION=199209 $xx +l < $srcdir/obsx-2.I > obsx-2.O 2> obsx-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test obsx-2(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obsx-2(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obsx-2.O $srcdir/obsx-2.X > /dev/null 2>&1
@@ -939,7 +939,7 @@ test -s obsx-2.E || rm -f obsx-2.E
 _POSIX2_VERSION=199209 $xx -l $srcdir/obs-l.I > obs-l.O 2> obs-l.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-l(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-l.O $srcdir/obs-l.X > /dev/null 2>&1
@@ -957,7 +957,7 @@ test -s obs-l.E || rm -f obs-l.E
 cat $srcdir/obs-l.I | _POSIX2_VERSION=199209 $xx -l > obs-l.O 2> obs-l.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-l(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-l.O $srcdir/obs-l.X > /dev/null 2>&1
@@ -975,7 +975,7 @@ test -s obs-l.E || rm -f obs-l.E
 _POSIX2_VERSION=199209 $xx -l < $srcdir/obs-l.I > obs-l.O 2> obs-l.E
 code=$?
 if test $code != 0; then
-  $echo "Test obs-l(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp obs-l.O $srcdir/obs-l.X > /dev/null 2>&1
@@ -993,7 +993,7 @@ test -s obs-l.E || rm -f obs-l.E
 _POSIX2_VERSION=199209 $xx +cl $srcdir/err-1.I > err-1.O 2> err-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test err-1(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  $echo "Test err-1(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp err-1.O $srcdir/err-1.X > /dev/null 2>&1
@@ -1011,7 +1011,7 @@ test -s err-1.E || rm -f err-1.E
 cat $srcdir/err-1.I | _POSIX2_VERSION=199209 $xx +cl > err-1.O 2> err-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test err-1(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  $echo "Test err-1(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp err-1.O $srcdir/err-1.X > /dev/null 2>&1
@@ -1029,7 +1029,7 @@ test -s err-1.E || rm -f err-1.E
 _POSIX2_VERSION=199209 $xx +cl < $srcdir/err-1.I > err-1.O 2> err-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test err-1(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  $echo "Test err-1(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp err-1.O $srcdir/err-1.X > /dev/null 2>&1
@@ -1047,7 +1047,7 @@ test -s err-1.E || rm -f err-1.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
+  $echo "Test err-2(F) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp err-2.O $srcdir/err-2.X > /dev/null 2>&1
@@ -1065,7 +1065,7 @@ test -s err-2.E || rm -f 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
+  $echo "Test err-2(|) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp err-2.O $srcdir/err-2.X > /dev/null 2>&1
@@ -1083,7 +1083,7 @@ test -s err-2.E || rm -f 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
+  $echo "Test err-2(<) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp err-2.O $srcdir/err-2.X > /dev/null 2>&1
@@ -1101,7 +1101,7 @@ test -s err-2.E || rm -f err-2.E
 _POSIX2_VERSION=199209 $xx +2cz $srcdir/err-3.I > err-3.O 2> err-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test err-3(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  $echo "Test err-3(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp err-3.O $srcdir/err-3.X > /dev/null 2>&1
@@ -1119,7 +1119,7 @@ test -s err-3.E || rm -f err-3.E
 cat $srcdir/err-3.I | _POSIX2_VERSION=199209 $xx +2cz > err-3.O 2> err-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test err-3(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  $echo "Test err-3(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp err-3.O $srcdir/err-3.X > /dev/null 2>&1
@@ -1137,7 +1137,7 @@ test -s err-3.E || rm -f err-3.E
 _POSIX2_VERSION=199209 $xx +2cz < $srcdir/err-3.I > err-3.O 2> err-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test err-3(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  $echo "Test err-3(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp err-3.O $srcdir/err-3.X > /dev/null 2>&1
@@ -1155,7 +1155,7 @@ test -s err-3.E || rm -f err-3.E
 _POSIX2_VERSION=199209 $xx -2cX $srcdir/err-4.I > err-4.O 2> err-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test err-4(_POSIX2_VERSION=199209:F) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  $echo "Test err-4(_POSIX2_VERSION=199209:F) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp err-4.O $srcdir/err-4.X > /dev/null 2>&1
@@ -1173,7 +1173,7 @@ test -s err-4.E || rm -f err-4.E
 cat $srcdir/err-4.I | _POSIX2_VERSION=199209 $xx -2cX > err-4.O 2> err-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test err-4(_POSIX2_VERSION=199209:|) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  $echo "Test err-4(_POSIX2_VERSION=199209:|) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp err-4.O $srcdir/err-4.X > /dev/null 2>&1
@@ -1191,7 +1191,7 @@ test -s err-4.E || rm -f err-4.E
 _POSIX2_VERSION=199209 $xx -2cX < $srcdir/err-4.I > err-4.O 2> err-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test err-4(_POSIX2_VERSION=199209:<) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  $echo "Test err-4(_POSIX2_VERSION=199209:<) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp err-4.O $srcdir/err-4.X > /dev/null 2>&1
@@ -1209,7 +1209,7 @@ test -s err-4.E || rm -f err-4.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
+  $echo "Test err-5(F) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp err-5.O $srcdir/err-5.X > /dev/null 2>&1
@@ -1227,7 +1227,7 @@ test -s err-5.E || rm -f 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
+  $echo "Test err-5(|) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp err-5.O $srcdir/err-5.X > /dev/null 2>&1
@@ -1245,7 +1245,7 @@ test -s err-5.E || rm -f 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
+  $echo "Test err-5(<) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp err-5.O $srcdir/err-5.X > /dev/null 2>&1
@@ -1263,7 +1263,7 @@ test -s err-5.E || rm -f err-5.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
+  $echo "Test err-6(F) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp err-6.O $srcdir/err-6.X > /dev/null 2>&1
@@ -1281,7 +1281,7 @@ test -s err-6.E || rm -f 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
+  $echo "Test err-6(|) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp err-6.O $srcdir/err-6.X > /dev/null 2>&1
@@ -1299,7 +1299,7 @@ test -s err-6.E || rm -f 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
+  $echo "Test err-6(<) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp err-6.O $srcdir/err-6.X > /dev/null 2>&1
@@ -1317,7 +1317,7 @@ test -s err-6.E || rm -f err-6.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
+  $echo "Test minus-1(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp minus-1.O $srcdir/minus-1.X > /dev/null 2>&1
@@ -1335,7 +1335,7 @@ test -s minus-1.E || rm -f 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
+  $echo "Test minus-1(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp minus-1.O $srcdir/minus-1.X > /dev/null 2>&1
@@ -1353,7 +1353,7 @@ test -s minus-1.E || rm -f minus-1.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
+  $echo "Test minus-2(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp minus-2.O $srcdir/minus-2.X > /dev/null 2>&1
@@ -1371,7 +1371,7 @@ test -s minus-2.E || rm -f 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
+  $echo "Test minus-2(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp minus-2.O $srcdir/minus-2.X > /dev/null 2>&1
@@ -1389,7 +1389,7 @@ test -s minus-2.E || rm -f minus-2.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
+  $echo "Test n-1(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-1.O $srcdir/n-1.X > /dev/null 2>&1
@@ -1407,7 +1407,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test n-1(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test n-1(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-1.O $srcdir/n-1.X > /dev/null 2>&1
@@ -1425,7 +1425,7 @@ test -s n-1.E || rm -f 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
+  $echo "Test n-1(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-1.O $srcdir/n-1.X > /dev/null 2>&1
@@ -1443,7 +1443,7 @@ test -s n-1.E || rm -f n-1.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
+  $echo "Test n-2(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-2.O $srcdir/n-2.X > /dev/null 2>&1
@@ -1461,7 +1461,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test n-2(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test n-2(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-2.O $srcdir/n-2.X > /dev/null 2>&1
@@ -1479,7 +1479,7 @@ test -s n-2.E || rm -f 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
+  $echo "Test n-2(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-2.O $srcdir/n-2.X > /dev/null 2>&1
@@ -1497,7 +1497,7 @@ test -s n-2.E || rm -f n-2.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
+  $echo "Test n-3(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-3.O $srcdir/n-3.X > /dev/null 2>&1
@@ -1515,7 +1515,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test n-3(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test n-3(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-3.O $srcdir/n-3.X > /dev/null 2>&1
@@ -1533,7 +1533,7 @@ test -s n-3.E || rm -f 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
+  $echo "Test n-3(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-3.O $srcdir/n-3.X > /dev/null 2>&1
@@ -1551,7 +1551,7 @@ test -s n-3.E || rm -f n-3.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
+  $echo "Test n-4(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-4.O $srcdir/n-4.X > /dev/null 2>&1
@@ -1569,7 +1569,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test n-4(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test n-4(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-4.O $srcdir/n-4.X > /dev/null 2>&1
@@ -1587,7 +1587,7 @@ test -s n-4.E || rm -f 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
+  $echo "Test n-4(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-4.O $srcdir/n-4.X > /dev/null 2>&1
@@ -1605,7 +1605,7 @@ test -s n-4.E || rm -f n-4.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
+  $echo "Test n-4a(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-4a.O $srcdir/n-4a.X > /dev/null 2>&1
@@ -1623,7 +1623,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test n-4a(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test n-4a(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-4a.O $srcdir/n-4a.X > /dev/null 2>&1
@@ -1641,7 +1641,7 @@ test -s n-4a.E || rm -f 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
+  $echo "Test n-4a(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-4a.O $srcdir/n-4a.X > /dev/null 2>&1
@@ -1659,7 +1659,7 @@ test -s n-4a.E || rm -f n-4a.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
+  $echo "Test n-5(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-5.O $srcdir/n-5.X > /dev/null 2>&1
@@ -1677,7 +1677,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test n-5(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test n-5(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-5.O $srcdir/n-5.X > /dev/null 2>&1
@@ -1695,7 +1695,7 @@ test -s n-5.E || rm -f 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
+  $echo "Test n-5(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-5.O $srcdir/n-5.X > /dev/null 2>&1
@@ -1713,7 +1713,7 @@ test -s n-5.E || rm -f n-5.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
+  $echo "Test n-5a(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-5a.O $srcdir/n-5a.X > /dev/null 2>&1
@@ -1731,7 +1731,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test n-5a(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test n-5a(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-5a.O $srcdir/n-5a.X > /dev/null 2>&1
@@ -1749,7 +1749,7 @@ test -s n-5a.E || rm -f 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
+  $echo "Test n-5a(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-5a.O $srcdir/n-5a.X > /dev/null 2>&1
@@ -1767,7 +1767,7 @@ test -s n-5a.E || rm -f n-5a.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
+  $echo "Test n-5b(F) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-5b.O $srcdir/n-5b.X > /dev/null 2>&1
@@ -1785,7 +1785,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test n-5b(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test n-5b(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-5b.O $srcdir/n-5b.X > /dev/null 2>&1
@@ -1803,7 +1803,7 @@ test -s n-5b.E || rm -f 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
+  $echo "Test n-5b(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n-5b.O $srcdir/n-5b.X > /dev/null 2>&1
diff --git a/tests/test/test-tests b/tests/test/test-tests
index 0b387b9b6..aaa4edf02 100755
--- a/tests/test/test-tests
+++ b/tests/test/test-tests
@@ -21,7 +21,7 @@ export LANG
 $xx 9 -ne 9  > ne-1.O 2> ne-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test ne-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test ne-1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ne-1.O $srcdir/ne-1.X > /dev/null 2>&1
@@ -39,7 +39,7 @@ test -s ne-1.E || rm -f ne-1.E
 $xx 0 -ne 0  > ne-2.O 2> ne-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test ne-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test ne-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ne-2.O $srcdir/ne-2.X > /dev/null 2>&1
@@ -57,7 +57,7 @@ test -s ne-2.E || rm -f ne-2.E
 $xx 0 -ne 00  > ne-3.O 2> ne-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test ne-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test ne-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ne-3.O $srcdir/ne-3.X > /dev/null 2>&1
@@ -75,7 +75,7 @@ test -s ne-3.E || rm -f ne-3.E
 $xx 8 -ne 9  > ne-4.O 2> ne-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test ne-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test ne-4 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ne-4.O $srcdir/ne-4.X > /dev/null 2>&1
@@ -93,7 +93,7 @@ test -s ne-4.E || rm -f ne-4.E
 $xx 1 -ne 0  > ne-5.O 2> ne-5.E
 code=$?
 if test $code != 0; then
-  $echo "Test ne-5 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test ne-5 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ne-5.O $srcdir/ne-5.X > /dev/null 2>&1
@@ -111,7 +111,7 @@ test -s ne-5.E || rm -f ne-5.E
 $xx 5 -le 5  > le-1.O 2> le-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test le-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test le-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp le-1.O $srcdir/le-1.X > /dev/null 2>&1
@@ -129,7 +129,7 @@ test -s le-1.E || rm -f le-1.E
 $xx 5 -le 4  > le-2.O 2> le-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test le-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test le-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp le-2.O $srcdir/le-2.X > /dev/null 2>&1
@@ -147,7 +147,7 @@ test -s le-2.E || rm -f le-2.E
 $xx 4 -le 5  > le-3.O 2> le-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test le-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test le-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp le-3.O $srcdir/le-3.X > /dev/null 2>&1
@@ -165,7 +165,7 @@ test -s le-3.E || rm -f le-3.E
 $xx -1 -le -2  > le-4.O 2> le-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test le-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test le-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp le-4.O $srcdir/le-4.X > /dev/null 2>&1
@@ -183,7 +183,7 @@ test -s le-4.E || rm -f le-4.E
 $xx 5 -ge 5  > ge-1.O 2> ge-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test ge-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test ge-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ge-1.O $srcdir/ge-1.X > /dev/null 2>&1
@@ -201,7 +201,7 @@ test -s ge-1.E || rm -f ge-1.E
 $xx 5 -ge 4  > ge-2.O 2> ge-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test ge-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test ge-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ge-2.O $srcdir/ge-2.X > /dev/null 2>&1
@@ -219,7 +219,7 @@ test -s ge-2.E || rm -f ge-2.E
 $xx 4 -ge 5  > ge-3.O 2> ge-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test ge-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test ge-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ge-3.O $srcdir/ge-3.X > /dev/null 2>&1
@@ -237,7 +237,7 @@ test -s ge-3.E || rm -f ge-3.E
 $xx -1 -ge -2  > ge-4.O 2> ge-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test ge-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test ge-4 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ge-4.O $srcdir/ge-4.X > /dev/null 2>&1
@@ -255,7 +255,7 @@ test -s ge-4.E || rm -f ge-4.E
 $xx ! -z ''  > N-1b.O 2> N-1b.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-1b failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-1b failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-1b.O $srcdir/N-1b.X > /dev/null 2>&1
@@ -273,7 +273,7 @@ test -s N-1b.E || rm -f N-1b.E
 $xx '(' -z '' ')'  > P-1b.O 2> P-1b.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-1b failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-1b failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-1b.O $srcdir/P-1b.X > /dev/null 2>&1
@@ -291,7 +291,7 @@ test -s P-1b.E || rm -f P-1b.E
 $xx ! '(' -z '' ')'  > NP-1b.O 2> NP-1b.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-1b failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-1b failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-1b.O $srcdir/NP-1b.X > /dev/null 2>&1
@@ -309,7 +309,7 @@ test -s NP-1b.E || rm -f NP-1b.E
 $xx ! ! '(' -z '' ')'  > NNP-1b.O 2> NNP-1b.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-1b failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-1b failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-1b.O $srcdir/NNP-1b.X > /dev/null 2>&1
@@ -327,7 +327,7 @@ test -s NNP-1b.E || rm -f NNP-1b.E
 $xx ! any-string  > N-1c.O 2> N-1c.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-1c failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-1c failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-1c.O $srcdir/N-1c.X > /dev/null 2>&1
@@ -345,7 +345,7 @@ test -s N-1c.E || rm -f N-1c.E
 $xx '(' any-string ')'  > P-1c.O 2> P-1c.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-1c failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-1c failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-1c.O $srcdir/P-1c.X > /dev/null 2>&1
@@ -363,7 +363,7 @@ test -s P-1c.E || rm -f P-1c.E
 $xx ! '(' any-string ')'  > NP-1c.O 2> NP-1c.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-1c failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-1c failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-1c.O $srcdir/NP-1c.X > /dev/null 2>&1
@@ -381,7 +381,7 @@ test -s NP-1c.E || rm -f NP-1c.E
 $xx ! ! '(' any-string ')'  > NNP-1c.O 2> NNP-1c.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-1c failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-1c failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-1c.O $srcdir/NNP-1c.X > /dev/null 2>&1
@@ -399,7 +399,7 @@ test -s NNP-1c.E || rm -f NNP-1c.E
 $xx ! -n any-string  > N-1d.O 2> N-1d.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-1d failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-1d failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-1d.O $srcdir/N-1d.X > /dev/null 2>&1
@@ -417,7 +417,7 @@ test -s N-1d.E || rm -f N-1d.E
 $xx '(' -n any-string ')'  > P-1d.O 2> P-1d.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-1d failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-1d failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-1d.O $srcdir/P-1d.X > /dev/null 2>&1
@@ -435,7 +435,7 @@ test -s P-1d.E || rm -f P-1d.E
 $xx ! '(' -n any-string ')'  > NP-1d.O 2> NP-1d.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-1d failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-1d failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-1d.O $srcdir/NP-1d.X > /dev/null 2>&1
@@ -453,7 +453,7 @@ test -s NP-1d.E || rm -f NP-1d.E
 $xx ! ! '(' -n any-string ')'  > NNP-1d.O 2> NNP-1d.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-1d failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-1d failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-1d.O $srcdir/NNP-1d.X > /dev/null 2>&1
@@ -471,7 +471,7 @@ test -s NNP-1d.E || rm -f NNP-1d.E
 $xx ! ''  > N-1e.O 2> N-1e.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-1e failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-1e failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-1e.O $srcdir/N-1e.X > /dev/null 2>&1
@@ -489,7 +489,7 @@ test -s N-1e.E || rm -f N-1e.E
 $xx '(' '' ')'  > P-1e.O 2> P-1e.E
 code=$?
 if test $code != 1; then
-  $echo "Test P-1e failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-1e failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-1e.O $srcdir/P-1e.X > /dev/null 2>&1
@@ -507,7 +507,7 @@ test -s P-1e.E || rm -f P-1e.E
 $xx ! '(' '' ')'  > NP-1e.O 2> NP-1e.E
 code=$?
 if test $code != 0; then
-  $echo "Test NP-1e failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NP-1e failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-1e.O $srcdir/NP-1e.X > /dev/null 2>&1
@@ -525,7 +525,7 @@ test -s NP-1e.E || rm -f NP-1e.E
 $xx ! ! '(' '' ')'  > NNP-1e.O 2> NNP-1e.E
 code=$?
 if test $code != 1; then
-  $echo "Test NNP-1e failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-1e failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-1e.O $srcdir/NNP-1e.X > /dev/null 2>&1
@@ -543,7 +543,7 @@ test -s NNP-1e.E || rm -f NNP-1e.E
 $xx ! -  > N-1f.O 2> N-1f.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-1f failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-1f failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-1f.O $srcdir/N-1f.X > /dev/null 2>&1
@@ -561,7 +561,7 @@ test -s N-1f.E || rm -f N-1f.E
 $xx '(' - ')'  > P-1f.O 2> P-1f.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-1f failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-1f failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-1f.O $srcdir/P-1f.X > /dev/null 2>&1
@@ -579,7 +579,7 @@ test -s P-1f.E || rm -f P-1f.E
 $xx ! '(' - ')'  > NP-1f.O 2> NP-1f.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-1f failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-1f failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-1f.O $srcdir/NP-1f.X > /dev/null 2>&1
@@ -597,7 +597,7 @@ test -s NP-1f.E || rm -f NP-1f.E
 $xx ! ! '(' - ')'  > NNP-1f.O 2> NNP-1f.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-1f failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-1f failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-1f.O $srcdir/NNP-1f.X > /dev/null 2>&1
@@ -615,7 +615,7 @@ test -s NNP-1f.E || rm -f NNP-1f.E
 $xx ! --  > N-1g.O 2> N-1g.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-1g failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-1g failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-1g.O $srcdir/N-1g.X > /dev/null 2>&1
@@ -633,7 +633,7 @@ test -s N-1g.E || rm -f N-1g.E
 $xx '(' -- ')'  > P-1g.O 2> P-1g.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-1g failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-1g failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-1g.O $srcdir/P-1g.X > /dev/null 2>&1
@@ -651,7 +651,7 @@ test -s P-1g.E || rm -f P-1g.E
 $xx ! '(' -- ')'  > NP-1g.O 2> NP-1g.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-1g failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-1g failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-1g.O $srcdir/NP-1g.X > /dev/null 2>&1
@@ -669,7 +669,7 @@ test -s NP-1g.E || rm -f NP-1g.E
 $xx ! ! '(' -- ')'  > NNP-1g.O 2> NNP-1g.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-1g failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-1g failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-1g.O $srcdir/NNP-1g.X > /dev/null 2>&1
@@ -687,7 +687,7 @@ test -s NNP-1g.E || rm -f NNP-1g.E
 $xx ! -0  > N-1h.O 2> N-1h.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-1h failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-1h failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-1h.O $srcdir/N-1h.X > /dev/null 2>&1
@@ -705,7 +705,7 @@ test -s N-1h.E || rm -f N-1h.E
 $xx '(' -0 ')'  > P-1h.O 2> P-1h.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-1h failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-1h failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-1h.O $srcdir/P-1h.X > /dev/null 2>&1
@@ -723,7 +723,7 @@ test -s P-1h.E || rm -f P-1h.E
 $xx ! '(' -0 ')'  > NP-1h.O 2> NP-1h.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-1h failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-1h failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-1h.O $srcdir/NP-1h.X > /dev/null 2>&1
@@ -741,7 +741,7 @@ test -s NP-1h.E || rm -f NP-1h.E
 $xx ! ! '(' -0 ')'  > NNP-1h.O 2> NNP-1h.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-1h failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-1h failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-1h.O $srcdir/NNP-1h.X > /dev/null 2>&1
@@ -759,7 +759,7 @@ test -s NNP-1h.E || rm -f NNP-1h.E
 $xx ! -f  > N-1i.O 2> N-1i.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-1i failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-1i failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-1i.O $srcdir/N-1i.X > /dev/null 2>&1
@@ -777,7 +777,7 @@ test -s N-1i.E || rm -f N-1i.E
 $xx '(' -f ')'  > P-1i.O 2> P-1i.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-1i failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-1i failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-1i.O $srcdir/P-1i.X > /dev/null 2>&1
@@ -795,7 +795,7 @@ test -s P-1i.E || rm -f P-1i.E
 $xx ! '(' -f ')'  > NP-1i.O 2> NP-1i.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-1i failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-1i failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-1i.O $srcdir/NP-1i.X > /dev/null 2>&1
@@ -813,7 +813,7 @@ test -s NP-1i.E || rm -f NP-1i.E
 $xx ! ! '(' -f ')'  > NNP-1i.O 2> NNP-1i.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-1i failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-1i failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-1i.O $srcdir/NNP-1i.X > /dev/null 2>&1
@@ -831,7 +831,7 @@ test -s NNP-1i.E || rm -f NNP-1i.E
 $xx ! --help  > N-1j.O 2> N-1j.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-1j failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-1j failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-1j.O $srcdir/N-1j.X > /dev/null 2>&1
@@ -849,7 +849,7 @@ test -s N-1j.E || rm -f N-1j.E
 $xx '(' --help ')'  > P-1j.O 2> P-1j.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-1j failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-1j failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-1j.O $srcdir/P-1j.X > /dev/null 2>&1
@@ -867,7 +867,7 @@ test -s P-1j.E || rm -f P-1j.E
 $xx ! '(' --help ')'  > NP-1j.O 2> NP-1j.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-1j failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-1j failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-1j.O $srcdir/NP-1j.X > /dev/null 2>&1
@@ -885,7 +885,7 @@ test -s NP-1j.E || rm -f NP-1j.E
 $xx ! ! '(' --help ')'  > NNP-1j.O 2> NNP-1j.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-1j failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-1j failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-1j.O $srcdir/NNP-1j.X > /dev/null 2>&1
@@ -903,7 +903,7 @@ test -s NNP-1j.E || rm -f NNP-1j.E
 $xx ! --version  > N-1k.O 2> N-1k.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-1k failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-1k failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-1k.O $srcdir/N-1k.X > /dev/null 2>&1
@@ -921,7 +921,7 @@ test -s N-1k.E || rm -f N-1k.E
 $xx '(' --version ')'  > P-1k.O 2> P-1k.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-1k failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-1k failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-1k.O $srcdir/P-1k.X > /dev/null 2>&1
@@ -939,7 +939,7 @@ test -s P-1k.E || rm -f P-1k.E
 $xx ! '(' --version ')'  > NP-1k.O 2> NP-1k.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-1k failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-1k failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-1k.O $srcdir/NP-1k.X > /dev/null 2>&1
@@ -957,7 +957,7 @@ test -s NP-1k.E || rm -f NP-1k.E
 $xx ! ! '(' --version ')'  > NNP-1k.O 2> NNP-1k.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-1k failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-1k failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-1k.O $srcdir/NNP-1k.X > /dev/null 2>&1
@@ -975,7 +975,7 @@ test -s NNP-1k.E || rm -f NNP-1k.E
 $xx ! t = t  > N-streq-1.O 2> N-streq-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-streq-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-streq-1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-streq-1.O $srcdir/N-streq-1.X > /dev/null 2>&1
@@ -993,7 +993,7 @@ test -s N-streq-1.E || rm -f N-streq-1.E
 $xx '(' t = t ')'  > P-streq-1.O 2> P-streq-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-streq-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-streq-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-streq-1.O $srcdir/P-streq-1.X > /dev/null 2>&1
@@ -1011,7 +1011,7 @@ test -s P-streq-1.E || rm -f P-streq-1.E
 $xx ! '(' t = t ')'  > NP-streq-1.O 2> NP-streq-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-streq-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-streq-1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-streq-1.O $srcdir/NP-streq-1.X > /dev/null 2>&1
@@ -1029,7 +1029,7 @@ test -s NP-streq-1.E || rm -f NP-streq-1.E
 $xx ! ! '(' t = t ')'  > NNP-streq-1.O 2> NNP-streq-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-streq-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-streq-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-streq-1.O $srcdir/NNP-streq-1.X > /dev/null 2>&1
@@ -1047,7 +1047,7 @@ test -s NNP-streq-1.E || rm -f NNP-streq-1.E
 $xx ! t = f  > N-streq-2.O 2> N-streq-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-streq-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-streq-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-streq-2.O $srcdir/N-streq-2.X > /dev/null 2>&1
@@ -1065,7 +1065,7 @@ test -s N-streq-2.E || rm -f N-streq-2.E
 $xx '(' t = f ')'  > P-streq-2.O 2> P-streq-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test P-streq-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-streq-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-streq-2.O $srcdir/P-streq-2.X > /dev/null 2>&1
@@ -1083,7 +1083,7 @@ test -s P-streq-2.E || rm -f P-streq-2.E
 $xx ! '(' t = f ')'  > NP-streq-2.O 2> NP-streq-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test NP-streq-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NP-streq-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-streq-2.O $srcdir/NP-streq-2.X > /dev/null 2>&1
@@ -1101,7 +1101,7 @@ test -s NP-streq-2.E || rm -f NP-streq-2.E
 $xx ! ! '(' t = f ')'  > NNP-streq-2.O 2> NNP-streq-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test NNP-streq-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-streq-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-streq-2.O $srcdir/NNP-streq-2.X > /dev/null 2>&1
@@ -1119,7 +1119,7 @@ test -s NNP-streq-2.E || rm -f NNP-streq-2.E
 $xx ! ! = !  > N-streq-3.O 2> N-streq-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-streq-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-streq-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-streq-3.O $srcdir/N-streq-3.X > /dev/null 2>&1
@@ -1137,7 +1137,7 @@ test -s N-streq-3.E || rm -f N-streq-3.E
 $xx '(' ! = ! ')'  > P-streq-3.O 2> P-streq-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-streq-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-streq-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-streq-3.O $srcdir/P-streq-3.X > /dev/null 2>&1
@@ -1155,7 +1155,7 @@ test -s P-streq-3.E || rm -f P-streq-3.E
 $xx ! '(' ! = ! ')'  > NP-streq-3.O 2> NP-streq-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-streq-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-streq-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-streq-3.O $srcdir/NP-streq-3.X > /dev/null 2>&1
@@ -1173,7 +1173,7 @@ test -s NP-streq-3.E || rm -f NP-streq-3.E
 $xx ! ! '(' ! = ! ')'  > NNP-streq-3.O 2> NNP-streq-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-streq-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-streq-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-streq-3.O $srcdir/NNP-streq-3.X > /dev/null 2>&1
@@ -1191,7 +1191,7 @@ test -s NNP-streq-3.E || rm -f NNP-streq-3.E
 $xx ! = = =  > N-streq-4.O 2> N-streq-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-streq-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-streq-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-streq-4.O $srcdir/N-streq-4.X > /dev/null 2>&1
@@ -1209,7 +1209,7 @@ test -s N-streq-4.E || rm -f N-streq-4.E
 $xx '(' = = = ')'  > P-streq-4.O 2> P-streq-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-streq-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-streq-4 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-streq-4.O $srcdir/P-streq-4.X > /dev/null 2>&1
@@ -1227,7 +1227,7 @@ test -s P-streq-4.E || rm -f P-streq-4.E
 $xx ! '(' = = = ')'  > NP-streq-4.O 2> NP-streq-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-streq-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-streq-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-streq-4.O $srcdir/NP-streq-4.X > /dev/null 2>&1
@@ -1245,7 +1245,7 @@ test -s NP-streq-4.E || rm -f NP-streq-4.E
 $xx ! ! '(' = = = ')'  > NNP-streq-4.O 2> NNP-streq-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-streq-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-streq-4 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-streq-4.O $srcdir/NNP-streq-4.X > /dev/null 2>&1
@@ -1263,7 +1263,7 @@ test -s NNP-streq-4.E || rm -f NNP-streq-4.E
 $xx ! '(' = '('  > N-streq-5.O 2> N-streq-5.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-streq-5 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-streq-5 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-streq-5.O $srcdir/N-streq-5.X > /dev/null 2>&1
@@ -1281,7 +1281,7 @@ test -s N-streq-5.E || rm -f N-streq-5.E
 $xx '(' '(' = '(' ')'  > P-streq-5.O 2> P-streq-5.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-streq-5 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-streq-5 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-streq-5.O $srcdir/P-streq-5.X > /dev/null 2>&1
@@ -1299,7 +1299,7 @@ test -s P-streq-5.E || rm -f P-streq-5.E
 $xx ! '(' '(' = '(' ')'  > NP-streq-5.O 2> NP-streq-5.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-streq-5 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-streq-5 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-streq-5.O $srcdir/NP-streq-5.X > /dev/null 2>&1
@@ -1317,7 +1317,7 @@ test -s NP-streq-5.E || rm -f NP-streq-5.E
 $xx ! ! '(' '(' = '(' ')'  > NNP-streq-5.O 2> NNP-streq-5.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-streq-5 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-streq-5 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-streq-5.O $srcdir/NNP-streq-5.X > /dev/null 2>&1
@@ -1335,7 +1335,7 @@ test -s NNP-streq-5.E || rm -f NNP-streq-5.E
 $xx ! '(' = ')'  > N-streq-6.O 2> N-streq-6.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-streq-6 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-streq-6 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-streq-6.O $srcdir/N-streq-6.X > /dev/null 2>&1
@@ -1353,7 +1353,7 @@ test -s N-streq-6.E || rm -f N-streq-6.E
 $xx ! t != t  > N-strne-1.O 2> N-strne-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-strne-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-strne-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-strne-1.O $srcdir/N-strne-1.X > /dev/null 2>&1
@@ -1371,7 +1371,7 @@ test -s N-strne-1.E || rm -f N-strne-1.E
 $xx '(' t != t ')'  > P-strne-1.O 2> P-strne-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test P-strne-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-strne-1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-strne-1.O $srcdir/P-strne-1.X > /dev/null 2>&1
@@ -1389,7 +1389,7 @@ test -s P-strne-1.E || rm -f P-strne-1.E
 $xx ! '(' t != t ')'  > NP-strne-1.O 2> NP-strne-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test NP-strne-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NP-strne-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-strne-1.O $srcdir/NP-strne-1.X > /dev/null 2>&1
@@ -1407,7 +1407,7 @@ test -s NP-strne-1.E || rm -f NP-strne-1.E
 $xx ! ! '(' t != t ')'  > NNP-strne-1.O 2> NNP-strne-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test NNP-strne-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-strne-1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-strne-1.O $srcdir/NNP-strne-1.X > /dev/null 2>&1
@@ -1425,7 +1425,7 @@ test -s NNP-strne-1.E || rm -f NNP-strne-1.E
 $xx ! t != f  > N-strne-2.O 2> N-strne-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-strne-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-strne-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-strne-2.O $srcdir/N-strne-2.X > /dev/null 2>&1
@@ -1443,7 +1443,7 @@ test -s N-strne-2.E || rm -f N-strne-2.E
 $xx '(' t != f ')'  > P-strne-2.O 2> P-strne-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-strne-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-strne-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-strne-2.O $srcdir/P-strne-2.X > /dev/null 2>&1
@@ -1461,7 +1461,7 @@ test -s P-strne-2.E || rm -f P-strne-2.E
 $xx ! '(' t != f ')'  > NP-strne-2.O 2> NP-strne-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-strne-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-strne-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-strne-2.O $srcdir/NP-strne-2.X > /dev/null 2>&1
@@ -1479,7 +1479,7 @@ test -s NP-strne-2.E || rm -f NP-strne-2.E
 $xx ! ! '(' t != f ')'  > NNP-strne-2.O 2> NNP-strne-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-strne-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-strne-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-strne-2.O $srcdir/NNP-strne-2.X > /dev/null 2>&1
@@ -1497,7 +1497,7 @@ test -s NNP-strne-2.E || rm -f NNP-strne-2.E
 $xx ! ! != !  > N-strne-3.O 2> N-strne-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-strne-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-strne-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-strne-3.O $srcdir/N-strne-3.X > /dev/null 2>&1
@@ -1515,7 +1515,7 @@ test -s N-strne-3.E || rm -f N-strne-3.E
 $xx '(' ! != ! ')'  > P-strne-3.O 2> P-strne-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test P-strne-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-strne-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-strne-3.O $srcdir/P-strne-3.X > /dev/null 2>&1
@@ -1533,7 +1533,7 @@ test -s P-strne-3.E || rm -f P-strne-3.E
 $xx ! '(' ! != ! ')'  > NP-strne-3.O 2> NP-strne-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test NP-strne-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NP-strne-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-strne-3.O $srcdir/NP-strne-3.X > /dev/null 2>&1
@@ -1551,7 +1551,7 @@ test -s NP-strne-3.E || rm -f NP-strne-3.E
 $xx ! ! '(' ! != ! ')'  > NNP-strne-3.O 2> NNP-strne-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test NNP-strne-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-strne-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-strne-3.O $srcdir/NNP-strne-3.X > /dev/null 2>&1
@@ -1569,7 +1569,7 @@ test -s NNP-strne-3.E || rm -f NNP-strne-3.E
 $xx ! = != =  > N-strne-4.O 2> N-strne-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-strne-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-strne-4 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-strne-4.O $srcdir/N-strne-4.X > /dev/null 2>&1
@@ -1587,7 +1587,7 @@ test -s N-strne-4.E || rm -f N-strne-4.E
 $xx '(' = != = ')'  > P-strne-4.O 2> P-strne-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test P-strne-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-strne-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-strne-4.O $srcdir/P-strne-4.X > /dev/null 2>&1
@@ -1605,7 +1605,7 @@ test -s P-strne-4.E || rm -f P-strne-4.E
 $xx ! '(' = != = ')'  > NP-strne-4.O 2> NP-strne-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test NP-strne-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NP-strne-4 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-strne-4.O $srcdir/NP-strne-4.X > /dev/null 2>&1
@@ -1623,7 +1623,7 @@ test -s NP-strne-4.E || rm -f NP-strne-4.E
 $xx ! ! '(' = != = ')'  > NNP-strne-4.O 2> NNP-strne-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test NNP-strne-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-strne-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-strne-4.O $srcdir/NNP-strne-4.X > /dev/null 2>&1
@@ -1641,7 +1641,7 @@ test -s NNP-strne-4.E || rm -f NNP-strne-4.E
 $xx ! '(' != '('  > N-strne-5.O 2> N-strne-5.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-strne-5 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-strne-5 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-strne-5.O $srcdir/N-strne-5.X > /dev/null 2>&1
@@ -1659,7 +1659,7 @@ test -s N-strne-5.E || rm -f N-strne-5.E
 $xx '(' '(' != '(' ')'  > P-strne-5.O 2> P-strne-5.E
 code=$?
 if test $code != 1; then
-  $echo "Test P-strne-5 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-strne-5 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-strne-5.O $srcdir/P-strne-5.X > /dev/null 2>&1
@@ -1677,7 +1677,7 @@ test -s P-strne-5.E || rm -f P-strne-5.E
 $xx ! '(' '(' != '(' ')'  > NP-strne-5.O 2> NP-strne-5.E
 code=$?
 if test $code != 0; then
-  $echo "Test NP-strne-5 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NP-strne-5 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-strne-5.O $srcdir/NP-strne-5.X > /dev/null 2>&1
@@ -1695,7 +1695,7 @@ test -s NP-strne-5.E || rm -f NP-strne-5.E
 $xx ! ! '(' '(' != '(' ')'  > NNP-strne-5.O 2> NNP-strne-5.E
 code=$?
 if test $code != 1; then
-  $echo "Test NNP-strne-5 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-strne-5 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-strne-5.O $srcdir/NNP-strne-5.X > /dev/null 2>&1
@@ -1713,7 +1713,7 @@ test -s NNP-strne-5.E || rm -f NNP-strne-5.E
 $xx ! '(' != ')'  > N-strne-6.O 2> N-strne-6.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-strne-6 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-strne-6 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-strne-6.O $srcdir/N-strne-6.X > /dev/null 2>&1
@@ -1731,7 +1731,7 @@ test -s N-strne-6.E || rm -f N-strne-6.E
 $xx ! t -a t  > N-and-1.O 2> N-and-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-and-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-and-1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-and-1.O $srcdir/N-and-1.X > /dev/null 2>&1
@@ -1749,7 +1749,7 @@ test -s N-and-1.E || rm -f N-and-1.E
 $xx '(' t -a t ')'  > P-and-1.O 2> P-and-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-and-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-and-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-and-1.O $srcdir/P-and-1.X > /dev/null 2>&1
@@ -1767,7 +1767,7 @@ test -s P-and-1.E || rm -f P-and-1.E
 $xx ! '(' t -a t ')'  > NP-and-1.O 2> NP-and-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-and-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-and-1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-and-1.O $srcdir/NP-and-1.X > /dev/null 2>&1
@@ -1785,7 +1785,7 @@ test -s NP-and-1.E || rm -f NP-and-1.E
 $xx ! ! '(' t -a t ')'  > NNP-and-1.O 2> NNP-and-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-and-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-and-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-and-1.O $srcdir/NNP-and-1.X > /dev/null 2>&1
@@ -1803,7 +1803,7 @@ test -s NNP-and-1.E || rm -f NNP-and-1.E
 $xx ! '' -a t  > N-and-2.O 2> N-and-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-and-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-and-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-and-2.O $srcdir/N-and-2.X > /dev/null 2>&1
@@ -1821,7 +1821,7 @@ test -s N-and-2.E || rm -f N-and-2.E
 $xx '(' '' -a t ')'  > P-and-2.O 2> P-and-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test P-and-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-and-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-and-2.O $srcdir/P-and-2.X > /dev/null 2>&1
@@ -1839,7 +1839,7 @@ test -s P-and-2.E || rm -f P-and-2.E
 $xx ! '(' '' -a t ')'  > NP-and-2.O 2> NP-and-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test NP-and-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NP-and-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-and-2.O $srcdir/NP-and-2.X > /dev/null 2>&1
@@ -1857,7 +1857,7 @@ test -s NP-and-2.E || rm -f NP-and-2.E
 $xx ! ! '(' '' -a t ')'  > NNP-and-2.O 2> NNP-and-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test NNP-and-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-and-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-and-2.O $srcdir/NNP-and-2.X > /dev/null 2>&1
@@ -1875,7 +1875,7 @@ test -s NNP-and-2.E || rm -f NNP-and-2.E
 $xx ! t -a ''  > N-and-3.O 2> N-and-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-and-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-and-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-and-3.O $srcdir/N-and-3.X > /dev/null 2>&1
@@ -1893,7 +1893,7 @@ test -s N-and-3.E || rm -f N-and-3.E
 $xx '(' t -a '' ')'  > P-and-3.O 2> P-and-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test P-and-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-and-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-and-3.O $srcdir/P-and-3.X > /dev/null 2>&1
@@ -1911,7 +1911,7 @@ test -s P-and-3.E || rm -f P-and-3.E
 $xx ! '(' t -a '' ')'  > NP-and-3.O 2> NP-and-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test NP-and-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NP-and-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-and-3.O $srcdir/NP-and-3.X > /dev/null 2>&1
@@ -1929,7 +1929,7 @@ test -s NP-and-3.E || rm -f NP-and-3.E
 $xx ! ! '(' t -a '' ')'  > NNP-and-3.O 2> NNP-and-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test NNP-and-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-and-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-and-3.O $srcdir/NNP-and-3.X > /dev/null 2>&1
@@ -1947,7 +1947,7 @@ test -s NNP-and-3.E || rm -f NNP-and-3.E
 $xx ! '' -a ''  > N-and-4.O 2> N-and-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-and-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-and-4 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-and-4.O $srcdir/N-and-4.X > /dev/null 2>&1
@@ -1965,7 +1965,7 @@ test -s N-and-4.E || rm -f N-and-4.E
 $xx '(' '' -a '' ')'  > P-and-4.O 2> P-and-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test P-and-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-and-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-and-4.O $srcdir/P-and-4.X > /dev/null 2>&1
@@ -1983,7 +1983,7 @@ test -s P-and-4.E || rm -f P-and-4.E
 $xx ! '(' '' -a '' ')'  > NP-and-4.O 2> NP-and-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test NP-and-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NP-and-4 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-and-4.O $srcdir/NP-and-4.X > /dev/null 2>&1
@@ -2001,7 +2001,7 @@ test -s NP-and-4.E || rm -f NP-and-4.E
 $xx ! ! '(' '' -a '' ')'  > NNP-and-4.O 2> NNP-and-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test NNP-and-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-and-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-and-4.O $srcdir/NNP-and-4.X > /dev/null 2>&1
@@ -2019,7 +2019,7 @@ test -s NNP-and-4.E || rm -f NNP-and-4.E
 $xx ! t -o t  > N-or-1.O 2> N-or-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-or-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-or-1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-or-1.O $srcdir/N-or-1.X > /dev/null 2>&1
@@ -2037,7 +2037,7 @@ test -s N-or-1.E || rm -f N-or-1.E
 $xx '(' t -o t ')'  > P-or-1.O 2> P-or-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-or-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-or-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-or-1.O $srcdir/P-or-1.X > /dev/null 2>&1
@@ -2055,7 +2055,7 @@ test -s P-or-1.E || rm -f P-or-1.E
 $xx ! '(' t -o t ')'  > NP-or-1.O 2> NP-or-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-or-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-or-1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-or-1.O $srcdir/NP-or-1.X > /dev/null 2>&1
@@ -2073,7 +2073,7 @@ test -s NP-or-1.E || rm -f NP-or-1.E
 $xx ! ! '(' t -o t ')'  > NNP-or-1.O 2> NNP-or-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-or-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-or-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-or-1.O $srcdir/NNP-or-1.X > /dev/null 2>&1
@@ -2091,7 +2091,7 @@ test -s NNP-or-1.E || rm -f NNP-or-1.E
 $xx ! '' -o t  > N-or-2.O 2> N-or-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-or-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-or-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-or-2.O $srcdir/N-or-2.X > /dev/null 2>&1
@@ -2109,7 +2109,7 @@ test -s N-or-2.E || rm -f N-or-2.E
 $xx '(' '' -o t ')'  > P-or-2.O 2> P-or-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-or-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-or-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-or-2.O $srcdir/P-or-2.X > /dev/null 2>&1
@@ -2127,7 +2127,7 @@ test -s P-or-2.E || rm -f P-or-2.E
 $xx ! '(' '' -o t ')'  > NP-or-2.O 2> NP-or-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-or-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-or-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-or-2.O $srcdir/NP-or-2.X > /dev/null 2>&1
@@ -2145,7 +2145,7 @@ test -s NP-or-2.E || rm -f NP-or-2.E
 $xx ! ! '(' '' -o t ')'  > NNP-or-2.O 2> NNP-or-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-or-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-or-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-or-2.O $srcdir/NNP-or-2.X > /dev/null 2>&1
@@ -2163,7 +2163,7 @@ test -s NNP-or-2.E || rm -f NNP-or-2.E
 $xx ! t -o ''  > N-or-3.O 2> N-or-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-or-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-or-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-or-3.O $srcdir/N-or-3.X > /dev/null 2>&1
@@ -2181,7 +2181,7 @@ test -s N-or-3.E || rm -f N-or-3.E
 $xx '(' t -o '' ')'  > P-or-3.O 2> P-or-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-or-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-or-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-or-3.O $srcdir/P-or-3.X > /dev/null 2>&1
@@ -2199,7 +2199,7 @@ test -s P-or-3.E || rm -f P-or-3.E
 $xx ! '(' t -o '' ')'  > NP-or-3.O 2> NP-or-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-or-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-or-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-or-3.O $srcdir/NP-or-3.X > /dev/null 2>&1
@@ -2217,7 +2217,7 @@ test -s NP-or-3.E || rm -f NP-or-3.E
 $xx ! ! '(' t -o '' ')'  > NNP-or-3.O 2> NNP-or-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-or-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-or-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-or-3.O $srcdir/NNP-or-3.X > /dev/null 2>&1
@@ -2235,7 +2235,7 @@ test -s NNP-or-3.E || rm -f NNP-or-3.E
 $xx ! '' -o ''  > N-or-4.O 2> N-or-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-or-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-or-4 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-or-4.O $srcdir/N-or-4.X > /dev/null 2>&1
@@ -2253,7 +2253,7 @@ test -s N-or-4.E || rm -f N-or-4.E
 $xx '(' '' -o '' ')'  > P-or-4.O 2> P-or-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test P-or-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-or-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-or-4.O $srcdir/P-or-4.X > /dev/null 2>&1
@@ -2271,7 +2271,7 @@ test -s P-or-4.E || rm -f P-or-4.E
 $xx ! '(' '' -o '' ')'  > NP-or-4.O 2> NP-or-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test NP-or-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NP-or-4 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-or-4.O $srcdir/NP-or-4.X > /dev/null 2>&1
@@ -2289,7 +2289,7 @@ test -s NP-or-4.E || rm -f NP-or-4.E
 $xx ! ! '(' '' -o '' ')'  > NNP-or-4.O 2> NNP-or-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test NNP-or-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-or-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-or-4.O $srcdir/NNP-or-4.X > /dev/null 2>&1
@@ -2307,7 +2307,7 @@ test -s NNP-or-4.E || rm -f NNP-or-4.E
 $xx ! 9 -eq 9  > N-eq-1.O 2> N-eq-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-eq-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-eq-1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-eq-1.O $srcdir/N-eq-1.X > /dev/null 2>&1
@@ -2325,7 +2325,7 @@ test -s N-eq-1.E || rm -f N-eq-1.E
 $xx '(' 9 -eq 9 ')'  > P-eq-1.O 2> P-eq-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-eq-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-eq-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-eq-1.O $srcdir/P-eq-1.X > /dev/null 2>&1
@@ -2343,7 +2343,7 @@ test -s P-eq-1.E || rm -f P-eq-1.E
 $xx ! '(' 9 -eq 9 ')'  > NP-eq-1.O 2> NP-eq-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-eq-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-eq-1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-eq-1.O $srcdir/NP-eq-1.X > /dev/null 2>&1
@@ -2361,7 +2361,7 @@ test -s NP-eq-1.E || rm -f NP-eq-1.E
 $xx ! ! '(' 9 -eq 9 ')'  > NNP-eq-1.O 2> NNP-eq-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-eq-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-eq-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-eq-1.O $srcdir/NNP-eq-1.X > /dev/null 2>&1
@@ -2379,7 +2379,7 @@ test -s NNP-eq-1.E || rm -f NNP-eq-1.E
 $xx ! 0 -eq 0  > N-eq-2.O 2> N-eq-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-eq-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-eq-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-eq-2.O $srcdir/N-eq-2.X > /dev/null 2>&1
@@ -2397,7 +2397,7 @@ test -s N-eq-2.E || rm -f N-eq-2.E
 $xx '(' 0 -eq 0 ')'  > P-eq-2.O 2> P-eq-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-eq-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-eq-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-eq-2.O $srcdir/P-eq-2.X > /dev/null 2>&1
@@ -2415,7 +2415,7 @@ test -s P-eq-2.E || rm -f P-eq-2.E
 $xx ! '(' 0 -eq 0 ')'  > NP-eq-2.O 2> NP-eq-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-eq-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-eq-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-eq-2.O $srcdir/NP-eq-2.X > /dev/null 2>&1
@@ -2433,7 +2433,7 @@ test -s NP-eq-2.E || rm -f NP-eq-2.E
 $xx ! ! '(' 0 -eq 0 ')'  > NNP-eq-2.O 2> NNP-eq-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-eq-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-eq-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-eq-2.O $srcdir/NNP-eq-2.X > /dev/null 2>&1
@@ -2451,7 +2451,7 @@ test -s NNP-eq-2.E || rm -f NNP-eq-2.E
 $xx ! 0 -eq 00  > N-eq-3.O 2> N-eq-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-eq-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-eq-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-eq-3.O $srcdir/N-eq-3.X > /dev/null 2>&1
@@ -2469,7 +2469,7 @@ test -s N-eq-3.E || rm -f N-eq-3.E
 $xx '(' 0 -eq 00 ')'  > P-eq-3.O 2> P-eq-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-eq-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-eq-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-eq-3.O $srcdir/P-eq-3.X > /dev/null 2>&1
@@ -2487,7 +2487,7 @@ test -s P-eq-3.E || rm -f P-eq-3.E
 $xx ! '(' 0 -eq 00 ')'  > NP-eq-3.O 2> NP-eq-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-eq-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-eq-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-eq-3.O $srcdir/NP-eq-3.X > /dev/null 2>&1
@@ -2505,7 +2505,7 @@ test -s NP-eq-3.E || rm -f NP-eq-3.E
 $xx ! ! '(' 0 -eq 00 ')'  > NNP-eq-3.O 2> NNP-eq-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-eq-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-eq-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-eq-3.O $srcdir/NNP-eq-3.X > /dev/null 2>&1
@@ -2523,7 +2523,7 @@ test -s NNP-eq-3.E || rm -f NNP-eq-3.E
 $xx ! 8 -eq 9  > N-eq-4.O 2> N-eq-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-eq-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-eq-4 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-eq-4.O $srcdir/N-eq-4.X > /dev/null 2>&1
@@ -2541,7 +2541,7 @@ test -s N-eq-4.E || rm -f N-eq-4.E
 $xx '(' 8 -eq 9 ')'  > P-eq-4.O 2> P-eq-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test P-eq-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-eq-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-eq-4.O $srcdir/P-eq-4.X > /dev/null 2>&1
@@ -2559,7 +2559,7 @@ test -s P-eq-4.E || rm -f P-eq-4.E
 $xx ! '(' 8 -eq 9 ')'  > NP-eq-4.O 2> NP-eq-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test NP-eq-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NP-eq-4 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-eq-4.O $srcdir/NP-eq-4.X > /dev/null 2>&1
@@ -2577,7 +2577,7 @@ test -s NP-eq-4.E || rm -f NP-eq-4.E
 $xx ! ! '(' 8 -eq 9 ')'  > NNP-eq-4.O 2> NNP-eq-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test NNP-eq-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-eq-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-eq-4.O $srcdir/NNP-eq-4.X > /dev/null 2>&1
@@ -2595,7 +2595,7 @@ test -s NNP-eq-4.E || rm -f NNP-eq-4.E
 $xx ! 1 -eq 0  > N-eq-5.O 2> N-eq-5.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-eq-5 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-eq-5 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-eq-5.O $srcdir/N-eq-5.X > /dev/null 2>&1
@@ -2613,7 +2613,7 @@ test -s N-eq-5.E || rm -f N-eq-5.E
 $xx '(' 1 -eq 0 ')'  > P-eq-5.O 2> P-eq-5.E
 code=$?
 if test $code != 1; then
-  $echo "Test P-eq-5 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-eq-5 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-eq-5.O $srcdir/P-eq-5.X > /dev/null 2>&1
@@ -2631,7 +2631,7 @@ test -s P-eq-5.E || rm -f P-eq-5.E
 $xx ! '(' 1 -eq 0 ')'  > NP-eq-5.O 2> NP-eq-5.E
 code=$?
 if test $code != 0; then
-  $echo "Test NP-eq-5 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NP-eq-5 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-eq-5.O $srcdir/NP-eq-5.X > /dev/null 2>&1
@@ -2649,7 +2649,7 @@ test -s NP-eq-5.E || rm -f NP-eq-5.E
 $xx ! ! '(' 1 -eq 0 ')'  > NNP-eq-5.O 2> NNP-eq-5.E
 code=$?
 if test $code != 1; then
-  $echo "Test NNP-eq-5 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-eq-5 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-eq-5.O $srcdir/NNP-eq-5.X > /dev/null 2>&1
@@ -2667,7 +2667,7 @@ test -s NNP-eq-5.E || rm -f NNP-eq-5.E
 $xx ! 5 -gt 5  > N-gt-1.O 2> N-gt-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-gt-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-gt-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-gt-1.O $srcdir/N-gt-1.X > /dev/null 2>&1
@@ -2685,7 +2685,7 @@ test -s N-gt-1.E || rm -f N-gt-1.E
 $xx '(' 5 -gt 5 ')'  > P-gt-1.O 2> P-gt-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test P-gt-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-gt-1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-gt-1.O $srcdir/P-gt-1.X > /dev/null 2>&1
@@ -2703,7 +2703,7 @@ test -s P-gt-1.E || rm -f P-gt-1.E
 $xx ! '(' 5 -gt 5 ')'  > NP-gt-1.O 2> NP-gt-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test NP-gt-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NP-gt-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-gt-1.O $srcdir/NP-gt-1.X > /dev/null 2>&1
@@ -2721,7 +2721,7 @@ test -s NP-gt-1.E || rm -f NP-gt-1.E
 $xx ! ! '(' 5 -gt 5 ')'  > NNP-gt-1.O 2> NNP-gt-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test NNP-gt-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-gt-1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-gt-1.O $srcdir/NNP-gt-1.X > /dev/null 2>&1
@@ -2739,7 +2739,7 @@ test -s NNP-gt-1.E || rm -f NNP-gt-1.E
 $xx ! 5 -gt 4  > N-gt-2.O 2> N-gt-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-gt-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-gt-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-gt-2.O $srcdir/N-gt-2.X > /dev/null 2>&1
@@ -2757,7 +2757,7 @@ test -s N-gt-2.E || rm -f N-gt-2.E
 $xx '(' 5 -gt 4 ')'  > P-gt-2.O 2> P-gt-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-gt-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-gt-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-gt-2.O $srcdir/P-gt-2.X > /dev/null 2>&1
@@ -2775,7 +2775,7 @@ test -s P-gt-2.E || rm -f P-gt-2.E
 $xx ! '(' 5 -gt 4 ')'  > NP-gt-2.O 2> NP-gt-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-gt-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-gt-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-gt-2.O $srcdir/NP-gt-2.X > /dev/null 2>&1
@@ -2793,7 +2793,7 @@ test -s NP-gt-2.E || rm -f NP-gt-2.E
 $xx ! ! '(' 5 -gt 4 ')'  > NNP-gt-2.O 2> NNP-gt-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-gt-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-gt-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-gt-2.O $srcdir/NNP-gt-2.X > /dev/null 2>&1
@@ -2811,7 +2811,7 @@ test -s NNP-gt-2.E || rm -f NNP-gt-2.E
 $xx ! 4 -gt 5  > N-gt-3.O 2> N-gt-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-gt-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-gt-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-gt-3.O $srcdir/N-gt-3.X > /dev/null 2>&1
@@ -2829,7 +2829,7 @@ test -s N-gt-3.E || rm -f N-gt-3.E
 $xx '(' 4 -gt 5 ')'  > P-gt-3.O 2> P-gt-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test P-gt-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-gt-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-gt-3.O $srcdir/P-gt-3.X > /dev/null 2>&1
@@ -2847,7 +2847,7 @@ test -s P-gt-3.E || rm -f P-gt-3.E
 $xx ! '(' 4 -gt 5 ')'  > NP-gt-3.O 2> NP-gt-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test NP-gt-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NP-gt-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-gt-3.O $srcdir/NP-gt-3.X > /dev/null 2>&1
@@ -2865,7 +2865,7 @@ test -s NP-gt-3.E || rm -f NP-gt-3.E
 $xx ! ! '(' 4 -gt 5 ')'  > NNP-gt-3.O 2> NNP-gt-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test NNP-gt-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-gt-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-gt-3.O $srcdir/NNP-gt-3.X > /dev/null 2>&1
@@ -2883,7 +2883,7 @@ test -s NNP-gt-3.E || rm -f NNP-gt-3.E
 $xx ! -1 -gt -2  > N-gt-4.O 2> N-gt-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-gt-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-gt-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-gt-4.O $srcdir/N-gt-4.X > /dev/null 2>&1
@@ -2901,7 +2901,7 @@ test -s N-gt-4.E || rm -f N-gt-4.E
 $xx '(' -1 -gt -2 ')'  > P-gt-4.O 2> P-gt-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-gt-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-gt-4 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-gt-4.O $srcdir/P-gt-4.X > /dev/null 2>&1
@@ -2919,7 +2919,7 @@ test -s P-gt-4.E || rm -f P-gt-4.E
 $xx ! '(' -1 -gt -2 ')'  > NP-gt-4.O 2> NP-gt-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-gt-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-gt-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-gt-4.O $srcdir/NP-gt-4.X > /dev/null 2>&1
@@ -2937,7 +2937,7 @@ test -s NP-gt-4.E || rm -f NP-gt-4.E
 $xx ! ! '(' -1 -gt -2 ')'  > NNP-gt-4.O 2> NNP-gt-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-gt-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-gt-4 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-gt-4.O $srcdir/NNP-gt-4.X > /dev/null 2>&1
@@ -2955,7 +2955,7 @@ test -s NNP-gt-4.E || rm -f NNP-gt-4.E
 $xx ! 5 -lt 5  > N-lt-1.O 2> N-lt-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-lt-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-lt-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-lt-1.O $srcdir/N-lt-1.X > /dev/null 2>&1
@@ -2973,7 +2973,7 @@ test -s N-lt-1.E || rm -f N-lt-1.E
 $xx '(' 5 -lt 5 ')'  > P-lt-1.O 2> P-lt-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test P-lt-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-lt-1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-lt-1.O $srcdir/P-lt-1.X > /dev/null 2>&1
@@ -2991,7 +2991,7 @@ test -s P-lt-1.E || rm -f P-lt-1.E
 $xx ! '(' 5 -lt 5 ')'  > NP-lt-1.O 2> NP-lt-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test NP-lt-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NP-lt-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-lt-1.O $srcdir/NP-lt-1.X > /dev/null 2>&1
@@ -3009,7 +3009,7 @@ test -s NP-lt-1.E || rm -f NP-lt-1.E
 $xx ! ! '(' 5 -lt 5 ')'  > NNP-lt-1.O 2> NNP-lt-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test NNP-lt-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-lt-1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-lt-1.O $srcdir/NNP-lt-1.X > /dev/null 2>&1
@@ -3027,7 +3027,7 @@ test -s NNP-lt-1.E || rm -f NNP-lt-1.E
 $xx ! 5 -lt 4  > N-lt-2.O 2> N-lt-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-lt-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-lt-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-lt-2.O $srcdir/N-lt-2.X > /dev/null 2>&1
@@ -3045,7 +3045,7 @@ test -s N-lt-2.E || rm -f N-lt-2.E
 $xx '(' 5 -lt 4 ')'  > P-lt-2.O 2> P-lt-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test P-lt-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-lt-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-lt-2.O $srcdir/P-lt-2.X > /dev/null 2>&1
@@ -3063,7 +3063,7 @@ test -s P-lt-2.E || rm -f P-lt-2.E
 $xx ! '(' 5 -lt 4 ')'  > NP-lt-2.O 2> NP-lt-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test NP-lt-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NP-lt-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-lt-2.O $srcdir/NP-lt-2.X > /dev/null 2>&1
@@ -3081,7 +3081,7 @@ test -s NP-lt-2.E || rm -f NP-lt-2.E
 $xx ! ! '(' 5 -lt 4 ')'  > NNP-lt-2.O 2> NNP-lt-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test NNP-lt-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-lt-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-lt-2.O $srcdir/NNP-lt-2.X > /dev/null 2>&1
@@ -3099,7 +3099,7 @@ test -s NNP-lt-2.E || rm -f NNP-lt-2.E
 $xx ! 4 -lt 5  > N-lt-3.O 2> N-lt-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-lt-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-lt-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-lt-3.O $srcdir/N-lt-3.X > /dev/null 2>&1
@@ -3117,7 +3117,7 @@ test -s N-lt-3.E || rm -f N-lt-3.E
 $xx '(' 4 -lt 5 ')'  > P-lt-3.O 2> P-lt-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-lt-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-lt-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-lt-3.O $srcdir/P-lt-3.X > /dev/null 2>&1
@@ -3135,7 +3135,7 @@ test -s P-lt-3.E || rm -f P-lt-3.E
 $xx ! '(' 4 -lt 5 ')'  > NP-lt-3.O 2> NP-lt-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-lt-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-lt-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-lt-3.O $srcdir/NP-lt-3.X > /dev/null 2>&1
@@ -3153,7 +3153,7 @@ test -s NP-lt-3.E || rm -f NP-lt-3.E
 $xx ! ! '(' 4 -lt 5 ')'  > NNP-lt-3.O 2> NNP-lt-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-lt-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-lt-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-lt-3.O $srcdir/NNP-lt-3.X > /dev/null 2>&1
@@ -3171,7 +3171,7 @@ test -s NNP-lt-3.E || rm -f NNP-lt-3.E
 $xx ! -1 -lt -2  > N-lt-4.O 2> N-lt-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-lt-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-lt-4 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-lt-4.O $srcdir/N-lt-4.X > /dev/null 2>&1
@@ -3189,7 +3189,7 @@ test -s N-lt-4.E || rm -f N-lt-4.E
 $xx '(' -1 -lt -2 ')'  > P-lt-4.O 2> P-lt-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test P-lt-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-lt-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-lt-4.O $srcdir/P-lt-4.X > /dev/null 2>&1
@@ -3207,7 +3207,7 @@ test -s P-lt-4.E || rm -f P-lt-4.E
 $xx ! '(' -1 -lt -2 ')'  > NP-lt-4.O 2> NP-lt-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test NP-lt-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NP-lt-4 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-lt-4.O $srcdir/NP-lt-4.X > /dev/null 2>&1
@@ -3225,7 +3225,7 @@ test -s NP-lt-4.E || rm -f NP-lt-4.E
 $xx ! ! '(' -1 -lt -2 ')'  > NNP-lt-4.O 2> NNP-lt-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test NNP-lt-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-lt-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-lt-4.O $srcdir/NNP-lt-4.X > /dev/null 2>&1
@@ -3243,7 +3243,7 @@ test -s NNP-lt-4.E || rm -f NNP-lt-4.E
 $xx ! -t  > N-t1.O 2> N-t1.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-t1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-t1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-t1.O $srcdir/N-t1.X > /dev/null 2>&1
@@ -3261,7 +3261,7 @@ test -s N-t1.E || rm -f N-t1.E
 $xx '(' -t ')'  > P-t1.O 2> P-t1.E
 code=$?
 if test $code != 0; then
-  $echo "Test P-t1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test P-t1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-t1.O $srcdir/P-t1.X > /dev/null 2>&1
@@ -3279,7 +3279,7 @@ test -s P-t1.E || rm -f P-t1.E
 $xx ! '(' -t ')'  > NP-t1.O 2> NP-t1.E
 code=$?
 if test $code != 1; then
-  $echo "Test NP-t1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NP-t1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-t1.O $srcdir/NP-t1.X > /dev/null 2>&1
@@ -3297,7 +3297,7 @@ test -s NP-t1.E || rm -f NP-t1.E
 $xx ! ! '(' -t ')'  > NNP-t1.O 2> NNP-t1.E
 code=$?
 if test $code != 0; then
-  $echo "Test NNP-t1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NNP-t1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-t1.O $srcdir/NNP-t1.X > /dev/null 2>&1
@@ -3315,7 +3315,7 @@ test -s NNP-t1.E || rm -f NNP-t1.E
 $xx ! -t 1  > N-t2.O 2> N-t2.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-t2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-t2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-t2.O $srcdir/N-t2.X > /dev/null 2>&1
@@ -3333,7 +3333,7 @@ test -s N-t2.E || rm -f N-t2.E
 $xx '(' -t 1 ')'  > P-t2.O 2> P-t2.E
 code=$?
 if test $code != 1; then
-  $echo "Test P-t2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test P-t2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp P-t2.O $srcdir/P-t2.X > /dev/null 2>&1
@@ -3351,7 +3351,7 @@ test -s P-t2.E || rm -f P-t2.E
 $xx ! '(' -t 1 ')'  > NP-t2.O 2> NP-t2.E
 code=$?
 if test $code != 0; then
-  $echo "Test NP-t2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test NP-t2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NP-t2.O $srcdir/NP-t2.X > /dev/null 2>&1
@@ -3369,7 +3369,7 @@ test -s NP-t2.E || rm -f NP-t2.E
 $xx ! ! '(' -t 1 ')'  > NNP-t2.O 2> NNP-t2.E
 code=$?
 if test $code != 1; then
-  $echo "Test NNP-t2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test NNP-t2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp NNP-t2.O $srcdir/NNP-t2.X > /dev/null 2>&1
@@ -3387,7 +3387,7 @@ test -s NNP-t2.E || rm -f NNP-t2.E
 $xx ! '(' '' ')'  > N-paren-1.O 2> N-paren-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test N-paren-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test N-paren-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-paren-1.O $srcdir/N-paren-1.X > /dev/null 2>&1
@@ -3405,7 +3405,7 @@ test -s N-paren-1.E || rm -f N-paren-1.E
 $xx ! '(' '(' ')'  > N-paren-2.O 2> N-paren-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-paren-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-paren-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-paren-2.O $srcdir/N-paren-2.X > /dev/null 2>&1
@@ -3423,7 +3423,7 @@ test -s N-paren-2.E || rm -f N-paren-2.E
 $xx ! '(' ')' ')'  > N-paren-3.O 2> N-paren-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-paren-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-paren-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-paren-3.O $srcdir/N-paren-3.X > /dev/null 2>&1
@@ -3441,7 +3441,7 @@ test -s N-paren-3.E || rm -f N-paren-3.E
 $xx ! '(' ! ')'  > N-paren-4.O 2> N-paren-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-paren-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-paren-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-paren-4.O $srcdir/N-paren-4.X > /dev/null 2>&1
@@ -3459,7 +3459,7 @@ test -s N-paren-4.E || rm -f N-paren-4.E
 $xx ! '(' -a ')'  > N-paren-5.O 2> N-paren-5.E
 code=$?
 if test $code != 1; then
-  $echo "Test N-paren-5 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test N-paren-5 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp N-paren-5.O $srcdir/N-paren-5.X > /dev/null 2>&1
@@ -3477,7 +3477,7 @@ test -s N-paren-5.E || rm -f N-paren-5.E
 $xx   > 1a.O 2> 1a.E
 code=$?
 if test $code != 1; then
-  $echo "Test 1a failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test 1a failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1a.O $srcdir/1a.X > /dev/null 2>&1
@@ -3495,7 +3495,7 @@ test -s 1a.E || rm -f 1a.E
 $xx -z ''  > 1b.O 2> 1b.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1b failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test 1b failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1b.O $srcdir/1b.X > /dev/null 2>&1
@@ -3513,7 +3513,7 @@ test -s 1b.E || rm -f 1b.E
 $xx any-string  > 1c.O 2> 1c.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1c failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test 1c failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1c.O $srcdir/1c.X > /dev/null 2>&1
@@ -3531,7 +3531,7 @@ test -s 1c.E || rm -f 1c.E
 $xx -n any-string  > 1d.O 2> 1d.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1d failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test 1d failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1d.O $srcdir/1d.X > /dev/null 2>&1
@@ -3549,7 +3549,7 @@ test -s 1d.E || rm -f 1d.E
 $xx ''  > 1e.O 2> 1e.E
 code=$?
 if test $code != 1; then
-  $echo "Test 1e failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test 1e failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1e.O $srcdir/1e.X > /dev/null 2>&1
@@ -3567,7 +3567,7 @@ test -s 1e.E || rm -f 1e.E
 $xx -  > 1f.O 2> 1f.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1f failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test 1f failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1f.O $srcdir/1f.X > /dev/null 2>&1
@@ -3585,7 +3585,7 @@ test -s 1f.E || rm -f 1f.E
 $xx --  > 1g.O 2> 1g.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1g failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test 1g failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1g.O $srcdir/1g.X > /dev/null 2>&1
@@ -3603,7 +3603,7 @@ test -s 1g.E || rm -f 1g.E
 $xx -0  > 1h.O 2> 1h.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1h failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test 1h failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1h.O $srcdir/1h.X > /dev/null 2>&1
@@ -3621,7 +3621,7 @@ test -s 1h.E || rm -f 1h.E
 $xx -f  > 1i.O 2> 1i.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1i failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test 1i failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1i.O $srcdir/1i.X > /dev/null 2>&1
@@ -3639,7 +3639,7 @@ test -s 1i.E || rm -f 1i.E
 $xx --help  > 1j.O 2> 1j.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1j failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test 1j failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1j.O $srcdir/1j.X > /dev/null 2>&1
@@ -3657,7 +3657,7 @@ test -s 1j.E || rm -f 1j.E
 $xx --version  > 1k.O 2> 1k.E
 code=$?
 if test $code != 0; then
-  $echo "Test 1k failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test 1k failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1k.O $srcdir/1k.X > /dev/null 2>&1
@@ -3675,7 +3675,7 @@ test -s 1k.E || rm -f 1k.E
 $xx t = t  > streq-1.O 2> streq-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test streq-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test streq-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp streq-1.O $srcdir/streq-1.X > /dev/null 2>&1
@@ -3693,7 +3693,7 @@ test -s streq-1.E || rm -f streq-1.E
 $xx t = f  > streq-2.O 2> streq-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test streq-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test streq-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp streq-2.O $srcdir/streq-2.X > /dev/null 2>&1
@@ -3711,7 +3711,7 @@ test -s streq-2.E || rm -f streq-2.E
 $xx ! = !  > streq-3.O 2> streq-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test streq-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test streq-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp streq-3.O $srcdir/streq-3.X > /dev/null 2>&1
@@ -3729,7 +3729,7 @@ test -s streq-3.E || rm -f streq-3.E
 $xx = = =  > streq-4.O 2> streq-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test streq-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test streq-4 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp streq-4.O $srcdir/streq-4.X > /dev/null 2>&1
@@ -3747,7 +3747,7 @@ test -s streq-4.E || rm -f streq-4.E
 $xx '(' = '('  > streq-5.O 2> streq-5.E
 code=$?
 if test $code != 0; then
-  $echo "Test streq-5 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test streq-5 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp streq-5.O $srcdir/streq-5.X > /dev/null 2>&1
@@ -3765,7 +3765,7 @@ test -s streq-5.E || rm -f streq-5.E
 $xx '(' = ')'  > streq-6.O 2> streq-6.E
 code=$?
 if test $code != 1; then
-  $echo "Test streq-6 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test streq-6 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp streq-6.O $srcdir/streq-6.X > /dev/null 2>&1
@@ -3783,7 +3783,7 @@ test -s streq-6.E || rm -f streq-6.E
 $xx t != t  > strne-1.O 2> strne-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test strne-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test strne-1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp strne-1.O $srcdir/strne-1.X > /dev/null 2>&1
@@ -3801,7 +3801,7 @@ test -s strne-1.E || rm -f strne-1.E
 $xx t != f  > strne-2.O 2> strne-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test strne-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test strne-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp strne-2.O $srcdir/strne-2.X > /dev/null 2>&1
@@ -3819,7 +3819,7 @@ test -s strne-2.E || rm -f strne-2.E
 $xx ! != !  > strne-3.O 2> strne-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test strne-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test strne-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp strne-3.O $srcdir/strne-3.X > /dev/null 2>&1
@@ -3837,7 +3837,7 @@ test -s strne-3.E || rm -f strne-3.E
 $xx = != =  > strne-4.O 2> strne-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test strne-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test strne-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp strne-4.O $srcdir/strne-4.X > /dev/null 2>&1
@@ -3855,7 +3855,7 @@ test -s strne-4.E || rm -f strne-4.E
 $xx '(' != '('  > strne-5.O 2> strne-5.E
 code=$?
 if test $code != 1; then
-  $echo "Test strne-5 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test strne-5 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp strne-5.O $srcdir/strne-5.X > /dev/null 2>&1
@@ -3873,7 +3873,7 @@ test -s strne-5.E || rm -f strne-5.E
 $xx '(' != ')'  > strne-6.O 2> strne-6.E
 code=$?
 if test $code != 0; then
-  $echo "Test strne-6 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test strne-6 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp strne-6.O $srcdir/strne-6.X > /dev/null 2>&1
@@ -3891,7 +3891,7 @@ test -s strne-6.E || rm -f strne-6.E
 $xx t -a t  > and-1.O 2> and-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test and-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test and-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp and-1.O $srcdir/and-1.X > /dev/null 2>&1
@@ -3909,7 +3909,7 @@ test -s and-1.E || rm -f and-1.E
 $xx '' -a t  > and-2.O 2> and-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test and-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test and-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp and-2.O $srcdir/and-2.X > /dev/null 2>&1
@@ -3927,7 +3927,7 @@ test -s and-2.E || rm -f and-2.E
 $xx t -a ''  > and-3.O 2> and-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test and-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test and-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp and-3.O $srcdir/and-3.X > /dev/null 2>&1
@@ -3945,7 +3945,7 @@ test -s and-3.E || rm -f and-3.E
 $xx '' -a ''  > and-4.O 2> and-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test and-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test and-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp and-4.O $srcdir/and-4.X > /dev/null 2>&1
@@ -3963,7 +3963,7 @@ test -s and-4.E || rm -f and-4.E
 $xx t -o t  > or-1.O 2> or-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test or-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test or-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp or-1.O $srcdir/or-1.X > /dev/null 2>&1
@@ -3981,7 +3981,7 @@ test -s or-1.E || rm -f or-1.E
 $xx '' -o t  > or-2.O 2> or-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test or-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test or-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp or-2.O $srcdir/or-2.X > /dev/null 2>&1
@@ -3999,7 +3999,7 @@ test -s or-2.E || rm -f or-2.E
 $xx t -o ''  > or-3.O 2> or-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test or-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test or-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp or-3.O $srcdir/or-3.X > /dev/null 2>&1
@@ -4017,7 +4017,7 @@ test -s or-3.E || rm -f or-3.E
 $xx '' -o ''  > or-4.O 2> or-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test or-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test or-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp or-4.O $srcdir/or-4.X > /dev/null 2>&1
@@ -4035,7 +4035,7 @@ test -s or-4.E || rm -f or-4.E
 $xx 9 -eq 9  > eq-1.O 2> eq-1.E
 code=$?
 if test $code != 0; then
-  $echo "Test eq-1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test eq-1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp eq-1.O $srcdir/eq-1.X > /dev/null 2>&1
@@ -4053,7 +4053,7 @@ test -s eq-1.E || rm -f eq-1.E
 $xx 0 -eq 0  > eq-2.O 2> eq-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test eq-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test eq-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp eq-2.O $srcdir/eq-2.X > /dev/null 2>&1
@@ -4071,7 +4071,7 @@ test -s eq-2.E || rm -f eq-2.E
 $xx 0 -eq 00  > eq-3.O 2> eq-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test eq-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test eq-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp eq-3.O $srcdir/eq-3.X > /dev/null 2>&1
@@ -4089,7 +4089,7 @@ test -s eq-3.E || rm -f eq-3.E
 $xx 8 -eq 9  > eq-4.O 2> eq-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test eq-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test eq-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp eq-4.O $srcdir/eq-4.X > /dev/null 2>&1
@@ -4107,7 +4107,7 @@ test -s eq-4.E || rm -f eq-4.E
 $xx 1 -eq 0  > eq-5.O 2> eq-5.E
 code=$?
 if test $code != 1; then
-  $echo "Test eq-5 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test eq-5 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp eq-5.O $srcdir/eq-5.X > /dev/null 2>&1
@@ -4125,7 +4125,7 @@ test -s eq-5.E || rm -f eq-5.E
 $xx 5 -gt 5  > gt-1.O 2> gt-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test gt-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test gt-1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp gt-1.O $srcdir/gt-1.X > /dev/null 2>&1
@@ -4143,7 +4143,7 @@ test -s gt-1.E || rm -f gt-1.E
 $xx 5 -gt 4  > gt-2.O 2> gt-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test gt-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test gt-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp gt-2.O $srcdir/gt-2.X > /dev/null 2>&1
@@ -4161,7 +4161,7 @@ test -s gt-2.E || rm -f gt-2.E
 $xx 4 -gt 5  > gt-3.O 2> gt-3.E
 code=$?
 if test $code != 1; then
-  $echo "Test gt-3 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test gt-3 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp gt-3.O $srcdir/gt-3.X > /dev/null 2>&1
@@ -4179,7 +4179,7 @@ test -s gt-3.E || rm -f gt-3.E
 $xx -1 -gt -2  > gt-4.O 2> gt-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test gt-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test gt-4 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp gt-4.O $srcdir/gt-4.X > /dev/null 2>&1
@@ -4197,7 +4197,7 @@ test -s gt-4.E || rm -f gt-4.E
 $xx 5 -lt 5  > lt-1.O 2> lt-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test lt-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test lt-1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp lt-1.O $srcdir/lt-1.X > /dev/null 2>&1
@@ -4215,7 +4215,7 @@ test -s lt-1.E || rm -f lt-1.E
 $xx 5 -lt 4  > lt-2.O 2> lt-2.E
 code=$?
 if test $code != 1; then
-  $echo "Test lt-2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test lt-2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp lt-2.O $srcdir/lt-2.X > /dev/null 2>&1
@@ -4233,7 +4233,7 @@ test -s lt-2.E || rm -f lt-2.E
 $xx 4 -lt 5  > lt-3.O 2> lt-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test lt-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test lt-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp lt-3.O $srcdir/lt-3.X > /dev/null 2>&1
@@ -4251,7 +4251,7 @@ test -s lt-3.E || rm -f lt-3.E
 $xx -1 -lt -2  > lt-4.O 2> lt-4.E
 code=$?
 if test $code != 1; then
-  $echo "Test lt-4 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test lt-4 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp lt-4.O $srcdir/lt-4.X > /dev/null 2>&1
@@ -4269,7 +4269,7 @@ test -s lt-4.E || rm -f lt-4.E
 $xx 0x0 -eq 00  > inv-1.O 2> inv-1.E
 code=$?
 if test $code != 2; then
-  $echo "Test inv-1 failed: ../../src/test return code $code differs from expected value 2" 1>&2
+  $echo "Test inv-1 failed: $xx return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
   cmp inv-1.O $srcdir/inv-1.X > /dev/null 2>&1
@@ -4287,7 +4287,7 @@ test -s inv-1.E || rm -f inv-1.E
 $xx -t  > t1.O 2> t1.E
 code=$?
 if test $code != 0; then
-  $echo "Test t1 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test t1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t1.O $srcdir/t1.X > /dev/null 2>&1
@@ -4305,7 +4305,7 @@ test -s t1.E || rm -f t1.E
 $xx -t 1  > t2.O 2> t2.E
 code=$?
 if test $code != 1; then
-  $echo "Test t2 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test t2 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t2.O $srcdir/t2.X > /dev/null 2>&1
@@ -4323,7 +4323,7 @@ test -s t2.E || rm -f t2.E
 $xx '(' '' ')'  > paren-1.O 2> paren-1.E
 code=$?
 if test $code != 1; then
-  $echo "Test paren-1 failed: ../../src/test return code $code differs from expected value 1" 1>&2
+  $echo "Test paren-1 failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp paren-1.O $srcdir/paren-1.X > /dev/null 2>&1
@@ -4341,7 +4341,7 @@ test -s paren-1.E || rm -f paren-1.E
 $xx '(' '(' ')'  > paren-2.O 2> paren-2.E
 code=$?
 if test $code != 0; then
-  $echo "Test paren-2 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test paren-2 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp paren-2.O $srcdir/paren-2.X > /dev/null 2>&1
@@ -4359,7 +4359,7 @@ test -s paren-2.E || rm -f paren-2.E
 $xx '(' ')' ')'  > paren-3.O 2> paren-3.E
 code=$?
 if test $code != 0; then
-  $echo "Test paren-3 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test paren-3 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp paren-3.O $srcdir/paren-3.X > /dev/null 2>&1
@@ -4377,7 +4377,7 @@ test -s paren-3.E || rm -f paren-3.E
 $xx '(' ! ')'  > paren-4.O 2> paren-4.E
 code=$?
 if test $code != 0; then
-  $echo "Test paren-4 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test paren-4 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp paren-4.O $srcdir/paren-4.X > /dev/null 2>&1
@@ -4395,7 +4395,7 @@ test -s paren-4.E || rm -f paren-4.E
 $xx '(' -a ')'  > paren-5.O 2> paren-5.E
 code=$?
 if test $code != 0; then
-  $echo "Test paren-5 failed: ../../src/test return code $code differs from expected value 0" 1>&2
+  $echo "Test paren-5 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp paren-5.O $srcdir/paren-5.X > /dev/null 2>&1
diff --git a/tests/tr/tr-tests b/tests/tr/tr-tests
index 92f62dfa6..9dd13ee7b 100755
--- a/tests/tr/tr-tests
+++ b/tests/tr/tr-tests
@@ -21,7 +21,7 @@ export LANG
 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
+  $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
@@ -39,7 +39,7 @@ test -s 1.E || rm -f 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
+  $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
 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
+  $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
@@ -75,7 +75,7 @@ test -s 2.E || rm -f 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
+  $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
@@ -93,7 +93,7 @@ test -s 2.E || rm -f 2.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
+  $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
@@ -111,7 +111,7 @@ test -s 3.E || rm -f 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
+  $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
@@ -129,7 +129,7 @@ test -s 3.E || rm -f 3.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
+  $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
@@ -147,7 +147,7 @@ test -s 4.E || rm -f 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
+  $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
@@ -165,7 +165,7 @@ test -s 4.E || rm -f 4.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
+  $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
@@ -183,7 +183,7 @@ test -s 5.E || rm -f 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
+  $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
@@ -201,7 +201,7 @@ test -s 5.E || rm -f 5.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
+  $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
@@ -219,7 +219,7 @@ test -s 6.E || rm -f 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
+  $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
@@ -237,7 +237,7 @@ test -s 6.E || rm -f 6.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
+  $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
@@ -255,7 +255,7 @@ test -s 7.E || rm -f 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
+  $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
@@ -273,7 +273,7 @@ test -s 7.E || rm -f 7.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
+  $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
@@ -291,7 +291,7 @@ test -s 8.E || rm -f 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
+  $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
@@ -309,7 +309,7 @@ test -s 8.E || rm -f 8.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
+  $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
@@ -327,7 +327,7 @@ test -s 9.E || rm -f 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
+  $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
@@ -345,7 +345,7 @@ test -s 9.E || rm -f 9.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
+  $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
@@ -363,7 +363,7 @@ test -s a.E || rm -f 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
+  $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
@@ -381,7 +381,7 @@ test -s a.E || rm -f a.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
+  $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
@@ -399,7 +399,7 @@ test -s b.E || rm -f 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
+  $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
@@ -417,7 +417,7 @@ test -s b.E || rm -f b.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
+  $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
@@ -435,7 +435,7 @@ test -s c.E || rm -f 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
+  $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
@@ -453,7 +453,7 @@ test -s c.E || rm -f c.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
+  $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
@@ -471,7 +471,7 @@ test -s d.E || rm -f 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
+  $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
@@ -489,7 +489,7 @@ test -s d.E || rm -f d.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
+  $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
@@ -507,7 +507,7 @@ test -s e.E || rm -f 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
+  $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
@@ -525,7 +525,7 @@ test -s e.E || rm -f e.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
+  $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
@@ -543,7 +543,7 @@ test -s f.E || rm -f 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
+  $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
@@ -561,7 +561,7 @@ test -s f.E || rm -f f.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
+  $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
@@ -579,7 +579,7 @@ test -s g.E || rm -f 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
+  $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
@@ -597,7 +597,7 @@ test -s g.E || rm -f g.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
+  $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
@@ -615,7 +615,7 @@ test -s h.E || rm -f 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
+  $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
@@ -633,7 +633,7 @@ test -s h.E || rm -f h.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
+  $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
@@ -651,7 +651,7 @@ test -s i.E || rm -f 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
+  $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
@@ -669,7 +669,7 @@ test -s i.E || rm -f i.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
+  $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
@@ -687,7 +687,7 @@ test -s j.E || rm -f 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
+  $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
@@ -705,7 +705,7 @@ test -s j.E || rm -f j.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
+  $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
@@ -723,7 +723,7 @@ test -s k.E || rm -f 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
+  $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
@@ -741,7 +741,7 @@ test -s k.E || rm -f k.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
+  $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
@@ -759,7 +759,7 @@ test -s l.E || rm -f 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
+  $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
@@ -777,7 +777,7 @@ test -s l.E || rm -f l.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
+  $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
@@ -795,7 +795,7 @@ test -s m.E || rm -f 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
+  $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
@@ -813,7 +813,7 @@ test -s m.E || rm -f m.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
+  $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
@@ -831,7 +831,7 @@ test -s n.E || rm -f 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
+  $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
@@ -849,7 +849,7 @@ test -s n.E || rm -f n.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
+  $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
@@ -867,7 +867,7 @@ test -s o.E || rm -f 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
+  $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
@@ -885,7 +885,7 @@ test -s o.E || rm -f o.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
+  $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
@@ -903,7 +903,7 @@ test -s p.E || rm -f 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
+  $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
@@ -921,7 +921,7 @@ test -s p.E || rm -f p.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
+  $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
@@ -939,7 +939,7 @@ test -s q.E || rm -f 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
+  $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
@@ -957,7 +957,7 @@ test -s q.E || rm -f q.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
+  $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
@@ -975,7 +975,7 @@ test -s r.E || rm -f 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
+  $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
@@ -993,7 +993,7 @@ test -s r.E || rm -f r.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
+  $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
@@ -1011,7 +1011,7 @@ test -s s.E || rm -f 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
+  $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
@@ -1029,7 +1029,7 @@ test -s s.E || rm -f s.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
+  $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
@@ -1047,7 +1047,7 @@ test -s t.E || rm -f 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
+  $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
@@ -1065,7 +1065,7 @@ test -s t.E || rm -f t.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
+  $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
@@ -1083,7 +1083,7 @@ test -s u.E || rm -f 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
+  $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
@@ -1101,7 +1101,7 @@ test -s u.E || rm -f u.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
+  $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
@@ -1119,7 +1119,7 @@ test -s v.E || rm -f 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
+  $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
@@ -1137,7 +1137,7 @@ test -s v.E || rm -f v.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
+  $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
@@ -1155,7 +1155,7 @@ test -s w.E || rm -f 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
+  $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
@@ -1173,7 +1173,7 @@ test -s w.E || rm -f w.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
+  $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
@@ -1191,7 +1191,7 @@ test -s x.E || rm -f 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
+  $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
@@ -1209,7 +1209,7 @@ test -s x.E || rm -f x.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
+  $echo "Test y(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp y.O $srcdir/y.X > /dev/null 2>&1
@@ -1227,7 +1227,7 @@ test -s y.E || rm -f 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
+  $echo "Test y(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp y.O $srcdir/y.X > /dev/null 2>&1
@@ -1245,7 +1245,7 @@ test -s y.E || rm -f y.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
+  $echo "Test z(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp z.O $srcdir/z.X > /dev/null 2>&1
@@ -1263,7 +1263,7 @@ test -s z.E || rm -f 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
+  $echo "Test z(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp z.O $srcdir/z.X > /dev/null 2>&1
@@ -1281,7 +1281,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test range-a-a(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test range-a-a(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp range-a-a.O $srcdir/range-a-a.X > /dev/null 2>&1
@@ -1299,7 +1299,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test range-a-a(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test range-a-a(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp range-a-a.O $srcdir/range-a-a.X > /dev/null 2>&1
@@ -1317,7 +1317,7 @@ test -s range-a-a.E || rm -f range-a-a.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
+  $echo "Test null(|) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp null.O $srcdir/null.X > /dev/null 2>&1
@@ -1335,7 +1335,7 @@ test -s null.E || rm -f 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
+  $echo "Test null(<) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp null.O $srcdir/null.X > /dev/null 2>&1
@@ -1353,7 +1353,7 @@ test -s null.E || rm -f null.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
+  $echo "Test upcase(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp upcase.O $srcdir/upcase.X > /dev/null 2>&1
@@ -1371,7 +1371,7 @@ test -s upcase.E || rm -f 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
+  $echo "Test upcase(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp upcase.O $srcdir/upcase.X > /dev/null 2>&1
@@ -1389,7 +1389,7 @@ test -s upcase.E || rm -f upcase.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
+  $echo "Test dncase(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp dncase.O $srcdir/dncase.X > /dev/null 2>&1
@@ -1407,7 +1407,7 @@ test -s dncase.E || rm -f 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
+  $echo "Test dncase(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp dncase.O $srcdir/dncase.X > /dev/null 2>&1
@@ -1425,7 +1425,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test rep-cclass(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test rep-cclass(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rep-cclass.O $srcdir/rep-cclass.X > /dev/null 2>&1
@@ -1443,7 +1443,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test rep-cclass(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test rep-cclass(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rep-cclass.O $srcdir/rep-cclass.X > /dev/null 2>&1
@@ -1461,7 +1461,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test rep-1(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test rep-1(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rep-1.O $srcdir/rep-1.X > /dev/null 2>&1
@@ -1479,7 +1479,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test rep-1(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test rep-1(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rep-1.O $srcdir/rep-1.X > /dev/null 2>&1
@@ -1497,7 +1497,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test rep-2(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test rep-2(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rep-2.O $srcdir/rep-2.X > /dev/null 2>&1
@@ -1515,7 +1515,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test rep-2(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test rep-2(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rep-2.O $srcdir/rep-2.X > /dev/null 2>&1
@@ -1533,7 +1533,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test rep-3(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test rep-3(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rep-3.O $srcdir/rep-3.X > /dev/null 2>&1
@@ -1551,7 +1551,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test rep-3(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test rep-3(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp rep-3.O $srcdir/rep-3.X > /dev/null 2>&1
@@ -1569,7 +1569,7 @@ 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
 code=$?
 if test $code != 1; then
-  $echo "Test o-rep-1(|) failed: ../../src/tr return code $code differs from expected value 1" 1>&2
+  $echo "Test o-rep-1(|) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp o-rep-1.O $srcdir/o-rep-1.X > /dev/null 2>&1
@@ -1587,7 +1587,7 @@ 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
 code=$?
 if test $code != 1; then
-  $echo "Test o-rep-1(<) failed: ../../src/tr return code $code differs from expected value 1" 1>&2
+  $echo "Test o-rep-1(<) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp o-rep-1.O $srcdir/o-rep-1.X > /dev/null 2>&1
@@ -1605,7 +1605,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test o-rep-2(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test o-rep-2(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp o-rep-2.O $srcdir/o-rep-2.X > /dev/null 2>&1
@@ -1623,7 +1623,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test o-rep-2(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test o-rep-2(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp o-rep-2.O $srcdir/o-rep-2.X > /dev/null 2>&1
@@ -1641,7 +1641,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test esc(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test esc(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp esc.O $srcdir/esc.X > /dev/null 2>&1
@@ -1659,7 +1659,7 @@ test -s esc.E || rm -f 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
+  $echo "Test esc(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp esc.O $srcdir/esc.X > /dev/null 2>&1
@@ -1677,7 +1677,7 @@ 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
 code=$?
 if test $code != 1; then
-  $echo "Test ross-0a(|) failed: ../../src/tr return code $code differs from expected value 1" 1>&2
+  $echo "Test ross-0a(|) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ross-0a.O $srcdir/ross-0a.X > /dev/null 2>&1
@@ -1695,7 +1695,7 @@ 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
 code=$?
 if test $code != 1; then
-  $echo "Test ross-0a(<) failed: ../../src/tr return code $code differs from expected value 1" 1>&2
+  $echo "Test ross-0a(<) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ross-0a.O $srcdir/ross-0a.X > /dev/null 2>&1
@@ -1713,7 +1713,7 @@ 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
 code=$?
 if test $code != 1; then
-  $echo "Test ross-0b(|) failed: ../../src/tr return code $code differs from expected value 1" 1>&2
+  $echo "Test ross-0b(|) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ross-0b.O $srcdir/ross-0b.X > /dev/null 2>&1
@@ -1731,7 +1731,7 @@ 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
 code=$?
 if test $code != 1; then
-  $echo "Test ross-0b(<) failed: ../../src/tr return code $code differs from expected value 1" 1>&2
+  $echo "Test ross-0b(<) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ross-0b.O $srcdir/ross-0b.X > /dev/null 2>&1
@@ -1749,7 +1749,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test ross-1a(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test ross-1a(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ross-1a.O $srcdir/ross-1a.X > /dev/null 2>&1
@@ -1767,7 +1767,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test ross-1a(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test ross-1a(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ross-1a.O $srcdir/ross-1a.X > /dev/null 2>&1
@@ -1785,7 +1785,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test ross-1b(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test ross-1b(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ross-1b.O $srcdir/ross-1b.X > /dev/null 2>&1
@@ -1803,7 +1803,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test ross-1b(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test ross-1b(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ross-1b.O $srcdir/ross-1b.X > /dev/null 2>&1
@@ -1821,7 +1821,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test ross-2(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test ross-2(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ross-2.O $srcdir/ross-2.X > /dev/null 2>&1
@@ -1839,7 +1839,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test ross-2(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test ross-2(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ross-2.O $srcdir/ross-2.X > /dev/null 2>&1
@@ -1857,7 +1857,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test ross-3(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test ross-3(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ross-3.O $srcdir/ross-3.X > /dev/null 2>&1
@@ -1875,7 +1875,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test ross-3(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test ross-3(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ross-3.O $srcdir/ross-3.X > /dev/null 2>&1
@@ -1893,7 +1893,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test ross-4(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test ross-4(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ross-4.O $srcdir/ross-4.X > /dev/null 2>&1
@@ -1911,7 +1911,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test ross-4(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test ross-4(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ross-4.O $srcdir/ross-4.X > /dev/null 2>&1
@@ -1929,7 +1929,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test ross-5(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test ross-5(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ross-5.O $srcdir/ross-5.X > /dev/null 2>&1
@@ -1947,7 +1947,7 @@ test -s ross-5.E || rm -f 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
+  $echo "Test ross-5(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ross-5.O $srcdir/ross-5.X > /dev/null 2>&1
@@ -1965,7 +1965,7 @@ 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
 code=$?
 if test $code != 0; then
-  $echo "Test ross-6(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test ross-6(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ross-6.O $srcdir/ross-6.X > /dev/null 2>&1
@@ -1983,7 +1983,7 @@ test -s ross-6.E || rm -f 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
+  $echo "Test ross-6(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp ross-6.O $srcdir/ross-6.X > /dev/null 2>&1
@@ -2001,7 +2001,7 @@ test -s ross-6.E || rm -f ross-6.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
+  $echo "Test empty-eq(|) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp empty-eq.O $srcdir/empty-eq.X > /dev/null 2>&1
@@ -2019,7 +2019,7 @@ test -s empty-eq.E || rm -f 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
+  $echo "Test empty-eq(<) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp empty-eq.O $srcdir/empty-eq.X > /dev/null 2>&1
@@ -2037,7 +2037,7 @@ test -s empty-eq.E || rm -f empty-eq.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
+  $echo "Test empty-cc(|) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp empty-cc.O $srcdir/empty-cc.X > /dev/null 2>&1
@@ -2055,7 +2055,7 @@ test -s empty-cc.E || rm -f 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
+  $echo "Test empty-cc(<) failed: $xx return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp empty-cc.O $srcdir/empty-cc.X > /dev/null 2>&1
diff --git a/tests/wc/wc-tests b/tests/wc/wc-tests
index c94bf73fb..4ca8e0f29 100755
--- a/tests/wc/wc-tests
+++ b/tests/wc/wc-tests
@@ -21,7 +21,7 @@ export LANG
 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
+  $echo "Test a0(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a0.O $srcdir/a0.X > /dev/null 2>&1
@@ -39,7 +39,7 @@ test -s a0.E || rm -f 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
+  $echo "Test a0(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a0.O $srcdir/a0.X > /dev/null 2>&1
@@ -57,7 +57,7 @@ test -s a0.E || rm -f a0.E
 cat $srcdir/a1.I | $xx -l > a1.O 2> a1.E
 code=$?
 if test $code != 0; then
-  $echo "Test a1(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
+  $echo "Test a1(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a1.O $srcdir/a1.X > /dev/null 2>&1
@@ -75,7 +75,7 @@ test -s a1.E || rm -f 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
+  $echo "Test a1(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a1.O $srcdir/a1.X > /dev/null 2>&1
@@ -93,7 +93,7 @@ test -s a1.E || rm -f a1.E
 cat $srcdir/a2.I | $xx -w > a2.O 2> a2.E
 code=$?
 if test $code != 0; then
-  $echo "Test a2(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
+  $echo "Test a2(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a2.O $srcdir/a2.X > /dev/null 2>&1
@@ -111,7 +111,7 @@ test -s a2.E || rm -f 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
+  $echo "Test a2(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a2.O $srcdir/a2.X > /dev/null 2>&1
@@ -129,7 +129,7 @@ test -s a2.E || rm -f a2.E
 cat $srcdir/a3.I | $xx -c > a3.O 2> a3.E
 code=$?
 if test $code != 0; then
-  $echo "Test a3(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
+  $echo "Test a3(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a3.O $srcdir/a3.X > /dev/null 2>&1
@@ -147,7 +147,7 @@ test -s a3.E || rm -f 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
+  $echo "Test a3(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a3.O $srcdir/a3.X > /dev/null 2>&1
@@ -165,7 +165,7 @@ test -s a3.E || rm -f a3.E
 cat $srcdir/a4.I | $xx -w > a4.O 2> a4.E
 code=$?
 if test $code != 0; then
-  $echo "Test a4(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
+  $echo "Test a4(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a4.O $srcdir/a4.X > /dev/null 2>&1
@@ -183,7 +183,7 @@ test -s a4.E || rm -f 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
+  $echo "Test a4(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a4.O $srcdir/a4.X > /dev/null 2>&1
@@ -201,7 +201,7 @@ test -s a4.E || rm -f a4.E
 cat $srcdir/a5.I | $xx -w > a5.O 2> a5.E
 code=$?
 if test $code != 0; then
-  $echo "Test a5(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
+  $echo "Test a5(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a5.O $srcdir/a5.X > /dev/null 2>&1
@@ -219,7 +219,7 @@ test -s a5.E || rm -f 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
+  $echo "Test a5(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a5.O $srcdir/a5.X > /dev/null 2>&1
@@ -237,7 +237,7 @@ test -s a5.E || rm -f a5.E
 cat $srcdir/a6.I | $xx -w > a6.O 2> a6.E
 code=$?
 if test $code != 0; then
-  $echo "Test a6(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
+  $echo "Test a6(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a6.O $srcdir/a6.X > /dev/null 2>&1
@@ -255,7 +255,7 @@ test -s a6.E || rm -f 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
+  $echo "Test a6(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a6.O $srcdir/a6.X > /dev/null 2>&1
@@ -273,7 +273,7 @@ test -s a6.E || rm -f a6.E
 cat $srcdir/a7.I | $xx -l > a7.O 2> a7.E
 code=$?
 if test $code != 0; then
-  $echo "Test a7(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
+  $echo "Test a7(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a7.O $srcdir/a7.X > /dev/null 2>&1
@@ -291,7 +291,7 @@ test -s a7.E || rm -f 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
+  $echo "Test a7(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a7.O $srcdir/a7.X > /dev/null 2>&1
@@ -309,7 +309,7 @@ test -s a7.E || rm -f a7.E
 cat $srcdir/a8.I | $xx -l > a8.O 2> a8.E
 code=$?
 if test $code != 0; then
-  $echo "Test a8(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
+  $echo "Test a8(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a8.O $srcdir/a8.X > /dev/null 2>&1
@@ -327,7 +327,7 @@ test -s a8.E || rm -f 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
+  $echo "Test a8(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a8.O $srcdir/a8.X > /dev/null 2>&1
@@ -345,7 +345,7 @@ test -s a8.E || rm -f a8.E
 cat $srcdir/a9.I | $xx -l > a9.O 2> a9.E
 code=$?
 if test $code != 0; then
-  $echo "Test a9(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
+  $echo "Test a9(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a9.O $srcdir/a9.X > /dev/null 2>&1
@@ -363,7 +363,7 @@ test -s a9.E || rm -f 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
+  $echo "Test a9(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a9.O $srcdir/a9.X > /dev/null 2>&1
@@ -381,7 +381,7 @@ test -s a9.E || rm -f a9.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
+  $echo "Test b0 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp b0.O $srcdir/b0.X > /dev/null 2>&1
@@ -399,7 +399,7 @@ test -s b0.E || rm -f b0.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
+  $echo "Test b1 failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp b1.O $srcdir/b1.X > /dev/null 2>&1
@@ -417,7 +417,7 @@ test -s b1.E || rm -f b1.E
 cat $srcdir/c0.I | $xx -L > c0.O 2> c0.E
 code=$?
 if test $code != 0; then
-  $echo "Test c0(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
+  $echo "Test c0(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp c0.O $srcdir/c0.X > /dev/null 2>&1
@@ -435,7 +435,7 @@ test -s c0.E || rm -f 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
+  $echo "Test c0(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp c0.O $srcdir/c0.X > /dev/null 2>&1
@@ -453,7 +453,7 @@ test -s c0.E || rm -f c0.E
 cat $srcdir/c1.I | $xx -L > c1.O 2> c1.E
 code=$?
 if test $code != 0; then
-  $echo "Test c1(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
+  $echo "Test c1(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp c1.O $srcdir/c1.X > /dev/null 2>&1
@@ -471,7 +471,7 @@ test -s c1.E || rm -f 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
+  $echo "Test c1(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp c1.O $srcdir/c1.X > /dev/null 2>&1
@@ -489,7 +489,7 @@ test -s c1.E || rm -f c1.E
 cat $srcdir/c2.I | $xx -L > c2.O 2> c2.E
 code=$?
 if test $code != 0; then
-  $echo "Test c2(|) failed: ../../src/wc return code $code differs from expected value 0" 1>&2
+  $echo "Test c2(|) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp c2.O $srcdir/c2.X > /dev/null 2>&1
@@ -507,7 +507,7 @@ test -s c2.E || rm -f 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
+  $echo "Test c2(<) failed: $xx return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp c2.O $srcdir/c2.X > /dev/null 2>&1