regenerate

1 files changed, 114 insertions, 114 deletions

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