.

3 files changed, 316 insertions, 53 deletions

diff --git a/tests/sort/Makefile.am b/tests/sort/Makefile.am
index 04138e376..5d8f68b7f 100644
--- a/tests/sort/Makefile.am
+++ b/tests/sort/Makefile.am
@@ -3,32 +3,36 @@
 ##test-files-begin
 x = sort
 explicit =
-maint_gen = 01a.I 01a.X 02a.I 02a.X 02b.I 02b.X 02c.I 02c.X 02d.I 02d.X 02e.I \
-02e.X 02f.I 02f.X 03a.I 03a.X 03b.I 03b.X 03c.I 03c.X 03d.I 03d.X 03e.I 03e.X \
-03f.I 03f.X 03g.I 03g.X 03h.I 03h.X 03i.I 03i.X 04a.I 04a.X 04b.I 04b.X 04c.I \
-04c.X 04d.I 04d.X 04e.I 04e.X 05a.I 05a.X 05b.I 05b.X 05c.I 05c.X 05d.I 05d.X \
-05e.I 05e.X 05f.I 05f.X 06a.I 06a.X 06b.I 06b.X 06c.I 06c.X 06d.I 06d.X 06e.I \
-06e.X 06f.I 06f.X 07a.I 07a.X 07b.I 07b.X 07c.I 07c.X 07d.I 07d.X 08a.I 08a.X \
-08b.I 08b.X 09a.I 09a.X 09b.I 09b.X 09c.I 09c.X 09d.I 09d.X 10a.I 10a.X 10b.I \
-10b.X 10c.I 10c.X 10d.I 10d.X 10a0.I 10a0.X 10a1.I 10a1.X 10a2.I 10a2.X 10e.I \
-10e.X 10f.I 10f.X 10g.I 10g.X 11a.I 11a.X 11b.I 11b.X 11c.I 11c.X 11d.I 11d.X \
-12a.I 12a.X 12b.I 12b.X 12c.I 12c.X 12d.I 12d.X 13a.I 13a.X 13b.I 13b.X 14a.I \
-14a.X 14b.I 14b.X 15a.I 15a.X 15b.I 15b.X 15c.I 15c.X 15d.I 15d.X 15e.I 15e.X \
-16a.I 16a.X 17.I 17.X 18a.I 18a.X 18b.I 18b.X 18c.I 18c.X 18d.I 18d.X 18e.I \
-18e.X 19a.I 19a.X 19b.I 19b.X 20a.I 20a.X
-run_gen = 01a.O 01a.E 02a.O 02a.E 02b.O 02b.E 02c.O 02c.E 02d.O 02d.E 02e.O \
-02e.E 02f.O 02f.E 03a.O 03a.E 03b.O 03b.E 03c.O 03c.E 03d.O 03d.E 03e.O 03e.E \
-03f.O 03f.E 03g.O 03g.E 03h.O 03h.E 03i.O 03i.E 04a.O 04a.E 04b.O 04b.E 04c.O \
-04c.E 04d.O 04d.E 04e.O 04e.E 05a.O 05a.E 05b.O 05b.E 05c.O 05c.E 05d.O 05d.E \
-05e.O 05e.E 05f.O 05f.E 06a.O 06a.E 06b.O 06b.E 06c.O 06c.E 06d.O 06d.E 06e.O \
-06e.E 06f.O 06f.E 07a.O 07a.E 07b.O 07b.E 07c.O 07c.E 07d.O 07d.E 08a.O 08a.E \
-08b.O 08b.E 09a.O 09a.E 09b.O 09b.E 09c.O 09c.E 09d.O 09d.E 10a.O 10a.E 10b.O \
-10b.E 10c.O 10c.E 10d.O 10d.E 10a0.O 10a0.E 10a1.O 10a1.E 10a2.O 10a2.E 10e.O \
-10e.E 10f.O 10f.E 10g.O 10g.E 11a.O 11a.E 11b.O 11b.E 11c.O 11c.E 11d.O 11d.E \
-12a.O 12a.E 12b.O 12b.E 12c.O 12c.E 12d.O 12d.E 13a.O 13a.E 13b.O 13b.E 14a.O \
-14a.E 14b.O 14b.E 15a.O 15a.E 15b.O 15b.E 15c.O 15c.E 15d.O 15d.E 15e.O 15e.E \
-16a.O 16a.E 17.O 17.E 18a.O 18a.E 18b.O 18b.E 18c.O 18c.E 18d.O 18d.E 18e.O \
-18e.E 19a.O 19a.E 19b.O 19b.E 20a.O 20a.E
+maint_gen = n1.I n1.X n2.I n2.X n3.I n3.X n4.I n4.X n5.I n5.X n6.I n6.X n7.I \
+n7.X n8a.I n8a.X n8b.I n8b.X n9a.I n9a.X n9b.I n9b.X n10a.I n10a.X n10b.I \
+n10b.X n11a.I n11a.X n11b.I n11b.X 01a.I 01a.X 02a.I 02a.X 02b.I 02b.X 02c.I \
+02c.X 02d.I 02d.X 02e.I 02e.X 02f.I 02f.X 03a.I 03a.X 03b.I 03b.X 03c.I 03c.X \
+03d.I 03d.X 03e.I 03e.X 03f.I 03f.X 03g.I 03g.X 03h.I 03h.X 03i.I 03i.X 04a.I \
+04a.X 04b.I 04b.X 04c.I 04c.X 04d.I 04d.X 04e.I 04e.X 05a.I 05a.X 05b.I 05b.X \
+05c.I 05c.X 05d.I 05d.X 05e.I 05e.X 05f.I 05f.X 06a.I 06a.X 06b.I 06b.X 06c.I \
+06c.X 06d.I 06d.X 06e.I 06e.X 06f.I 06f.X 07a.I 07a.X 07b.I 07b.X 07c.I 07c.X \
+07d.I 07d.X 08a.I 08a.X 08b.I 08b.X 09a.I 09a.X 09b.I 09b.X 09c.I 09c.X 09d.I \
+09d.X 10a.I 10a.X 10b.I 10b.X 10c.I 10c.X 10d.I 10d.X 10a0.I 10a0.X 10a1.I \
+10a1.X 10a2.I 10a2.X 10e.I 10e.X 10f.I 10f.X 10g.I 10g.X 11a.I 11a.X 11b.I \
+11b.X 11c.I 11c.X 11d.I 11d.X 12a.I 12a.X 12b.I 12b.X 12c.I 12c.X 12d.I 12d.X \
+13a.I 13a.X 13b.I 13b.X 14a.I 14a.X 14b.I 14b.X 15a.I 15a.X 15b.I 15b.X 15c.I \
+15c.X 15d.I 15d.X 15e.I 15e.X 16a.I 16a.X 17.I 17.X 18a.I 18a.X 18b.I 18b.X \
+18c.I 18c.X 18d.I 18d.X 18e.I 18e.X 19a.I 19a.X 19b.I 19b.X 20a.I 20a.X
+run_gen = n1.O n1.E n2.O n2.E n3.O n3.E n4.O n4.E n5.O n5.E n6.O n6.E n7.O \
+n7.E n8a.O n8a.E n8b.O n8b.E n9a.O n9a.E n9b.O n9b.E n10a.O n10a.E n10b.O \
+n10b.E n11a.O n11a.E n11b.O n11b.E 01a.O 01a.E 02a.O 02a.E 02b.O 02b.E 02c.O \
+02c.E 02d.O 02d.E 02e.O 02e.E 02f.O 02f.E 03a.O 03a.E 03b.O 03b.E 03c.O 03c.E \
+03d.O 03d.E 03e.O 03e.E 03f.O 03f.E 03g.O 03g.E 03h.O 03h.E 03i.O 03i.E 04a.O \
+04a.E 04b.O 04b.E 04c.O 04c.E 04d.O 04d.E 04e.O 04e.E 05a.O 05a.E 05b.O 05b.E \
+05c.O 05c.E 05d.O 05d.E 05e.O 05e.E 05f.O 05f.E 06a.O 06a.E 06b.O 06b.E 06c.O \
+06c.E 06d.O 06d.E 06e.O 06e.E 06f.O 06f.E 07a.O 07a.E 07b.O 07b.E 07c.O 07c.E \
+07d.O 07d.E 08a.O 08a.E 08b.O 08b.E 09a.O 09a.E 09b.O 09b.E 09c.O 09c.E 09d.O \
+09d.E 10a.O 10a.E 10b.O 10b.E 10c.O 10c.E 10d.O 10d.E 10a0.O 10a0.E 10a1.O \
+10a1.E 10a2.O 10a2.E 10e.O 10e.E 10f.O 10f.E 10g.O 10g.E 11a.O 11a.E 11b.O \
+11b.E 11c.O 11c.E 11d.O 11d.E 12a.O 12a.E 12b.O 12b.E 12c.O 12c.E 12d.O 12d.E \
+13a.O 13a.E 13b.O 13b.E 14a.O 14a.E 14b.O 14b.E 15a.O 15a.E 15b.O 15b.E 15c.O \
+15c.E 15d.O 15d.E 15e.O 15e.E 16a.O 16a.E 17.O 17.E 18a.O 18a.E 18b.O 18b.E \
+18c.O 18c.E 18d.O 18d.E 18e.O 18e.E 19a.O 19a.E 19b.O 19b.E 20a.O 20a.E
 ##test-files-end
 
 EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
