regenerate

1 files changed, 111 insertions, 111 deletions

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