regenerate

1 files changed, 51 insertions, 51 deletions

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