diff --git a/tests/sort/Makefile.in b/tests/sort/Makefile.in
index 6c2be7d8d..5057bf5f7 100644
--- a/tests/sort/Makefile.in
+++ b/tests/sort/Makefile.in
@@ -87,32 +87,36 @@ l = @l@
 
 x = sort
 explicit =
-maint_gen = 01a.I 01a.X 02a.I 02a.X 02b.I 02b.X 02c.I 02c.X 02d.I 02d.X 02e.I \
-02e.X 02f.I 02f.X 03a.I 03a.X 03b.I 03b.X 03c.I 03c.X 03d.I 03d.X 03e.I 03e.X \
-03f.I 03f.X 03g.I 03g.X 03h.I 03h.X 03i.I 03i.X 04a.I 04a.X 04b.I 04b.X 04c.I \
-04c.X 04d.I 04d.X 04e.I 04e.X 05a.I 05a.X 05b.I 05b.X 05c.I 05c.X 05d.I 05d.X \
-05e.I 05e.X 05f.I 05f.X 06a.I 06a.X 06b.I 06b.X 06c.I 06c.X 06d.I 06d.X 06e.I \
-06e.X 06f.I 06f.X 07a.I 07a.X 07b.I 07b.X 07c.I 07c.X 07d.I 07d.X 08a.I 08a.X \
-08b.I 08b.X 09a.I 09a.X 09b.I 09b.X 09c.I 09c.X 09d.I 09d.X 10a.I 10a.X 10b.I \
-10b.X 10c.I 10c.X 10d.I 10d.X 10a0.I 10a0.X 10a1.I 10a1.X 10a2.I 10a2.X 10e.I \
-10e.X 10f.I 10f.X 10g.I 10g.X 11a.I 11a.X 11b.I 11b.X 11c.I 11c.X 11d.I 11d.X \
-12a.I 12a.X 12b.I 12b.X 12c.I 12c.X 12d.I 12d.X 13a.I 13a.X 13b.I 13b.X 14a.I \
-14a.X 14b.I 14b.X 15a.I 15a.X 15b.I 15b.X 15c.I 15c.X 15d.I 15d.X 15e.I 15e.X \
-16a.I 16a.X 17.I 17.X 18a.I 18a.X 18b.I 18b.X 18c.I 18c.X 18d.I 18d.X 18e.I \
-18e.X 19a.I 19a.X 19b.I 19b.X 20a.I 20a.X
-run_gen = 01a.O 01a.E 02a.O 02a.E 02b.O 02b.E 02c.O 02c.E 02d.O 02d.E 02e.O \
-02e.E 02f.O 02f.E 03a.O 03a.E 03b.O 03b.E 03c.O 03c.E 03d.O 03d.E 03e.O 03e.E \
-03f.O 03f.E 03g.O 03g.E 03h.O 03h.E 03i.O 03i.E 04a.O 04a.E 04b.O 04b.E 04c.O \
-04c.E 04d.O 04d.E 04e.O 04e.E 05a.O 05a.E 05b.O 05b.E 05c.O 05c.E 05d.O 05d.E \
-05e.O 05e.E 05f.O 05f.E 06a.O 06a.E 06b.O 06b.E 06c.O 06c.E 06d.O 06d.E 06e.O \
-06e.E 06f.O 06f.E 07a.O 07a.E 07b.O 07b.E 07c.O 07c.E 07d.O 07d.E 08a.O 08a.E \
-08b.O 08b.E 09a.O 09a.E 09b.O 09b.E 09c.O 09c.E 09d.O 09d.E 10a.O 10a.E 10b.O \
-10b.E 10c.O 10c.E 10d.O 10d.E 10a0.O 10a0.E 10a1.O 10a1.E 10a2.O 10a2.E 10e.O \
-10e.E 10f.O 10f.E 10g.O 10g.E 11a.O 11a.E 11b.O 11b.E 11c.O 11c.E 11d.O 11d.E \
-12a.O 12a.E 12b.O 12b.E 12c.O 12c.E 12d.O 12d.E 13a.O 13a.E 13b.O 13b.E 14a.O \
-14a.E 14b.O 14b.E 15a.O 15a.E 15b.O 15b.E 15c.O 15c.E 15d.O 15d.E 15e.O 15e.E \
-16a.O 16a.E 17.O 17.E 18a.O 18a.E 18b.O 18b.E 18c.O 18c.E 18d.O 18d.E 18e.O \
-18e.E 19a.O 19a.E 19b.O 19b.E 20a.O 20a.E
+maint_gen = n1.I n1.X n2.I n2.X n3.I n3.X n4.I n4.X n5.I n5.X n6.I n6.X n7.I \
+n7.X n8a.I n8a.X n8b.I n8b.X n9a.I n9a.X n9b.I n9b.X n10a.I n10a.X n10b.I \
+n10b.X n11a.I n11a.X n11b.I n11b.X 01a.I 01a.X 02a.I 02a.X 02b.I 02b.X 02c.I \
+02c.X 02d.I 02d.X 02e.I 02e.X 02f.I 02f.X 03a.I 03a.X 03b.I 03b.X 03c.I 03c.X \
+03d.I 03d.X 03e.I 03e.X 03f.I 03f.X 03g.I 03g.X 03h.I 03h.X 03i.I 03i.X 04a.I \
+04a.X 04b.I 04b.X 04c.I 04c.X 04d.I 04d.X 04e.I 04e.X 05a.I 05a.X 05b.I 05b.X \
+05c.I 05c.X 05d.I 05d.X 05e.I 05e.X 05f.I 05f.X 06a.I 06a.X 06b.I 06b.X 06c.I \
+06c.X 06d.I 06d.X 06e.I 06e.X 06f.I 06f.X 07a.I 07a.X 07b.I 07b.X 07c.I 07c.X \
+07d.I 07d.X 08a.I 08a.X 08b.I 08b.X 09a.I 09a.X 09b.I 09b.X 09c.I 09c.X 09d.I \
+09d.X 10a.I 10a.X 10b.I 10b.X 10c.I 10c.X 10d.I 10d.X 10a0.I 10a0.X 10a1.I \
+10a1.X 10a2.I 10a2.X 10e.I 10e.X 10f.I 10f.X 10g.I 10g.X 11a.I 11a.X 11b.I \
+11b.X 11c.I 11c.X 11d.I 11d.X 12a.I 12a.X 12b.I 12b.X 12c.I 12c.X 12d.I 12d.X \
+13a.I 13a.X 13b.I 13b.X 14a.I 14a.X 14b.I 14b.X 15a.I 15a.X 15b.I 15b.X 15c.I \
+15c.X 15d.I 15d.X 15e.I 15e.X 16a.I 16a.X 17.I 17.X 18a.I 18a.X 18b.I 18b.X \
+18c.I 18c.X 18d.I 18d.X 18e.I 18e.X 19a.I 19a.X 19b.I 19b.X 20a.I 20a.X
+run_gen = n1.O n1.E n2.O n2.E n3.O n3.E n4.O n4.E n5.O n5.E n6.O n6.E n7.O \
+n7.E n8a.O n8a.E n8b.O n8b.E n9a.O n9a.E n9b.O n9b.E n10a.O n10a.E n10b.O \
+n10b.E n11a.O n11a.E n11b.O n11b.E 01a.O 01a.E 02a.O 02a.E 02b.O 02b.E 02c.O \
+02c.E 02d.O 02d.E 02e.O 02e.E 02f.O 02f.E 03a.O 03a.E 03b.O 03b.E 03c.O 03c.E \
+03d.O 03d.E 03e.O 03e.E 03f.O 03f.E 03g.O 03g.E 03h.O 03h.E 03i.O 03i.E 04a.O \
+04a.E 04b.O 04b.E 04c.O 04c.E 04d.O 04d.E 04e.O 04e.E 05a.O 05a.E 05b.O 05b.E \
+05c.O 05c.E 05d.O 05d.E 05e.O 05e.E 05f.O 05f.E 06a.O 06a.E 06b.O 06b.E 06c.O \
+06c.E 06d.O 06d.E 06e.O 06e.E 06f.O 06f.E 07a.O 07a.E 07b.O 07b.E 07c.O 07c.E \
+07d.O 07d.E 08a.O 08a.E 08b.O 08b.E 09a.O 09a.E 09b.O 09b.E 09c.O 09c.E 09d.O \
+09d.E 10a.O 10a.E 10b.O 10b.E 10c.O 10c.E 10d.O 10d.E 10a0.O 10a0.E 10a1.O \
+10a1.E 10a2.O 10a2.E 10e.O 10e.E 10f.O 10f.E 10g.O 10g.E 11a.O 11a.E 11b.O \
+11b.E 11c.O 11c.E 11d.O 11d.E 12a.O 12a.E 12b.O 12b.E 12c.O 12c.E 12d.O 12d.E \
+13a.O 13a.E 13b.O 13b.E 14a.O 14a.E 14b.O 14b.E 15a.O 15a.E 15b.O 15b.E 15c.O \
+15c.E 15d.O 15d.E 15e.O 15e.E 16a.O 16a.E 17.O 17.E 18a.O 18a.E 18b.O 18b.E \
+18c.O 18c.E 18d.O 18d.E 18e.O 18e.E 19a.O 19a.E 19b.O 19b.E 20a.O 20a.E
 
 EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
diff --git a/tests/sort/sort-tests b/tests/sort/sort-tests
index 12881a5cc..f518387ce 100755
--- a/tests/sort/sort-tests
+++ b/tests/sort/sort-tests
@@ -18,6 +18,261 @@ export LC_ALL
 LANG=C
 export LANG
 
+$xx -n $srcdir/n1.I > n1.O 2> n1.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n1 failed: ../../src/sort 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
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n1"; fi ;;
+    1) $echo "Test n1 failed: files n1.O and $srcdir/n1.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n1 may have failed." 1>&2;
+       $echo The command "cmp n1.O $srcdir/n1.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n1.E || rm -f n1.E
+$xx -n $srcdir/n2.I > n2.O 2> n2.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n2 failed: ../../src/sort 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
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n2"; fi ;;
+    1) $echo "Test n2 failed: files n2.O and $srcdir/n2.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n2 may have failed." 1>&2;
+       $echo The command "cmp n2.O $srcdir/n2.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n2.E || rm -f n2.E
+$xx -n $srcdir/n3.I > n3.O 2> n3.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n3 failed: ../../src/sort 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
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n3"; fi ;;
+    1) $echo "Test n3 failed: files n3.O and $srcdir/n3.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n3 may have failed." 1>&2;
+       $echo The command "cmp n3.O $srcdir/n3.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n3.E || rm -f n3.E
+$xx -n $srcdir/n4.I > n4.O 2> n4.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n4 failed: ../../src/sort 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
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n4"; fi ;;
+    1) $echo "Test n4 failed: files n4.O and $srcdir/n4.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n4 may have failed." 1>&2;
+       $echo The command "cmp n4.O $srcdir/n4.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n4.E || rm -f n4.E
+$xx -n $srcdir/n5.I > n5.O 2> n5.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n5 failed: ../../src/sort 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
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n5"; fi ;;
+    1) $echo "Test n5 failed: files n5.O and $srcdir/n5.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n5 may have failed." 1>&2;
+       $echo The command "cmp n5.O $srcdir/n5.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n5.E || rm -f n5.E
+$xx -n $srcdir/n6.I > n6.O 2> n6.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n6 failed: ../../src/sort 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
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n6"; fi ;;
+    1) $echo "Test n6 failed: files n6.O and $srcdir/n6.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n6 may have failed." 1>&2;
+       $echo The command "cmp n6.O $srcdir/n6.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n6.E || rm -f n6.E
+$xx -n $srcdir/n7.I > n7.O 2> n7.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n7 failed: ../../src/sort 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
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n7"; fi ;;
+    1) $echo "Test n7 failed: files n7.O and $srcdir/n7.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n7 may have failed." 1>&2;
+       $echo The command "cmp n7.O $srcdir/n7.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n7.E || rm -f n7.E
+$xx -s -n -k1,1 $srcdir/n8a.I > n8a.O 2> n8a.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n8a failed: ../../src/sort 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
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n8a"; fi ;;
+    1) $echo "Test n8a failed: files n8a.O and $srcdir/n8a.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n8a may have failed." 1>&2;
+       $echo The command "cmp n8a.O $srcdir/n8a.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n8a.E || rm -f n8a.E
+$xx -s -n -k1,1 $srcdir/n8b.I > n8b.O 2> n8b.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n8b failed: ../../src/sort 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
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n8b"; fi ;;
+    1) $echo "Test n8b failed: files n8b.O and $srcdir/n8b.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n8b may have failed." 1>&2;
+       $echo The command "cmp n8b.O $srcdir/n8b.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n8b.E || rm -f n8b.E
+$xx -s -n -k1,1 $srcdir/n9a.I > n9a.O 2> n9a.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n9a failed: ../../src/sort 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
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n9a"; fi ;;
+    1) $echo "Test n9a failed: files n9a.O and $srcdir/n9a.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n9a may have failed." 1>&2;
+       $echo The command "cmp n9a.O $srcdir/n9a.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n9a.E || rm -f n9a.E
+$xx -s -n -k1,1 $srcdir/n9b.I > n9b.O 2> n9b.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n9b failed: ../../src/sort 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
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n9b"; fi ;;
+    1) $echo "Test n9b failed: files n9b.O and $srcdir/n9b.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n9b may have failed." 1>&2;
+       $echo The command "cmp n9b.O $srcdir/n9b.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n9b.E || rm -f n9b.E
+$xx -s -n -k1,1 $srcdir/n10a.I > n10a.O 2> n10a.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n10a failed: ../../src/sort 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
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n10a"; fi ;;
+    1) $echo "Test n10a failed: files n10a.O and $srcdir/n10a.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n10a may have failed." 1>&2;
+       $echo The command "cmp n10a.O $srcdir/n10a.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n10a.E || rm -f n10a.E
+$xx -s -n -k1,1 $srcdir/n10b.I > n10b.O 2> n10b.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n10b failed: ../../src/sort 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
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n10b"; fi ;;
+    1) $echo "Test n10b failed: files n10b.O and $srcdir/n10b.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n10b may have failed." 1>&2;
+       $echo The command "cmp n10b.O $srcdir/n10b.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n10b.E || rm -f n10b.E
+$xx -s -n -k1,1 $srcdir/n11a.I > n11a.O 2> n11a.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n11a failed: ../../src/sort 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
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n11a"; fi ;;
+    1) $echo "Test n11a failed: files n11a.O and $srcdir/n11a.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n11a may have failed." 1>&2;
+       $echo The command "cmp n11a.O $srcdir/n11a.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n11a.E || rm -f n11a.E
+$xx -s -n -k1,1 $srcdir/n11b.I > n11b.O 2> n11b.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n11b failed: ../../src/sort 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
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n11b"; fi ;;
+    1) $echo "Test n11b failed: files n11b.O and $srcdir/n11b.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n11b may have failed." 1>&2;
+       $echo The command "cmp n11b.O $srcdir/n11b.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n11b.E || rm -f n11b.E
 $xx  $srcdir/01a.I > 01a.O 2> 01a.E
 code=$?
 if test $code != 0 ; then
@@ -1379,7 +1634,7 @@ else
 fi
 test -s 20a.E || rm -f 20a.E
 if test $errors = 0 ; then
-  $echo Passed all 80 tests. 1>&2
+  $echo Passed all 95 tests. 1>&2
 else
   $echo Failed $errors tests. 1>&2
 fi