.

28 files changed, 5756 insertions, 2941 deletions

diff --git a/tests/cut/.cvsignore b/tests/cut/.cvsignore
index 28bdcb1a0..852508156 100644
--- a/tests/cut/.cvsignore
+++ b/tests/cut/.cvsignore
@@ -1,8 +1,8 @@
-cut-tests
-t*.out
-t*.in
-t*.exp
-t*.err
+*.I
+*.E
+*.X
+*.O
+*-tests
 build-script
 Makefile
 mk-script
diff --git a/tests/cut/Makefile.am b/tests/cut/Makefile.am
index cc9982bab..3bf7d056e 100644
--- a/tests/cut/Makefile.am
+++ b/tests/cut/Makefile.am
@@ -3,23 +3,18 @@
 ##test-files-begin
 x = cut
 explicit =
-maint_gen = t1.in t1.exp t2.in t2.exp t3.in t3.exp t4.in t4.exp t5.in t5.exp \
-t6.in t6.exp t7.in t7.exp t8.in t8.exp t9.in t9.exp ta.in ta.exp tb.in tb.exp \
-tc.in tc.exp td.in td.exp te.in te.exp tf.in tf.exp tg.in tg.exp th.in th.exp \
-ti.in ti.exp tj.in tj.exp tk.in tk.exp tl.in tl.exp tm.in tm.exp tn.in tn.exp \
-to.in to.exp tp.in tp.exp tq.in tq.exp tr.in tr.exp ts.in ts.exp tt.in tt.exp \
-tu.in tu.exp tv.in tv.exp tw.in tw.exp tx.in tx.exp ty.in ty.exp tz.in tz.exp \
-tempty-fl.in tempty-fl.exp tmissing-fl.in tmissing-fl.exp tempty-bl.in \
-tempty-bl.exp tmissing-bl.in tmissing-bl.exp
-run_gen = t1.out t1.err t2.out t2.err t3.out t3.err t4.out t4.err t5.out \
-t5.err t6.out t6.err t7.out t7.err t8.out t8.err t9.out t9.err ta.out ta.err \
-tb.out tb.err tc.out tc.err td.out td.err te.out te.err tf.out tf.err tg.out \
-tg.err th.out th.err ti.out ti.err tj.out tj.err tk.out tk.err tl.out tl.err \
-tm.out tm.err tn.out tn.err to.out to.err tp.out tp.err tq.out tq.err tr.out \
-tr.err ts.out ts.err tt.out tt.err tu.out tu.err tv.out tv.err tw.out tw.err \
-tx.out tx.err ty.out ty.err tz.out tz.err tempty-fl.out tempty-fl.err \
-tmissing-fl.out tmissing-fl.err tempty-bl.out tempty-bl.err tmissing-bl.out \
-tmissing-bl.err
+maint_gen = 1.I 1.X 2.I 2.X 3.I 3.X 4.I 4.X 5.I 5.X 6.I 6.X 7.I 7.X 8.I 8.X \
+9.I 9.X a.I a.X b.I b.X c.I c.X d.I d.X e.I e.X f.I f.X g.I g.X h.I h.X i.I \
+i.X j.I j.X k.I k.X l.I l.X m.I m.X n.I n.X o.I o.X p.I p.X q.I q.X r.I r.X \
+s.I s.X t.I t.X u.I u.X v.I v.X w.I w.X x.I x.X y.I y.X z.I z.X empty-fl.I \
+empty-fl.X missing-fl.I missing-fl.X empty-bl.I empty-bl.X missing-bl.I \
+missing-bl.X
+run_gen = 1.O 1.E 2.O 2.E 3.O 3.E 4.O 4.E 5.O 5.E 6.O 6.E 7.O 7.E 8.O 8.E 9.O \
+9.E a.O a.E b.O b.E c.O c.E d.O d.E e.O e.E f.O f.E g.O g.E h.O h.E i.O i.E \
+j.O j.E k.O k.E l.O l.E m.O m.E n.O n.E o.O o.E p.O p.E q.O q.E r.O r.E s.O \
+s.E t.O t.E u.O u.E v.O v.E w.O w.E x.O x.E y.O y.E z.O z.E empty-fl.O \
+empty-fl.E missing-fl.O missing-fl.E empty-bl.O empty-bl.E missing-bl.O \
+missing-bl.E
 ##test-files-end
 
 EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
diff --git a/tests/cut/Makefile.in b/tests/cut/Makefile.in
index d3ae5e34e..c23a29f48 100644
--- a/tests/cut/Makefile.in
+++ b/tests/cut/Makefile.in
@@ -44,23 +44,18 @@ CC = @CC@
 
 x = cut
 explicit =
-maint_gen = t1.in t1.exp t2.in t2.exp t3.in t3.exp t4.in t4.exp t5.in t5.exp \
-t6.in t6.exp t7.in t7.exp t8.in t8.exp t9.in t9.exp ta.in ta.exp tb.in tb.exp \
-tc.in tc.exp td.in td.exp te.in te.exp tf.in tf.exp tg.in tg.exp th.in th.exp \
-ti.in ti.exp tj.in tj.exp tk.in tk.exp tl.in tl.exp tm.in tm.exp tn.in tn.exp \
-to.in to.exp tp.in tp.exp tq.in tq.exp tr.in tr.exp ts.in ts.exp tt.in tt.exp \
-tu.in tu.exp tv.in tv.exp tw.in tw.exp tx.in tx.exp ty.in ty.exp tz.in tz.exp \
-tempty-fl.in tempty-fl.exp tmissing-fl.in tmissing-fl.exp tempty-bl.in \
-tempty-bl.exp tmissing-bl.in tmissing-bl.exp
-run_gen = t1.out t1.err t2.out t2.err t3.out t3.err t4.out t4.err t5.out \
-t5.err t6.out t6.err t7.out t7.err t8.out t8.err t9.out t9.err ta.out ta.err \
-tb.out tb.err tc.out tc.err td.out td.err te.out te.err tf.out tf.err tg.out \
-tg.err th.out th.err ti.out ti.err tj.out tj.err tk.out tk.err tl.out tl.err \
-tm.out tm.err tn.out tn.err to.out to.err tp.out tp.err tq.out tq.err tr.out \
-tr.err ts.out ts.err tt.out tt.err tu.out tu.err tv.out tv.err tw.out tw.err \
-tx.out tx.err ty.out ty.err tz.out tz.err tempty-fl.out tempty-fl.err \
-tmissing-fl.out tmissing-fl.err tempty-bl.out tempty-bl.err tmissing-bl.out \
-tmissing-bl.err
+maint_gen = 1.I 1.X 2.I 2.X 3.I 3.X 4.I 4.X 5.I 5.X 6.I 6.X 7.I 7.X 8.I 8.X \
+9.I 9.X a.I a.X b.I b.X c.I c.X d.I d.X e.I e.X f.I f.X g.I g.X h.I h.X i.I \
+i.X j.I j.X k.I k.X l.I l.X m.I m.X n.I n.X o.I o.X p.I p.X q.I q.X r.I r.X \
+s.I s.X t.I t.X u.I u.X v.I v.X w.I w.X x.I x.X y.I y.X z.I z.X empty-fl.I \
+empty-fl.X missing-fl.I missing-fl.X empty-bl.I empty-bl.X missing-bl.I \
+missing-bl.X
+run_gen = 1.O 1.E 2.O 2.E 3.O 3.E 4.O 4.E 5.O 5.E 6.O 6.E 7.O 7.E 8.O 8.E 9.O \
+9.E a.O a.E b.O b.E c.O c.E d.O d.E e.O e.E f.O f.E g.O g.E h.O h.E i.O i.E \
+j.O j.E k.O k.E l.O l.E m.O m.E n.O n.E o.O o.E p.O p.E q.O q.E r.O r.E s.O \
+s.E t.O t.E u.O u.E v.O v.E w.O w.E x.O x.E y.O y.E z.O z.E empty-fl.O \
+empty-fl.E missing-fl.O missing-fl.E empty-bl.O empty-bl.E missing-bl.O \
+missing-bl.E
 
 EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
diff --git a/tests/cut/cut-tests b/tests/cut/cut-tests
index 1749b2797..f35034f6b 100755
--- a/tests/cut/cut-tests
+++ b/tests/cut/cut-tests
@@ -12,15 +12,49 @@ test "$VERBOSE" && $xx --version 2> /dev/null
 $xx -d: -f1,3- $srcdir/1.I > 1.O 2> 1.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test 1 failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test 1(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 1.O $srcdir/1.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 1"; fi ;;
-    1) $echo "Test 1 failed: files 1.O and $srcdir/1.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1(F)"; fi ;;
+    1) $echo "Test 1(F) failed: files 1.O and $srcdir/1.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 1 may have failed." 1>&2;
+    2) $echo "Test 1(F) may have failed." 1>&2;
+       $echo The command "cmp 1.O $srcdir/1.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 1.E || rm -f 1.E
+cat $srcdir/1.I | $xx -d: -f1,3- > 1.O 2> 1.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 1(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 1.O $srcdir/1.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 1(|)"; fi ;;
+    1) $echo "Test 1(|) failed: files 1.O and $srcdir/1.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 1(|) may have failed." 1>&2;
+       $echo The command "cmp 1.O $srcdir/1.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 1.E || rm -f 1.E
+$xx -d: -f1,3- < $srcdir/1.I > 1.O 2> 1.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 1(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 1.O $srcdir/1.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 1(<)"; fi ;;
+    1) $echo "Test 1(<) failed: files 1.O and $srcdir/1.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 1(<) may have failed." 1>&2;
        $echo The command "cmp 1.O $srcdir/1.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -29,15 +63,49 @@ test -s 1.E || rm -f 1.E
 $xx -d: -f1,3- $srcdir/2.I > 2.O 2> 2.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test 2 failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test 2(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 2.O $srcdir/2.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 2"; fi ;;
-    1) $echo "Test 2 failed: files 2.O and $srcdir/2.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2(F)"; fi ;;
+    1) $echo "Test 2(F) failed: files 2.O and $srcdir/2.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 2 may have failed." 1>&2;
+    2) $echo "Test 2(F) may have failed." 1>&2;
+       $echo The command "cmp 2.O $srcdir/2.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 2.E || rm -f 2.E
+cat $srcdir/2.I | $xx -d: -f1,3- > 2.O 2> 2.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 2(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 2.O $srcdir/2.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 2(|)"; fi ;;
+    1) $echo "Test 2(|) failed: files 2.O and $srcdir/2.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 2(|) may have failed." 1>&2;
+       $echo The command "cmp 2.O $srcdir/2.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 2.E || rm -f 2.E
+$xx -d: -f1,3- < $srcdir/2.I > 2.O 2> 2.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 2(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 2.O $srcdir/2.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 2(<)"; fi ;;
+    1) $echo "Test 2(<) failed: files 2.O and $srcdir/2.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 2(<) may have failed." 1>&2;
        $echo The command "cmp 2.O $srcdir/2.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -46,15 +114,49 @@ test -s 2.E || rm -f 2.E
 $xx -d: -f2- $srcdir/3.I > 3.O 2> 3.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test 3 failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test 3(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 3.O $srcdir/3.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 3"; fi ;;
-    1) $echo "Test 3 failed: files 3.O and $srcdir/3.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3(F)"; fi ;;
+    1) $echo "Test 3(F) failed: files 3.O and $srcdir/3.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 3 may have failed." 1>&2;
+    2) $echo "Test 3(F) may have failed." 1>&2;
+       $echo The command "cmp 3.O $srcdir/3.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 3.E || rm -f 3.E
+cat $srcdir/3.I | $xx -d: -f2- > 3.O 2> 3.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 3(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 3.O $srcdir/3.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 3(|)"; fi ;;
+    1) $echo "Test 3(|) failed: files 3.O and $srcdir/3.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 3(|) may have failed." 1>&2;
+       $echo The command "cmp 3.O $srcdir/3.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 3.E || rm -f 3.E
+$xx -d: -f2- < $srcdir/3.I > 3.O 2> 3.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 3(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 3.O $srcdir/3.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 3(<)"; fi ;;
+    1) $echo "Test 3(<) failed: files 3.O and $srcdir/3.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 3(<) may have failed." 1>&2;
        $echo The command "cmp 3.O $srcdir/3.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -63,15 +165,49 @@ test -s 3.E || rm -f 3.E
 $xx -d: -f4 $srcdir/4.I > 4.O 2> 4.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test 4 failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test 4(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 4.O $srcdir/4.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 4(F)"; fi ;;
+    1) $echo "Test 4(F) failed: files 4.O and $srcdir/4.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 4(F) may have failed." 1>&2;
+       $echo The command "cmp 4.O $srcdir/4.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 4.E || rm -f 4.E
+cat $srcdir/4.I | $xx -d: -f4 > 4.O 2> 4.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 4(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 4.O $srcdir/4.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 4(|)"; fi ;;
+    1) $echo "Test 4(|) failed: files 4.O and $srcdir/4.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 4(|) may have failed." 1>&2;
+       $echo The command "cmp 4.O $srcdir/4.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 4.E || rm -f 4.E
+$xx -d: -f4 < $srcdir/4.I > 4.O 2> 4.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 4(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 4.O $srcdir/4.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 4"; fi ;;
-    1) $echo "Test 4 failed: files 4.O and $srcdir/4.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4(<)"; fi ;;
+    1) $echo "Test 4(<) failed: files 4.O and $srcdir/4.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 4 may have failed." 1>&2;
+    2) $echo "Test 4(<) may have failed." 1>&2;
        $echo The command "cmp 4.O $srcdir/4.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -80,15 +216,49 @@ test -s 4.E || rm -f 4.E
 $xx -d: -f4 $srcdir/5.I > 5.O 2> 5.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test 5 failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test 5(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 5.O $srcdir/5.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 5(F)"; fi ;;
+    1) $echo "Test 5(F) failed: files 5.O and $srcdir/5.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 5(F) may have failed." 1>&2;
+       $echo The command "cmp 5.O $srcdir/5.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 5.E || rm -f 5.E
+cat $srcdir/5.I | $xx -d: -f4 > 5.O 2> 5.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 5(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 5.O $srcdir/5.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 5(|)"; fi ;;
+    1) $echo "Test 5(|) failed: files 5.O and $srcdir/5.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 5(|) may have failed." 1>&2;
+       $echo The command "cmp 5.O $srcdir/5.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 5.E || rm -f 5.E
+$xx -d: -f4 < $srcdir/5.I > 5.O 2> 5.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 5(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 5.O $srcdir/5.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 5"; fi ;;
-    1) $echo "Test 5 failed: files 5.O and $srcdir/5.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5(<)"; fi ;;
+    1) $echo "Test 5(<) failed: files 5.O and $srcdir/5.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 5 may have failed." 1>&2;
+    2) $echo "Test 5(<) may have failed." 1>&2;
        $echo The command "cmp 5.O $srcdir/5.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -97,15 +267,49 @@ test -s 5.E || rm -f 5.E
 $xx -c4 $srcdir/6.I > 6.O 2> 6.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test 6 failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test 6(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 6.O $srcdir/6.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 6(F)"; fi ;;
+    1) $echo "Test 6(F) failed: files 6.O and $srcdir/6.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 6(F) may have failed." 1>&2;
+       $echo The command "cmp 6.O $srcdir/6.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 6.E || rm -f 6.E
+cat $srcdir/6.I | $xx -c4 > 6.O 2> 6.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 6(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 6.O $srcdir/6.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 6"; fi ;;
-    1) $echo "Test 6 failed: files 6.O and $srcdir/6.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6(|)"; fi ;;
+    1) $echo "Test 6(|) failed: files 6.O and $srcdir/6.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 6 may have failed." 1>&2;
+    2) $echo "Test 6(|) may have failed." 1>&2;
+       $echo The command "cmp 6.O $srcdir/6.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 6.E || rm -f 6.E
+$xx -c4 < $srcdir/6.I > 6.O 2> 6.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 6(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 6.O $srcdir/6.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 6(<)"; fi ;;
+    1) $echo "Test 6(<) failed: files 6.O and $srcdir/6.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 6(<) may have failed." 1>&2;
        $echo The command "cmp 6.O $srcdir/6.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -114,15 +318,49 @@ test -s 6.E || rm -f 6.E
 $xx -c4 $srcdir/7.I > 7.O 2> 7.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test 7 failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test 7(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 7.O $srcdir/7.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 7"; fi ;;
-    1) $echo "Test 7 failed: files 7.O and $srcdir/7.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7(F)"; fi ;;
+    1) $echo "Test 7(F) failed: files 7.O and $srcdir/7.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 7 may have failed." 1>&2;
+    2) $echo "Test 7(F) may have failed." 1>&2;
+       $echo The command "cmp 7.O $srcdir/7.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 7.E || rm -f 7.E
+cat $srcdir/7.I | $xx -c4 > 7.O 2> 7.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 7(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 7.O $srcdir/7.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 7(|)"; fi ;;
+    1) $echo "Test 7(|) failed: files 7.O and $srcdir/7.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 7(|) may have failed." 1>&2;
+       $echo The command "cmp 7.O $srcdir/7.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 7.E || rm -f 7.E
+$xx -c4 < $srcdir/7.I > 7.O 2> 7.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 7(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 7.O $srcdir/7.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 7(<)"; fi ;;
+    1) $echo "Test 7(<) failed: files 7.O and $srcdir/7.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 7(<) may have failed." 1>&2;
        $echo The command "cmp 7.O $srcdir/7.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -131,15 +369,49 @@ test -s 7.E || rm -f 7.E
 $xx -c4 $srcdir/8.I > 8.O 2> 8.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test 8 failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test 8(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 8.O $srcdir/8.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 8"; fi ;;
-    1) $echo "Test 8 failed: files 8.O and $srcdir/8.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 8(F)"; fi ;;
+    1) $echo "Test 8(F) failed: files 8.O and $srcdir/8.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 8 may have failed." 1>&2;
+    2) $echo "Test 8(F) may have failed." 1>&2;
+       $echo The command "cmp 8.O $srcdir/8.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 8.E || rm -f 8.E
+cat $srcdir/8.I | $xx -c4 > 8.O 2> 8.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 8(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 8.O $srcdir/8.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 8(|)"; fi ;;
+    1) $echo "Test 8(|) failed: files 8.O and $srcdir/8.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 8(|) may have failed." 1>&2;
+       $echo The command "cmp 8.O $srcdir/8.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 8.E || rm -f 8.E
+$xx -c4 < $srcdir/8.I > 8.O 2> 8.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 8(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 8.O $srcdir/8.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 8(<)"; fi ;;
+    1) $echo "Test 8(<) failed: files 8.O and $srcdir/8.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 8(<) may have failed." 1>&2;
        $echo The command "cmp 8.O $srcdir/8.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -148,15 +420,49 @@ test -s 8.E || rm -f 8.E
 $xx -c4 $srcdir/9.I > 9.O 2> 9.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test 9 failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test 9(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 9.O $srcdir/9.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 9(F)"; fi ;;
+    1) $echo "Test 9(F) failed: files 9.O and $srcdir/9.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 9(F) may have failed." 1>&2;
+       $echo The command "cmp 9.O $srcdir/9.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 9.E || rm -f 9.E
+cat $srcdir/9.I | $xx -c4 > 9.O 2> 9.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 9(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 9.O $srcdir/9.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 9(|)"; fi ;;
+    1) $echo "Test 9(|) failed: files 9.O and $srcdir/9.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 9(|) may have failed." 1>&2;
+       $echo The command "cmp 9.O $srcdir/9.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 9.E || rm -f 9.E
+$xx -c4 < $srcdir/9.I > 9.O 2> 9.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 9(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp 9.O $srcdir/9.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 9"; fi ;;
-    1) $echo "Test 9 failed: files 9.O and $srcdir/9.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9(<)"; fi ;;
+    1) $echo "Test 9(<) failed: files 9.O and $srcdir/9.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 9 may have failed." 1>&2;
+    2) $echo "Test 9(<) may have failed." 1>&2;
        $echo The command "cmp 9.O $srcdir/9.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -165,15 +471,49 @@ test -s 9.E || rm -f 9.E
 $xx -s -d: -f3- $srcdir/a.I > a.O 2> a.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test a failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test a(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp a.O $srcdir/a.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed a(F)"; fi ;;
+    1) $echo "Test a(F) failed: files a.O and $srcdir/a.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test a(F) may have failed." 1>&2;
+       $echo The command "cmp a.O $srcdir/a.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s a.E || rm -f a.E
+cat $srcdir/a.I | $xx -s -d: -f3- > a.O 2> a.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test a(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp a.O $srcdir/a.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed a(|)"; fi ;;
+    1) $echo "Test a(|) failed: files a.O and $srcdir/a.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test a(|) may have failed." 1>&2;
+       $echo The command "cmp a.O $srcdir/a.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s a.E || rm -f a.E
+$xx -s -d: -f3- < $srcdir/a.I > a.O 2> a.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test a(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp a.O $srcdir/a.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a"; fi ;;
-    1) $echo "Test a failed: files a.O and $srcdir/a.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed a(<)"; fi ;;
+    1) $echo "Test a(<) failed: files a.O and $srcdir/a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test a may have failed." 1>&2;
+    2) $echo "Test a(<) may have failed." 1>&2;
        $echo The command "cmp a.O $srcdir/a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -182,15 +522,49 @@ test -s a.E || rm -f a.E
 $xx -s -d: -f2,3 $srcdir/b.I > b.O 2> b.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test b failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test b(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp b.O $srcdir/b.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed b(F)"; fi ;;
+    1) $echo "Test b(F) failed: files b.O and $srcdir/b.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test b(F) may have failed." 1>&2;
+       $echo The command "cmp b.O $srcdir/b.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s b.E || rm -f b.E
+cat $srcdir/b.I | $xx -s -d: -f2,3 > b.O 2> b.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test b(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp b.O $srcdir/b.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed b(|)"; fi ;;
+    1) $echo "Test b(|) failed: files b.O and $srcdir/b.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test b(|) may have failed." 1>&2;
+       $echo The command "cmp b.O $srcdir/b.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s b.E || rm -f b.E
+$xx -s -d: -f2,3 < $srcdir/b.I > b.O 2> b.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test b(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp b.O $srcdir/b.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed b"; fi ;;
-    1) $echo "Test b failed: files b.O and $srcdir/b.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed b(<)"; fi ;;
+    1) $echo "Test b(<) failed: files b.O and $srcdir/b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test b may have failed." 1>&2;
+    2) $echo "Test b(<) may have failed." 1>&2;
        $echo The command "cmp b.O $srcdir/b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -199,15 +573,49 @@ test -s b.E || rm -f b.E
 $xx -s -d: -f1,3 $srcdir/c.I > c.O 2> c.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test c failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test c(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp c.O $srcdir/c.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed c"; fi ;;
-    1) $echo "Test c failed: files c.O and $srcdir/c.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed c(F)"; fi ;;
+    1) $echo "Test c(F) failed: files c.O and $srcdir/c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test c may have failed." 1>&2;
+    2) $echo "Test c(F) may have failed." 1>&2;
+       $echo The command "cmp c.O $srcdir/c.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s c.E || rm -f c.E
+cat $srcdir/c.I | $xx -s -d: -f1,3 > c.O 2> c.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test c(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp c.O $srcdir/c.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed c(|)"; fi ;;
+    1) $echo "Test c(|) failed: files c.O and $srcdir/c.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test c(|) may have failed." 1>&2;
+       $echo The command "cmp c.O $srcdir/c.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s c.E || rm -f c.E
+$xx -s -d: -f1,3 < $srcdir/c.I > c.O 2> c.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test c(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp c.O $srcdir/c.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed c(<)"; fi ;;
+    1) $echo "Test c(<) failed: files c.O and $srcdir/c.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test c(<) may have failed." 1>&2;
        $echo The command "cmp c.O $srcdir/c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -216,15 +624,49 @@ test -s c.E || rm -f c.E
 $xx -s -d: -f1,3 $srcdir/d.I > d.O 2> d.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test d failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test d(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp d.O $srcdir/d.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed d"; fi ;;
-    1) $echo "Test d failed: files d.O and $srcdir/d.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed d(F)"; fi ;;
+    1) $echo "Test d(F) failed: files d.O and $srcdir/d.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test d may have failed." 1>&2;
+    2) $echo "Test d(F) may have failed." 1>&2;
+       $echo The command "cmp d.O $srcdir/d.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s d.E || rm -f d.E
+cat $srcdir/d.I | $xx -s -d: -f1,3 > d.O 2> d.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test d(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp d.O $srcdir/d.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed d(|)"; fi ;;
+    1) $echo "Test d(|) failed: files d.O and $srcdir/d.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test d(|) may have failed." 1>&2;
+       $echo The command "cmp d.O $srcdir/d.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s d.E || rm -f d.E
+$xx -s -d: -f1,3 < $srcdir/d.I > d.O 2> d.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test d(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp d.O $srcdir/d.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed d(<)"; fi ;;
+    1) $echo "Test d(<) failed: files d.O and $srcdir/d.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test d(<) may have failed." 1>&2;
        $echo The command "cmp d.O $srcdir/d.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -233,15 +675,49 @@ test -s d.E || rm -f d.E
 $xx -s -d: -f3- $srcdir/e.I > e.O 2> e.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test e failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test e(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp e.O $srcdir/e.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed e(F)"; fi ;;
+    1) $echo "Test e(F) failed: files e.O and $srcdir/e.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test e(F) may have failed." 1>&2;
+       $echo The command "cmp e.O $srcdir/e.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s e.E || rm -f e.E
+cat $srcdir/e.I | $xx -s -d: -f3- > e.O 2> e.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test e(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp e.O $srcdir/e.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed e"; fi ;;
-    1) $echo "Test e failed: files e.O and $srcdir/e.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed e(|)"; fi ;;
+    1) $echo "Test e(|) failed: files e.O and $srcdir/e.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test e may have failed." 1>&2;
+    2) $echo "Test e(|) may have failed." 1>&2;
+       $echo The command "cmp e.O $srcdir/e.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s e.E || rm -f e.E
+$xx -s -d: -f3- < $srcdir/e.I > e.O 2> e.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test e(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp e.O $srcdir/e.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed e(<)"; fi ;;
+    1) $echo "Test e(<) failed: files e.O and $srcdir/e.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test e(<) may have failed." 1>&2;
        $echo The command "cmp e.O $srcdir/e.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -250,15 +726,49 @@ test -s e.E || rm -f e.E
 $xx -s -d: -f3-4 $srcdir/f.I > f.O 2> f.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test f failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test f(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp f.O $srcdir/f.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed f(F)"; fi ;;
+    1) $echo "Test f(F) failed: files f.O and $srcdir/f.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test f(F) may have failed." 1>&2;
+       $echo The command "cmp f.O $srcdir/f.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s f.E || rm -f f.E
+cat $srcdir/f.I | $xx -s -d: -f3-4 > f.O 2> f.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test f(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp f.O $srcdir/f.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed f(|)"; fi ;;
+    1) $echo "Test f(|) failed: files f.O and $srcdir/f.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test f(|) may have failed." 1>&2;
+       $echo The command "cmp f.O $srcdir/f.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s f.E || rm -f f.E
+$xx -s -d: -f3-4 < $srcdir/f.I > f.O 2> f.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test f(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp f.O $srcdir/f.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed f"; fi ;;
-    1) $echo "Test f failed: files f.O and $srcdir/f.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed f(<)"; fi ;;
+    1) $echo "Test f(<) failed: files f.O and $srcdir/f.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test f may have failed." 1>&2;
+    2) $echo "Test f(<) may have failed." 1>&2;
        $echo The command "cmp f.O $srcdir/f.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -267,15 +777,49 @@ test -s f.E || rm -f f.E
 $xx -s -d: -f3,4 $srcdir/g.I > g.O 2> g.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test g failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test g(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp g.O $srcdir/g.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed g(F)"; fi ;;
+    1) $echo "Test g(F) failed: files g.O and $srcdir/g.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test g(F) may have failed." 1>&2;
+       $echo The command "cmp g.O $srcdir/g.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s g.E || rm -f g.E
+cat $srcdir/g.I | $xx -s -d: -f3,4 > g.O 2> g.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test g(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp g.O $srcdir/g.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed g"; fi ;;
-    1) $echo "Test g failed: files g.O and $srcdir/g.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed g(|)"; fi ;;
+    1) $echo "Test g(|) failed: files g.O and $srcdir/g.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test g may have failed." 1>&2;
+    2) $echo "Test g(|) may have failed." 1>&2;
+       $echo The command "cmp g.O $srcdir/g.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s g.E || rm -f g.E
+$xx -s -d: -f3,4 < $srcdir/g.I > g.O 2> g.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test g(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp g.O $srcdir/g.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed g(<)"; fi ;;
+    1) $echo "Test g(<) failed: files g.O and $srcdir/g.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test g(<) may have failed." 1>&2;
        $echo The command "cmp g.O $srcdir/g.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -284,15 +828,49 @@ test -s g.E || rm -f g.E
 $xx -s -d: -f2,3 $srcdir/h.I > h.O 2> h.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test h failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test h(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp h.O $srcdir/h.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed h(F)"; fi ;;
+    1) $echo "Test h(F) failed: files h.O and $srcdir/h.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test h(F) may have failed." 1>&2;
+       $echo The command "cmp h.O $srcdir/h.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s h.E || rm -f h.E
+cat $srcdir/h.I | $xx -s -d: -f2,3 > h.O 2> h.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test h(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp h.O $srcdir/h.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed h"; fi ;;
-    1) $echo "Test h failed: files h.O and $srcdir/h.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed h(|)"; fi ;;
+    1) $echo "Test h(|) failed: files h.O and $srcdir/h.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test h may have failed." 1>&2;
+    2) $echo "Test h(|) may have failed." 1>&2;
+       $echo The command "cmp h.O $srcdir/h.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s h.E || rm -f h.E
+$xx -s -d: -f2,3 < $srcdir/h.I > h.O 2> h.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test h(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp h.O $srcdir/h.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed h(<)"; fi ;;
+    1) $echo "Test h(<) failed: files h.O and $srcdir/h.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test h(<) may have failed." 1>&2;
        $echo The command "cmp h.O $srcdir/h.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -301,15 +879,49 @@ test -s h.E || rm -f h.E
 $xx -d: -f1-3 $srcdir/i.I > i.O 2> i.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test i failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test i(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp i.O $srcdir/i.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed i"; fi ;;
-    1) $echo "Test i failed: files i.O and $srcdir/i.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed i(F)"; fi ;;
+    1) $echo "Test i(F) failed: files i.O and $srcdir/i.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test i may have failed." 1>&2;
+    2) $echo "Test i(F) may have failed." 1>&2;
+       $echo The command "cmp i.O $srcdir/i.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s i.E || rm -f i.E
+cat $srcdir/i.I | $xx -d: -f1-3 > i.O 2> i.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test i(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp i.O $srcdir/i.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed i(|)"; fi ;;
+    1) $echo "Test i(|) failed: files i.O and $srcdir/i.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test i(|) may have failed." 1>&2;
+       $echo The command "cmp i.O $srcdir/i.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s i.E || rm -f i.E
+$xx -d: -f1-3 < $srcdir/i.I > i.O 2> i.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test i(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp i.O $srcdir/i.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed i(<)"; fi ;;
+    1) $echo "Test i(<) failed: files i.O and $srcdir/i.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test i(<) may have failed." 1>&2;
        $echo The command "cmp i.O $srcdir/i.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -318,15 +930,49 @@ test -s i.E || rm -f i.E
 $xx -d: -f1-4 $srcdir/j.I > j.O 2> j.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test j failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test j(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp j.O $srcdir/j.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed j(F)"; fi ;;
+    1) $echo "Test j(F) failed: files j.O and $srcdir/j.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test j(F) may have failed." 1>&2;
+       $echo The command "cmp j.O $srcdir/j.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s j.E || rm -f j.E
+cat $srcdir/j.I | $xx -d: -f1-4 > j.O 2> j.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test j(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp j.O $srcdir/j.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed j"; fi ;;
-    1) $echo "Test j failed: files j.O and $srcdir/j.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed j(|)"; fi ;;
+    1) $echo "Test j(|) failed: files j.O and $srcdir/j.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test j may have failed." 1>&2;
+    2) $echo "Test j(|) may have failed." 1>&2;
+       $echo The command "cmp j.O $srcdir/j.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s j.E || rm -f j.E
+$xx -d: -f1-4 < $srcdir/j.I > j.O 2> j.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test j(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp j.O $srcdir/j.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed j(<)"; fi ;;
+    1) $echo "Test j(<) failed: files j.O and $srcdir/j.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test j(<) may have failed." 1>&2;
        $echo The command "cmp j.O $srcdir/j.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -335,15 +981,49 @@ test -s j.E || rm -f j.E
 $xx -d: -f2-3 $srcdir/k.I > k.O 2> k.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test k failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test k(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp k.O $srcdir/k.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed k(F)"; fi ;;
+    1) $echo "Test k(F) failed: files k.O and $srcdir/k.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test k(F) may have failed." 1>&2;
+       $echo The command "cmp k.O $srcdir/k.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s k.E || rm -f k.E
+cat $srcdir/k.I | $xx -d: -f2-3 > k.O 2> k.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test k(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp k.O $srcdir/k.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed k"; fi ;;
-    1) $echo "Test k failed: files k.O and $srcdir/k.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed k(|)"; fi ;;
+    1) $echo "Test k(|) failed: files k.O and $srcdir/k.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test k may have failed." 1>&2;
+    2) $echo "Test k(|) may have failed." 1>&2;
+       $echo The command "cmp k.O $srcdir/k.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s k.E || rm -f k.E
+$xx -d: -f2-3 < $srcdir/k.I > k.O 2> k.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test k(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp k.O $srcdir/k.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed k(<)"; fi ;;
+    1) $echo "Test k(<) failed: files k.O and $srcdir/k.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test k(<) may have failed." 1>&2;
        $echo The command "cmp k.O $srcdir/k.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -352,15 +1032,49 @@ test -s k.E || rm -f k.E
 $xx -d: -f2-4 $srcdir/l.I > l.O 2> l.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test l failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test l(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp l.O $srcdir/l.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed l(F)"; fi ;;
+    1) $echo "Test l(F) failed: files l.O and $srcdir/l.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test l(F) may have failed." 1>&2;
+       $echo The command "cmp l.O $srcdir/l.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s l.E || rm -f l.E
+cat $srcdir/l.I | $xx -d: -f2-4 > l.O 2> l.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test l(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp l.O $srcdir/l.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed l"; fi ;;
-    1) $echo "Test l failed: files l.O and $srcdir/l.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed l(|)"; fi ;;
+    1) $echo "Test l(|) failed: files l.O and $srcdir/l.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test l may have failed." 1>&2;
+    2) $echo "Test l(|) may have failed." 1>&2;
+       $echo The command "cmp l.O $srcdir/l.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s l.E || rm -f l.E
+$xx -d: -f2-4 < $srcdir/l.I > l.O 2> l.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test l(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp l.O $srcdir/l.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed l(<)"; fi ;;
+    1) $echo "Test l(<) failed: files l.O and $srcdir/l.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test l(<) may have failed." 1>&2;
        $echo The command "cmp l.O $srcdir/l.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -369,15 +1083,49 @@ test -s l.E || rm -f l.E
 $xx -s -d: -f1-3 $srcdir/m.I > m.O 2> m.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test m failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test m(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp m.O $srcdir/m.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed m"; fi ;;
-    1) $echo "Test m failed: files m.O and $srcdir/m.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed m(F)"; fi ;;
+    1) $echo "Test m(F) failed: files m.O and $srcdir/m.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test m may have failed." 1>&2;
+    2) $echo "Test m(F) may have failed." 1>&2;
+       $echo The command "cmp m.O $srcdir/m.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s m.E || rm -f m.E
+cat $srcdir/m.I | $xx -s -d: -f1-3 > m.O 2> m.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test m(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp m.O $srcdir/m.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed m(|)"; fi ;;
+    1) $echo "Test m(|) failed: files m.O and $srcdir/m.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test m(|) may have failed." 1>&2;
+       $echo The command "cmp m.O $srcdir/m.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s m.E || rm -f m.E
+$xx -s -d: -f1-3 < $srcdir/m.I > m.O 2> m.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test m(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp m.O $srcdir/m.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed m(<)"; fi ;;
+    1) $echo "Test m(<) failed: files m.O and $srcdir/m.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test m(<) may have failed." 1>&2;
        $echo The command "cmp m.O $srcdir/m.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -386,15 +1134,49 @@ test -s m.E || rm -f m.E
 $xx -s -d: -f1-4 $srcdir/n.I > n.O 2> n.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test n failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test n(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp n.O $srcdir/n.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed n"; fi ;;
-    1) $echo "Test n failed: files n.O and $srcdir/n.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed n(F)"; fi ;;
+    1) $echo "Test n(F) failed: files n.O and $srcdir/n.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test n may have failed." 1>&2;
+    2) $echo "Test n(F) may have failed." 1>&2;
+       $echo The command "cmp n.O $srcdir/n.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n.E || rm -f n.E
+cat $srcdir/n.I | $xx -s -d: -f1-4 > n.O 2> n.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp n.O $srcdir/n.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n(|)"; fi ;;
+    1) $echo "Test n(|) failed: files n.O and $srcdir/n.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n(|) may have failed." 1>&2;
+       $echo The command "cmp n.O $srcdir/n.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n.E || rm -f n.E
+$xx -s -d: -f1-4 < $srcdir/n.I > n.O 2> n.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp n.O $srcdir/n.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n(<)"; fi ;;
+    1) $echo "Test n(<) failed: files n.O and $srcdir/n.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n(<) may have failed." 1>&2;
        $echo The command "cmp n.O $srcdir/n.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -403,15 +1185,49 @@ test -s n.E || rm -f n.E
 $xx -s -d: -f2-3 $srcdir/o.I > o.O 2> o.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test o failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test o(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp o.O $srcdir/o.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed o(F)"; fi ;;
+    1) $echo "Test o(F) failed: files o.O and $srcdir/o.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test o(F) may have failed." 1>&2;
+       $echo The command "cmp o.O $srcdir/o.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s o.E || rm -f o.E
+cat $srcdir/o.I | $xx -s -d: -f2-3 > o.O 2> o.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test o(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp o.O $srcdir/o.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed o"; fi ;;
-    1) $echo "Test o failed: files o.O and $srcdir/o.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed o(|)"; fi ;;
+    1) $echo "Test o(|) failed: files o.O and $srcdir/o.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test o may have failed." 1>&2;
+    2) $echo "Test o(|) may have failed." 1>&2;
+       $echo The command "cmp o.O $srcdir/o.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s o.E || rm -f o.E
+$xx -s -d: -f2-3 < $srcdir/o.I > o.O 2> o.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test o(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp o.O $srcdir/o.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed o(<)"; fi ;;
+    1) $echo "Test o(<) failed: files o.O and $srcdir/o.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test o(<) may have failed." 1>&2;
        $echo The command "cmp o.O $srcdir/o.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -420,15 +1236,49 @@ test -s o.E || rm -f o.E
 $xx -s -d: -f2-4 $srcdir/p.I > p.O 2> p.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test p failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test p(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp p.O $srcdir/p.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed p(F)"; fi ;;
+    1) $echo "Test p(F) failed: files p.O and $srcdir/p.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test p(F) may have failed." 1>&2;
+       $echo The command "cmp p.O $srcdir/p.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s p.E || rm -f p.E
+cat $srcdir/p.I | $xx -s -d: -f2-4 > p.O 2> p.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test p(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp p.O $srcdir/p.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed p(|)"; fi ;;
+    1) $echo "Test p(|) failed: files p.O and $srcdir/p.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test p(|) may have failed." 1>&2;
+       $echo The command "cmp p.O $srcdir/p.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s p.E || rm -f p.E
+$xx -s -d: -f2-4 < $srcdir/p.I > p.O 2> p.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test p(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp p.O $srcdir/p.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed p"; fi ;;
-    1) $echo "Test p failed: files p.O and $srcdir/p.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed p(<)"; fi ;;
+    1) $echo "Test p(<) failed: files p.O and $srcdir/p.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test p may have failed." 1>&2;
+    2) $echo "Test p(<) may have failed." 1>&2;
        $echo The command "cmp p.O $srcdir/p.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -437,15 +1287,49 @@ test -s p.E || rm -f p.E
 $xx -s -d: -f2-4 $srcdir/q.I > q.O 2> q.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test q failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test q(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp q.O $srcdir/q.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed q"; fi ;;
-    1) $echo "Test q failed: files q.O and $srcdir/q.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed q(F)"; fi ;;
+    1) $echo "Test q(F) failed: files q.O and $srcdir/q.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test q may have failed." 1>&2;
+    2) $echo "Test q(F) may have failed." 1>&2;
+       $echo The command "cmp q.O $srcdir/q.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s q.E || rm -f q.E
+cat $srcdir/q.I | $xx -s -d: -f2-4 > q.O 2> q.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test q(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp q.O $srcdir/q.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed q(|)"; fi ;;
+    1) $echo "Test q(|) failed: files q.O and $srcdir/q.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test q(|) may have failed." 1>&2;
+       $echo The command "cmp q.O $srcdir/q.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s q.E || rm -f q.E
+$xx -s -d: -f2-4 < $srcdir/q.I > q.O 2> q.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test q(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp q.O $srcdir/q.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed q(<)"; fi ;;
+    1) $echo "Test q(<) failed: files q.O and $srcdir/q.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test q(<) may have failed." 1>&2;
        $echo The command "cmp q.O $srcdir/q.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -454,15 +1338,49 @@ test -s q.E || rm -f q.E
 $xx -s -d: -f2-4 $srcdir/r.I > r.O 2> r.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test r failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test r(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp r.O $srcdir/r.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed r"; fi ;;
-    1) $echo "Test r failed: files r.O and $srcdir/r.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed r(F)"; fi ;;
+    1) $echo "Test r(F) failed: files r.O and $srcdir/r.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test r may have failed." 1>&2;
+    2) $echo "Test r(F) may have failed." 1>&2;
+       $echo The command "cmp r.O $srcdir/r.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s r.E || rm -f r.E
+cat $srcdir/r.I | $xx -s -d: -f2-4 > r.O 2> r.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test r(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp r.O $srcdir/r.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed r(|)"; fi ;;
+    1) $echo "Test r(|) failed: files r.O and $srcdir/r.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test r(|) may have failed." 1>&2;
+       $echo The command "cmp r.O $srcdir/r.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s r.E || rm -f r.E
+$xx -s -d: -f2-4 < $srcdir/r.I > r.O 2> r.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test r(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp r.O $srcdir/r.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed r(<)"; fi ;;
+    1) $echo "Test r(<) failed: files r.O and $srcdir/r.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test r(<) may have failed." 1>&2;
        $echo The command "cmp r.O $srcdir/r.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -471,15 +1389,49 @@ test -s r.E || rm -f r.E
 $xx -s -d: -f1-4 $srcdir/s.I > s.O 2> s.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test s failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test s(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp s.O $srcdir/s.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed s"; fi ;;
-    1) $echo "Test s failed: files s.O and $srcdir/s.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed s(F)"; fi ;;
+    1) $echo "Test s(F) failed: files s.O and $srcdir/s.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test s may have failed." 1>&2;
+    2) $echo "Test s(F) may have failed." 1>&2;
+       $echo The command "cmp s.O $srcdir/s.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s s.E || rm -f s.E
+cat $srcdir/s.I | $xx -s -d: -f1-4 > s.O 2> s.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test s(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp s.O $srcdir/s.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed s(|)"; fi ;;
+    1) $echo "Test s(|) failed: files s.O and $srcdir/s.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test s(|) may have failed." 1>&2;
+       $echo The command "cmp s.O $srcdir/s.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s s.E || rm -f s.E
+$xx -s -d: -f1-4 < $srcdir/s.I > s.O 2> s.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test s(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp s.O $srcdir/s.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed s(<)"; fi ;;
+    1) $echo "Test s(<) failed: files s.O and $srcdir/s.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test s(<) may have failed." 1>&2;
        $echo The command "cmp s.O $srcdir/s.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -488,15 +1440,49 @@ test -s s.E || rm -f s.E
 $xx -s -d: -f3- $srcdir/t.I > t.O 2> t.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test t failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test t(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp t.O $srcdir/t.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed t(F)"; fi ;;
+    1) $echo "Test t(F) failed: files t.O and $srcdir/t.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test t(F) may have failed." 1>&2;
+       $echo The command "cmp t.O $srcdir/t.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s t.E || rm -f t.E
+cat $srcdir/t.I | $xx -s -d: -f3- > t.O 2> t.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test t(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp t.O $srcdir/t.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed t"; fi ;;
-    1) $echo "Test t failed: files t.O and $srcdir/t.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed t(|)"; fi ;;
+    1) $echo "Test t(|) failed: files t.O and $srcdir/t.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test t may have failed." 1>&2;
+    2) $echo "Test t(|) may have failed." 1>&2;
+       $echo The command "cmp t.O $srcdir/t.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s t.E || rm -f t.E
+$xx -s -d: -f3- < $srcdir/t.I > t.O 2> t.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test t(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp t.O $srcdir/t.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed t(<)"; fi ;;
+    1) $echo "Test t(<) failed: files t.O and $srcdir/t.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test t(<) may have failed." 1>&2;
        $echo The command "cmp t.O $srcdir/t.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -505,15 +1491,49 @@ test -s t.E || rm -f t.E
 $xx -s -f3- $srcdir/u.I > u.O 2> u.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test u failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test u(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp u.O $srcdir/u.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed u(F)"; fi ;;
+    1) $echo "Test u(F) failed: files u.O and $srcdir/u.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test u(F) may have failed." 1>&2;
+       $echo The command "cmp u.O $srcdir/u.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s u.E || rm -f u.E
+cat $srcdir/u.I | $xx -s -f3- > u.O 2> u.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test u(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp u.O $srcdir/u.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed u(|)"; fi ;;
+    1) $echo "Test u(|) failed: files u.O and $srcdir/u.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test u(|) may have failed." 1>&2;
+       $echo The command "cmp u.O $srcdir/u.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s u.E || rm -f u.E
+$xx -s -f3- < $srcdir/u.I > u.O 2> u.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test u(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp u.O $srcdir/u.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed u"; fi ;;
-    1) $echo "Test u failed: files u.O and $srcdir/u.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed u(<)"; fi ;;
+    1) $echo "Test u(<) failed: files u.O and $srcdir/u.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test u may have failed." 1>&2;
+    2) $echo "Test u(<) may have failed." 1>&2;
        $echo The command "cmp u.O $srcdir/u.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -522,15 +1542,49 @@ test -s u.E || rm -f u.E
 $xx -f3- $srcdir/v.I > v.O 2> v.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test v failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test v(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp v.O $srcdir/v.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed v(F)"; fi ;;
+    1) $echo "Test v(F) failed: files v.O and $srcdir/v.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test v(F) may have failed." 1>&2;
+       $echo The command "cmp v.O $srcdir/v.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s v.E || rm -f v.E
+cat $srcdir/v.I | $xx -f3- > v.O 2> v.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test v(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp v.O $srcdir/v.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed v"; fi ;;
-    1) $echo "Test v failed: files v.O and $srcdir/v.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed v(|)"; fi ;;
+    1) $echo "Test v(|) failed: files v.O and $srcdir/v.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test v may have failed." 1>&2;
+    2) $echo "Test v(|) may have failed." 1>&2;
+       $echo The command "cmp v.O $srcdir/v.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s v.E || rm -f v.E
+$xx -f3- < $srcdir/v.I > v.O 2> v.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test v(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp v.O $srcdir/v.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed v(<)"; fi ;;
+    1) $echo "Test v(<) failed: files v.O and $srcdir/v.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test v(<) may have failed." 1>&2;
        $echo The command "cmp v.O $srcdir/v.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -539,15 +1593,49 @@ test -s v.E || rm -f v.E
 $xx -b 1 $srcdir/w.I > w.O 2> w.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test w failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test w(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp w.O $srcdir/w.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed w"; fi ;;
-    1) $echo "Test w failed: files w.O and $srcdir/w.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed w(F)"; fi ;;
+    1) $echo "Test w(F) failed: files w.O and $srcdir/w.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test w may have failed." 1>&2;
+    2) $echo "Test w(F) may have failed." 1>&2;
+       $echo The command "cmp w.O $srcdir/w.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s w.E || rm -f w.E
+cat $srcdir/w.I | $xx -b 1 > w.O 2> w.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test w(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp w.O $srcdir/w.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed w(|)"; fi ;;
+    1) $echo "Test w(|) failed: files w.O and $srcdir/w.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test w(|) may have failed." 1>&2;
+       $echo The command "cmp w.O $srcdir/w.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s w.E || rm -f w.E
+$xx -b 1 < $srcdir/w.I > w.O 2> w.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test w(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp w.O $srcdir/w.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed w(<)"; fi ;;
+    1) $echo "Test w(<) failed: files w.O and $srcdir/w.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test w(<) may have failed." 1>&2;
        $echo The command "cmp w.O $srcdir/w.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -556,15 +1644,49 @@ test -s w.E || rm -f w.E
 $xx -s -d: -f2-4 $srcdir/x.I > x.O 2> x.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test x failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  $echo "Test x(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp x.O $srcdir/x.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed x(F)"; fi ;;
+    1) $echo "Test x(F) failed: files x.O and $srcdir/x.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test x(F) may have failed." 1>&2;
+       $echo The command "cmp x.O $srcdir/x.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s x.E || rm -f x.E
+cat $srcdir/x.I | $xx -s -d: -f2-4 > x.O 2> x.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test x(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp x.O $srcdir/x.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed x(|)"; fi ;;
+    1) $echo "Test x(|) failed: files x.O and $srcdir/x.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test x(|) may have failed." 1>&2;
+       $echo The command "cmp x.O $srcdir/x.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s x.E || rm -f x.E
+$xx -s -d: -f2-4 < $srcdir/x.I > x.O 2> x.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test x(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
   cmp x.O $srcdir/x.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed x"; fi ;;
-    1) $echo "Test x failed: files x.O and $srcdir/x.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed x(<)"; fi ;;
+    1) $echo "Test x(<) failed: files x.O and $srcdir/x.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test x may have failed." 1>&2;
+    2) $echo "Test x(<) may have failed." 1>&2;
        $echo The command "cmp x.O $srcdir/x.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -573,15 +1695,49 @@ test -s x.E || rm -f x.E
 $xx -s -b4 $srcdir/y.I > y.O 2> y.E
 code=$?
 if test $code != 1 ; then
-  $echo "Test y failed: ../../src/cut return code $code differs from expected value 1" 1>&2
+  $echo "Test y(F) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp y.O $srcdir/y.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed y"; fi ;;
-    1) $echo "Test y failed: files y.O and $srcdir/y.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed y(F)"; fi ;;
+    1) $echo "Test y(F) failed: files y.O and $srcdir/y.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test y may have failed." 1>&2;
+    2) $echo "Test y(F) may have failed." 1>&2;
+       $echo The command "cmp y.O $srcdir/y.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s y.E || rm -f y.E
+cat $srcdir/y.I | $xx -s -b4 > y.O 2> y.E
+code=$?
+if test $code != 1 ; then
+  $echo "Test y(|) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp y.O $srcdir/y.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed y(|)"; fi ;;
+    1) $echo "Test y(|) failed: files y.O and $srcdir/y.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test y(|) may have failed." 1>&2;
+       $echo The command "cmp y.O $srcdir/y.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s y.E || rm -f y.E
+$xx -s -b4 < $srcdir/y.I > y.O 2> y.E
+code=$?
+if test $code != 1 ; then
+  $echo "Test y(<) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp y.O $srcdir/y.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed y(<)"; fi ;;
+    1) $echo "Test y(<) failed: files y.O and $srcdir/y.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test y(<) may have failed." 1>&2;
        $echo The command "cmp y.O $srcdir/y.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -590,15 +1746,49 @@ test -s y.E || rm -f y.E
 $xx  $srcdir/z.I > z.O 2> z.E
 code=$?
 if test $code != 1 ; then
-  $echo "Test z failed: ../../src/cut return code $code differs from expected value 1" 1>&2
+  $echo "Test z(F) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp z.O $srcdir/z.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed z(F)"; fi ;;
+    1) $echo "Test z(F) failed: files z.O and $srcdir/z.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test z(F) may have failed." 1>&2;
+       $echo The command "cmp z.O $srcdir/z.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s z.E || rm -f z.E
+cat $srcdir/z.I | $xx  > z.O 2> z.E
+code=$?
+if test $code != 1 ; then
+  $echo "Test z(|) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp z.O $srcdir/z.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed z(|)"; fi ;;
+    1) $echo "Test z(|) failed: files z.O and $srcdir/z.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test z(|) may have failed." 1>&2;
+       $echo The command "cmp z.O $srcdir/z.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s z.E || rm -f z.E
+$xx  < $srcdir/z.I > z.O 2> z.E
+code=$?
+if test $code != 1 ; then
+  $echo "Test z(<) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp z.O $srcdir/z.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed z"; fi ;;
-    1) $echo "Test z failed: files z.O and $srcdir/z.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed z(<)"; fi ;;
+    1) $echo "Test z(<) failed: files z.O and $srcdir/z.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test z may have failed." 1>&2;
+    2) $echo "Test z(<) may have failed." 1>&2;
        $echo The command "cmp z.O $srcdir/z.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -607,15 +1797,49 @@ test -s z.E || rm -f z.E
 $xx -f '' $srcdir/empty-fl.I > empty-fl.O 2> empty-fl.E
 code=$?
 if test $code != 1 ; then
-  $echo "Test empty-fl failed: ../../src/cut return code $code differs from expected value 1" 1>&2
+  $echo "Test empty-fl(F) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp empty-fl.O $srcdir/empty-fl.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed empty-fl"; fi ;;
-    1) $echo "Test empty-fl failed: files empty-fl.O and $srcdir/empty-fl.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed empty-fl(F)"; fi ;;
+    1) $echo "Test empty-fl(F) failed: files empty-fl.O and $srcdir/empty-fl.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test empty-fl may have failed." 1>&2;
+    2) $echo "Test empty-fl(F) may have failed." 1>&2;
+       $echo The command "cmp empty-fl.O $srcdir/empty-fl.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s empty-fl.E || rm -f empty-fl.E
+cat $srcdir/empty-fl.I | $xx -f '' > empty-fl.O 2> empty-fl.E
+code=$?
+if test $code != 1 ; then
+  $echo "Test empty-fl(|) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp empty-fl.O $srcdir/empty-fl.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed empty-fl(|)"; fi ;;
+    1) $echo "Test empty-fl(|) failed: files empty-fl.O and $srcdir/empty-fl.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test empty-fl(|) may have failed." 1>&2;
+       $echo The command "cmp empty-fl.O $srcdir/empty-fl.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s empty-fl.E || rm -f empty-fl.E
+$xx -f '' < $srcdir/empty-fl.I > empty-fl.O 2> empty-fl.E
+code=$?
+if test $code != 1 ; then
+  $echo "Test empty-fl(<) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp empty-fl.O $srcdir/empty-fl.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed empty-fl(<)"; fi ;;
+    1) $echo "Test empty-fl(<) failed: files empty-fl.O and $srcdir/empty-fl.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test empty-fl(<) may have failed." 1>&2;
        $echo The command "cmp empty-fl.O $srcdir/empty-fl.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -624,15 +1848,49 @@ test -s empty-fl.E || rm -f empty-fl.E
 $xx -f $srcdir/missing-fl.I > missing-fl.O 2> missing-fl.E
 code=$?
 if test $code != 1 ; then
-  $echo "Test missing-fl failed: ../../src/cut return code $code differs from expected value 1" 1>&2
+  $echo "Test missing-fl(F) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp missing-fl.O $srcdir/missing-fl.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed missing-fl"; fi ;;
-    1) $echo "Test missing-fl failed: files missing-fl.O and $srcdir/missing-fl.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed missing-fl(F)"; fi ;;
+    1) $echo "Test missing-fl(F) failed: files missing-fl.O and $srcdir/missing-fl.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test missing-fl may have failed." 1>&2;
+    2) $echo "Test missing-fl(F) may have failed." 1>&2;
+       $echo The command "cmp missing-fl.O $srcdir/missing-fl.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s missing-fl.E || rm -f missing-fl.E
+cat $srcdir/missing-fl.I | $xx -f > missing-fl.O 2> missing-fl.E
+code=$?
+if test $code != 1 ; then
+  $echo "Test missing-fl(|) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp missing-fl.O $srcdir/missing-fl.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed missing-fl(|)"; fi ;;
+    1) $echo "Test missing-fl(|) failed: files missing-fl.O and $srcdir/missing-fl.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test missing-fl(|) may have failed." 1>&2;
+       $echo The command "cmp missing-fl.O $srcdir/missing-fl.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s missing-fl.E || rm -f missing-fl.E
+$xx -f < $srcdir/missing-fl.I > missing-fl.O 2> missing-fl.E
+code=$?
+if test $code != 1 ; then
+  $echo "Test missing-fl(<) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp missing-fl.O $srcdir/missing-fl.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed missing-fl(<)"; fi ;;
+    1) $echo "Test missing-fl(<) failed: files missing-fl.O and $srcdir/missing-fl.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test missing-fl(<) may have failed." 1>&2;
        $echo The command "cmp missing-fl.O $srcdir/missing-fl.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -641,15 +1899,49 @@ test -s missing-fl.E || rm -f missing-fl.E
 $xx -b '' $srcdir/empty-bl.I > empty-bl.O 2> empty-bl.E
 code=$?
 if test $code != 1 ; then
-  $echo "Test empty-bl failed: ../../src/cut return code $code differs from expected value 1" 1>&2
+  $echo "Test empty-bl(F) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp empty-bl.O $srcdir/empty-bl.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed empty-bl(F)"; fi ;;
+    1) $echo "Test empty-bl(F) failed: files empty-bl.O and $srcdir/empty-bl.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test empty-bl(F) may have failed." 1>&2;
+       $echo The command "cmp empty-bl.O $srcdir/empty-bl.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s empty-bl.E || rm -f empty-bl.E
+cat $srcdir/empty-bl.I | $xx -b '' > empty-bl.O 2> empty-bl.E
+code=$?
+if test $code != 1 ; then
+  $echo "Test empty-bl(|) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp empty-bl.O $srcdir/empty-bl.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed empty-bl(|)"; fi ;;
+    1) $echo "Test empty-bl(|) failed: files empty-bl.O and $srcdir/empty-bl.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test empty-bl(|) may have failed." 1>&2;
+       $echo The command "cmp empty-bl.O $srcdir/empty-bl.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s empty-bl.E || rm -f empty-bl.E
+$xx -b '' < $srcdir/empty-bl.I > empty-bl.O 2> empty-bl.E
+code=$?
+if test $code != 1 ; then
+  $echo "Test empty-bl(<) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp empty-bl.O $srcdir/empty-bl.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed empty-bl"; fi ;;
-    1) $echo "Test empty-bl failed: files empty-bl.O and $srcdir/empty-bl.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed empty-bl(<)"; fi ;;
+    1) $echo "Test empty-bl(<) failed: files empty-bl.O and $srcdir/empty-bl.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test empty-bl may have failed." 1>&2;
+    2) $echo "Test empty-bl(<) may have failed." 1>&2;
        $echo The command "cmp empty-bl.O $srcdir/empty-bl.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
@@ -658,15 +1950,49 @@ test -s empty-bl.E || rm -f empty-bl.E
 $xx -b $srcdir/missing-bl.I > missing-bl.O 2> missing-bl.E
 code=$?
 if test $code != 1 ; then
-  $echo "Test missing-bl failed: ../../src/cut return code $code differs from expected value 1" 1>&2
+  $echo "Test missing-bl(F) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp missing-bl.O $srcdir/missing-bl.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed missing-bl(F)"; fi ;;
+    1) $echo "Test missing-bl(F) failed: files missing-bl.O and $srcdir/missing-bl.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test missing-bl(F) may have failed." 1>&2;
+       $echo The command "cmp missing-bl.O $srcdir/missing-bl.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s missing-bl.E || rm -f missing-bl.E
+cat $srcdir/missing-bl.I | $xx -b > missing-bl.O 2> missing-bl.E
+code=$?
+if test $code != 1 ; then
+  $echo "Test missing-bl(|) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp missing-bl.O $srcdir/missing-bl.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed missing-bl(|)"; fi ;;
+    1) $echo "Test missing-bl(|) failed: files missing-bl.O and $srcdir/missing-bl.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test missing-bl(|) may have failed." 1>&2;
+       $echo The command "cmp missing-bl.O $srcdir/missing-bl.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s missing-bl.E || rm -f missing-bl.E
+$xx -b < $srcdir/missing-bl.I > missing-bl.O 2> missing-bl.E
+code=$?
+if test $code != 1 ; then
+  $echo "Test missing-bl(<) failed: ../../src/cut return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
   cmp missing-bl.O $srcdir/missing-bl.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed missing-bl"; fi ;;
-    1) $echo "Test missing-bl failed: files missing-bl.O and $srcdir/missing-bl.X differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed missing-bl(<)"; fi ;;
+    1) $echo "Test missing-bl(<) failed: files missing-bl.O and $srcdir/missing-bl.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test missing-bl may have failed." 1>&2;
+    2) $echo "Test missing-bl(<) may have failed." 1>&2;
        $echo The command "cmp missing-bl.O $srcdir/missing-bl.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
diff --git a/tests/join/.cvsignore b/tests/join/.cvsignore
index e2a83621c..a1b6c39af 100644
--- a/tests/join/.cvsignore
+++ b/tests/join/.cvsignore
@@ -1,9 +1,9 @@
-t*.log
-t*.out
-t*.in1
-t*.in2
-t*.exp
-join-tests
+*.I1
+*.I2
+*.E
+*.X
+*.O
+*-tests
 build-script
 Makefile
 mk-script
diff --git a/tests/join/Makefile.am b/tests/join/Makefile.am
index ecfce08e2..809a49896 100644
--- a/tests/join/Makefile.am
+++ b/tests/join/Makefile.am
@@ -3,26 +3,20 @@
 ##test-files-begin
 x = join
 explicit =
-maint_gen = t1a.in1 t1a.in2 t1a.exp t1b.in1 t1b.in2 t1b.exp t1c.in1 t1c.in2 \
-t1c.exp t1d.in1 t1d.in2 t1d.exp t1e.in1 t1e.in2 t1e.exp t1f.in1 t1f.in2 \
-t1f.exp t2a.in1 t2a.in2 t2a.exp t2b.in1 t2b.in2 t2b.exp t2c.in1 t2c.in2 \
-t2c.exp t3a.in1 t3a.in2 t3a.exp t4a.in1 t4a.in2 t4a.exp t4b.in1 t4b.in2 \
-t4b.exp t4c.in1 t4c.in2 t4c.exp t4d.in1 t4d.in2 t4d.exp t4e.in1 t4e.in2 \
-t4e.exp t5a.in1 t5a.in2 t5a.exp t5b.in1 t5b.in2 t5b.exp t5c.in1 t5c.in2 \
-t5c.exp t5d.in1 t5d.in2 t5d.exp t5e.in1 t5e.in2 t5e.exp t5f.in1 t5f.in2 \
-t5f.exp t5g.in1 t5g.in2 t5g.exp t5h.in1 t5h.in2 t5h.exp t5i.in1 t5i.in2 \
-t5i.exp t5j.in1 t5j.in2 t5j.exp t5k.in1 t5k.in2 t5k.exp t5l.in1 t5l.in2 \
-t5l.exp t5m.in1 t5m.in2 t5m.exp t6a.in1 t6a.in2 t6a.exp t6b.in1 t6b.in2 \
-t6b.exp t6c.in1 t6c.in2 t6c.exp t7a.in1 t7a.in2 t7a.exp t8a.in1 t8a.in2 \
-t8a.exp t8b.in1 t8b.in2 t8b.exp t9a.in1 t9a.in2 t9a.exp
-run_gen = t1a.out t1a.err t1b.out t1b.err t1c.out t1c.err t1d.out t1d.err \
-t1e.out t1e.err t1f.out t1f.err t2a.out t2a.err t2b.out t2b.err t2c.out \
-t2c.err t3a.out t3a.err t4a.out t4a.err t4b.out t4b.err t4c.out t4c.err \
-t4d.out t4d.err t4e.out t4e.err t5a.out t5a.err t5b.out t5b.err t5c.out \
-t5c.err t5d.out t5d.err t5e.out t5e.err t5f.out t5f.err t5g.out t5g.err \
-t5h.out t5h.err t5i.out t5i.err t5j.out t5j.err t5k.out t5k.err t5l.out \
-t5l.err t5m.out t5m.err t6a.out t6a.err t6b.out t6b.err t6c.out t6c.err \
-t7a.out t7a.err t8a.out t8a.err t8b.out t8b.err t9a.out t9a.err
+maint_gen = 1a.I1 1a.I2 1a.X 1b.I1 1b.I2 1b.X 1c.I1 1c.I2 1c.X 1d.I1 1d.I2 \
+1d.X 1e.I1 1e.I2 1e.X 1f.I1 1f.I2 1f.X 2a.I1 2a.I2 2a.X 2b.I1 2b.I2 2b.X \
+2c.I1 2c.I2 2c.X 3a.I1 3a.I2 3a.X 4a.I1 4a.I2 4a.X 4b.I1 4b.I2 4b.X 4c.I1 \
+4c.I2 4c.X 4d.I1 4d.I2 4d.X 4e.I1 4e.I2 4e.X 5a.I1 5a.I2 5a.X 5b.I1 5b.I2 \
+5b.X 5c.I1 5c.I2 5c.X 5d.I1 5d.I2 5d.X 5e.I1 5e.I2 5e.X 5f.I1 5f.I2 5f.X \
+5g.I1 5g.I2 5g.X 5h.I1 5h.I2 5h.X 5i.I1 5i.I2 5i.X 5j.I1 5j.I2 5j.X 5k.I1 \
+5k.I2 5k.X 5l.I1 5l.I2 5l.X 5m.I1 5m.I2 5m.X 6a.I1 6a.I2 6a.X 6b.I1 6b.I2 \
+6b.X 6c.I1 6c.I2 6c.X 7a.I1 7a.I2 7a.X 8a.I1 8a.I2 8a.X 8b.I1 8b.I2 8b.X \
+9a.I1 9a.I2 9a.X
+run_gen = 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 2a.O \
+2a.E 2b.O 2b.E 2c.O 2c.E 3a.O 3a.E 4a.O 4a.E 4b.O 4b.E 4c.O 4c.E 4d.O 4d.E \
+4e.O 4e.E 5a.O 5a.E 5b.O 5b.E 5c.O 5c.E 5d.O 5d.E 5e.O 5e.E 5f.O 5f.E 5g.O \
+5g.E 5h.O 5h.E 5i.O 5i.E 5j.O 5j.E 5k.O 5k.E 5l.O 5l.E 5m.O 5m.E 6a.O 6a.E \
+6b.O 6b.E 6c.O 6c.E 7a.O 7a.E 8a.O 8a.E 8b.O 8b.E 9a.O 9a.E
 ##test-files-end
 
 EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
diff --git a/tests/join/Makefile.in b/tests/join/Makefile.in
index 4e9b06cf8..a7bcda403 100644
--- a/tests/join/Makefile.in
+++ b/tests/join/Makefile.in
@@ -44,26 +44,20 @@ CC = @CC@
 
 x = join
 explicit =
-maint_gen = t1a.in1 t1a.in2 t1a.exp t1b.in1 t1b.in2 t1b.exp t1c.in1 t1c.in2 \
-t1c.exp t1d.in1 t1d.in2 t1d.exp t1e.in1 t1e.in2 t1e.exp t1f.in1 t1f.in2 \
-t1f.exp t2a.in1 t2a.in2 t2a.exp t2b.in1 t2b.in2 t2b.exp t2c.in1 t2c.in2 \
-t2c.exp t3a.in1 t3a.in2 t3a.exp t4a.in1 t4a.in2 t4a.exp t4b.in1 t4b.in2 \
-t4b.exp t4c.in1 t4c.in2 t4c.exp t4d.in1 t4d.in2 t4d.exp t4e.in1 t4e.in2 \
-t4e.exp t5a.in1 t5a.in2 t5a.exp t5b.in1 t5b.in2 t5b.exp t5c.in1 t5c.in2 \
-t5c.exp t5d.in1 t5d.in2 t5d.exp t5e.in1 t5e.in2 t5e.exp t5f.in1 t5f.in2 \
-t5f.exp t5g.in1 t5g.in2 t5g.exp t5h.in1 t5h.in2 t5h.exp t5i.in1 t5i.in2 \
-t5i.exp t5j.in1 t5j.in2 t5j.exp t5k.in1 t5k.in2 t5k.exp t5l.in1 t5l.in2 \
-t5l.exp t5m.in1 t5m.in2 t5m.exp t6a.in1 t6a.in2 t6a.exp t6b.in1 t6b.in2 \
-t6b.exp t6c.in1 t6c.in2 t6c.exp t7a.in1 t7a.in2 t7a.exp t8a.in1 t8a.in2 \
-t8a.exp t8b.in1 t8b.in2 t8b.exp t9a.in1 t9a.in2 t9a.exp
-run_gen = t1a.out t1a.err t1b.out t1b.err t1c.out t1c.err t1d.out t1d.err \
-t1e.out t1e.err t1f.out t1f.err t2a.out t2a.err t2b.out t2b.err t2c.out \
-t2c.err t3a.out t3a.err t4a.out t4a.err t4b.out t4b.err t4c.out t4c.err \
-t4d.out t4d.err t4e.out t4e.err t5a.out t5a.err t5b.out t5b.err t5c.out \
-t5c.err t5d.out t5d.err t5e.out t5e.err t5f.out t5f.err t5g.out t5g.err \
-t5h.out t5h.err t5i.out t5i.err t5j.out t5j.err t5k.out t5k.err t5l.out \
-t5l.err t5m.out t5m.err t6a.out t6a.err t6b.out t6b.err t6c.out t6c.err \
-t7a.out t7a.err t8a.out t8a.err t8b.out t8b.err t9a.out t9a.err
+maint_gen = 1a.I1 1a.I2 1a.X 1b.I1 1b.I2 1b.X 1c.I1 1c.I2 1c.X 1d.I1 1d.I2 \
+1d.X 1e.I1 1e.I2 1e.X 1f.I1 1f.I2 1f.X 2a.I1 2a.I2 2a.X 2b.I1 2b.I2 2b.X \
+2c.I1 2c.I2 2c.X 3a.I1 3a.I2 3a.X 4a.I1 4a.I2 4a.X 4b.I1 4b.I2 4b.X 4c.I1 \
+4c.I2 4c.X 4d.I1 4d.I2 4d.X 4e.I1 4e.I2 4e.X 5a.I1 5a.I2 5a.X 5b.I1 5b.I2 \
+5b.X 5c.I1 5c.I2 5c.X 5d.I1 5d.I2 5d.X 5e.I1 5e.I2 5e.X 5f.I1 5f.I2 5f.X \
+5g.I1 5g.I2 5g.X 5h.I1 5h.I2 5h.X 5i.I1 5i.I2 5i.X 5j.I1 5j.I2 5j.X 5k.I1 \
+5k.I2 5k.X 5l.I1 5l.I2 5l.X 5m.I1 5m.I2 5m.X 6a.I1 6a.I2 6a.X 6b.I1 6b.I2 \
+6b.X 6c.I1 6c.I2 6c.X 7a.I1 7a.I2 7a.X 8a.I1 8a.I2 8a.X 8b.I1 8b.I2 8b.X \
+9a.I1 9a.I2 9a.X
+run_gen = 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 2a.O \
+2a.E 2b.O 2b.E 2c.O 2c.E 3a.O 3a.E 4a.O 4a.E 4b.O 4b.E 4c.O 4c.E 4d.O 4d.E \
+4e.O 4e.E 5a.O 5a.E 5b.O 5b.E 5c.O 5c.E 5d.O 5d.E 5e.O 5e.E 5f.O 5f.E 5g.O \
+5g.E 5h.O 5h.E 5i.O 5i.E 5j.O 5j.E 5k.O 5k.E 5l.O 5l.E 5m.O 5m.E 6a.O 6a.E \
+6b.O 6b.E 6c.O 6c.E 7a.O 7a.E 8a.O 8a.E 8b.O 8b.E 9a.O 9a.E
 
 EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
diff --git a/tests/join/join-tests b/tests/join/join-tests
index 03e3bee25..c7e7456c3 100755
--- a/tests/join/join-tests
+++ b/tests/join/join-tests
@@ -9,601 +9,601 @@ $echo testing program: $xx
 errors=0
 test "$srcdir" || srcdir=.
 test "$VERBOSE" && $xx --version 2> /dev/null
-$xx -a1 $srcdir/t1a.in1 $srcdir/t1a.in2 > t1a.out 2> t1a.err
+$xx -a1 $srcdir/1a.I1 $srcdir/1a.I2 > 1a.O 2> 1a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 1a failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1a.out $srcdir/t1a.exp
+  cmp 1a.O $srcdir/1a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 1a"; fi ;;
-    1) $echo "Test 1a failed: files t1a.out and $srcdir/t1a.exp differ" 1>&2;
+    1) $echo "Test 1a failed: files 1a.O and $srcdir/1a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 1a may have failed." 1>&2;
-       $echo The command "cmp t1a.out $srcdir/t1a.exp" failed. 1>&2 ;
+       $echo The command "cmp 1a.O $srcdir/1a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1a.err || rm -f t1a.err
-$xx -a2 $srcdir/t1b.in1 $srcdir/t1b.in2 > t1b.out 2> t1b.err
+test -s 1a.E || rm -f 1a.E
+$xx -a2 $srcdir/1b.I1 $srcdir/1b.I2 > 1b.O 2> 1b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 1b failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1b.out $srcdir/t1b.exp
+  cmp 1b.O $srcdir/1b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 1b"; fi ;;
-    1) $echo "Test 1b failed: files t1b.out and $srcdir/t1b.exp differ" 1>&2;
+    1) $echo "Test 1b failed: files 1b.O and $srcdir/1b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 1b may have failed." 1>&2;
-       $echo The command "cmp t1b.out $srcdir/t1b.exp" failed. 1>&2 ;
+       $echo The command "cmp 1b.O $srcdir/1b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1b.err || rm -f t1b.err
-$xx -a1 -a2 $srcdir/t1c.in1 $srcdir/t1c.in2 > t1c.out 2> t1c.err
+test -s 1b.E || rm -f 1b.E
+$xx -a1 -a2 $srcdir/1c.I1 $srcdir/1c.I2 > 1c.O 2> 1c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 1c failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1c.out $srcdir/t1c.exp
+  cmp 1c.O $srcdir/1c.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 1c"; fi ;;
-    1) $echo "Test 1c failed: files t1c.out and $srcdir/t1c.exp differ" 1>&2;
+    1) $echo "Test 1c failed: files 1c.O and $srcdir/1c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 1c may have failed." 1>&2;
-       $echo The command "cmp t1c.out $srcdir/t1c.exp" failed. 1>&2 ;
+       $echo The command "cmp 1c.O $srcdir/1c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1c.err || rm -f t1c.err
-$xx -a1 $srcdir/t1d.in1 $srcdir/t1d.in2 > t1d.out 2> t1d.err
+test -s 1c.E || rm -f 1c.E
+$xx -a1 $srcdir/1d.I1 $srcdir/1d.I2 > 1d.O 2> 1d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 1d failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1d.out $srcdir/t1d.exp
+  cmp 1d.O $srcdir/1d.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 1d"; fi ;;
-    1) $echo "Test 1d failed: files t1d.out and $srcdir/t1d.exp differ" 1>&2;
+    1) $echo "Test 1d failed: files 1d.O and $srcdir/1d.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 1d may have failed." 1>&2;
-       $echo The command "cmp t1d.out $srcdir/t1d.exp" failed. 1>&2 ;
+       $echo The command "cmp 1d.O $srcdir/1d.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1d.err || rm -f t1d.err
-$xx -a2 $srcdir/t1e.in1 $srcdir/t1e.in2 > t1e.out 2> t1e.err
+test -s 1d.E || rm -f 1d.E
+$xx -a2 $srcdir/1e.I1 $srcdir/1e.I2 > 1e.O 2> 1e.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 1e failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1e.out $srcdir/t1e.exp
+  cmp 1e.O $srcdir/1e.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 1e"; fi ;;
-    1) $echo "Test 1e failed: files t1e.out and $srcdir/t1e.exp differ" 1>&2;
+    1) $echo "Test 1e failed: files 1e.O and $srcdir/1e.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 1e may have failed." 1>&2;
-       $echo The command "cmp t1e.out $srcdir/t1e.exp" failed. 1>&2 ;
+       $echo The command "cmp 1e.O $srcdir/1e.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1e.err || rm -f t1e.err
-$xx -a2 $srcdir/t1f.in1 $srcdir/t1f.in2 > t1f.out 2> t1f.err
+test -s 1e.E || rm -f 1e.E
+$xx -a2 $srcdir/1f.I1 $srcdir/1f.I2 > 1f.O 2> 1f.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 1f failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1f.out $srcdir/t1f.exp
+  cmp 1f.O $srcdir/1f.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 1f"; fi ;;
-    1) $echo "Test 1f failed: files t1f.out and $srcdir/t1f.exp differ" 1>&2;
+    1) $echo "Test 1f failed: files 1f.O and $srcdir/1f.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 1f may have failed." 1>&2;
-       $echo The command "cmp t1f.out $srcdir/t1f.exp" failed. 1>&2 ;
+       $echo The command "cmp 1f.O $srcdir/1f.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1f.err || rm -f t1f.err
-$xx -a1 -e . $srcdir/t2a.in1 $srcdir/t2a.in2 > t2a.out 2> t2a.err
+test -s 1f.E || rm -f 1f.E
+$xx -a1 -e . $srcdir/2a.I1 $srcdir/2a.I2 > 2a.O 2> 2a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 2a failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t2a.out $srcdir/t2a.exp
+  cmp 2a.O $srcdir/2a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 2a"; fi ;;
-    1) $echo "Test 2a failed: files t2a.out and $srcdir/t2a.exp differ" 1>&2;
+    1) $echo "Test 2a failed: files 2a.O and $srcdir/2a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 2a may have failed." 1>&2;
-       $echo The command "cmp t2a.out $srcdir/t2a.exp" failed. 1>&2 ;
+       $echo The command "cmp 2a.O $srcdir/2a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t2a.err || rm -f t2a.err
-$xx -a1 -e . -o 2.1,2.2,2.3 $srcdir/t2b.in1 $srcdir/t2b.in2 > t2b.out 2> t2b.err
+test -s 2a.E || rm -f 2a.E
+$xx -a1 -e . -o 2.1,2.2,2.3 $srcdir/2b.I1 $srcdir/2b.I2 > 2b.O 2> 2b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 2b failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t2b.out $srcdir/t2b.exp
+  cmp 2b.O $srcdir/2b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 2b"; fi ;;
-    1) $echo "Test 2b failed: files t2b.out and $srcdir/t2b.exp differ" 1>&2;
+    1) $echo "Test 2b failed: files 2b.O and $srcdir/2b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 2b may have failed." 1>&2;
-       $echo The command "cmp t2b.out $srcdir/t2b.exp" failed. 1>&2 ;
+       $echo The command "cmp 2b.O $srcdir/2b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t2b.err || rm -f t2b.err
-$xx -a1 -e . -o 2.1,2.2,2.3 $srcdir/t2c.in1 $srcdir/t2c.in2 > t2c.out 2> t2c.err
+test -s 2b.E || rm -f 2b.E
+$xx -a1 -e . -o 2.1,2.2,2.3 $srcdir/2c.I1 $srcdir/2c.I2 > 2c.O 2> 2c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 2c failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t2c.out $srcdir/t2c.exp
+  cmp 2c.O $srcdir/2c.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 2c"; fi ;;
-    1) $echo "Test 2c failed: files t2c.out and $srcdir/t2c.exp differ" 1>&2;
+    1) $echo "Test 2c failed: files 2c.O and $srcdir/2c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 2c may have failed." 1>&2;
-       $echo The command "cmp t2c.out $srcdir/t2c.exp" failed. 1>&2 ;
+       $echo The command "cmp 2c.O $srcdir/2c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t2c.err || rm -f t2c.err
-$xx -t: $srcdir/t3a.in1 $srcdir/t3a.in2 > t3a.out 2> t3a.err
+test -s 2c.E || rm -f 2c.E
+$xx -t: $srcdir/3a.I1 $srcdir/3a.I2 > 3a.O 2> 3a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3a failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3a.out $srcdir/t3a.exp
+  cmp 3a.O $srcdir/3a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3a"; fi ;;
-    1) $echo "Test 3a failed: files t3a.out and $srcdir/t3a.exp differ" 1>&2;
+    1) $echo "Test 3a failed: files 3a.O and $srcdir/3a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3a may have failed." 1>&2;
-       $echo The command "cmp t3a.out $srcdir/t3a.exp" failed. 1>&2 ;
+       $echo The command "cmp 3a.O $srcdir/3a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3a.err || rm -f t3a.err
-$xx -v 1 $srcdir/t4a.in1 $srcdir/t4a.in2 > t4a.out 2> t4a.err
+test -s 3a.E || rm -f 3a.E
+$xx -v 1 $srcdir/4a.I1 $srcdir/4a.I2 > 4a.O 2> 4a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 4a failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4a.out $srcdir/t4a.exp
+  cmp 4a.O $srcdir/4a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 4a"; fi ;;
-    1) $echo "Test 4a failed: files t4a.out and $srcdir/t4a.exp differ" 1>&2;
+    1) $echo "Test 4a failed: files 4a.O and $srcdir/4a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 4a may have failed." 1>&2;
-       $echo The command "cmp t4a.out $srcdir/t4a.exp" failed. 1>&2 ;
+       $echo The command "cmp 4a.O $srcdir/4a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4a.err || rm -f t4a.err
-$xx -v 2 $srcdir/t4b.in1 $srcdir/t4b.in2 > t4b.out 2> t4b.err
+test -s 4a.E || rm -f 4a.E
+$xx -v 2 $srcdir/4b.I1 $srcdir/4b.I2 > 4b.O 2> 4b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 4b failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4b.out $srcdir/t4b.exp
+  cmp 4b.O $srcdir/4b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 4b"; fi ;;
-    1) $echo "Test 4b failed: files t4b.out and $srcdir/t4b.exp differ" 1>&2;
+    1) $echo "Test 4b failed: files 4b.O and $srcdir/4b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 4b may have failed." 1>&2;
-       $echo The command "cmp t4b.out $srcdir/t4b.exp" failed. 1>&2 ;
+       $echo The command "cmp 4b.O $srcdir/4b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4b.err || rm -f t4b.err
-$xx -v 1 $srcdir/t4c.in1 $srcdir/t4c.in2 > t4c.out 2> t4c.err
+test -s 4b.E || rm -f 4b.E
+$xx -v 1 $srcdir/4c.I1 $srcdir/4c.I2 > 4c.O 2> 4c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 4c failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4c.out $srcdir/t4c.exp
+  cmp 4c.O $srcdir/4c.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 4c"; fi ;;
-    1) $echo "Test 4c failed: files t4c.out and $srcdir/t4c.exp differ" 1>&2;
+    1) $echo "Test 4c failed: files 4c.O and $srcdir/4c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 4c may have failed." 1>&2;
-       $echo The command "cmp t4c.out $srcdir/t4c.exp" failed. 1>&2 ;
+       $echo The command "cmp 4c.O $srcdir/4c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4c.err || rm -f t4c.err
-$xx -v 2 $srcdir/t4d.in1 $srcdir/t4d.in2 > t4d.out 2> t4d.err
+test -s 4c.E || rm -f 4c.E
+$xx -v 2 $srcdir/4d.I1 $srcdir/4d.I2 > 4d.O 2> 4d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 4d failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4d.out $srcdir/t4d.exp
+  cmp 4d.O $srcdir/4d.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 4d"; fi ;;
-    1) $echo "Test 4d failed: files t4d.out and $srcdir/t4d.exp differ" 1>&2;
+    1) $echo "Test 4d failed: files 4d.O and $srcdir/4d.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 4d may have failed." 1>&2;
-       $echo The command "cmp t4d.out $srcdir/t4d.exp" failed. 1>&2 ;
+       $echo The command "cmp 4d.O $srcdir/4d.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4d.err || rm -f t4d.err
-$xx -v 2 $srcdir/t4e.in1 $srcdir/t4e.in2 > t4e.out 2> t4e.err
+test -s 4d.E || rm -f 4d.E
+$xx -v 2 $srcdir/4e.I1 $srcdir/4e.I2 > 4e.O 2> 4e.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 4e failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4e.out $srcdir/t4e.exp
+  cmp 4e.O $srcdir/4e.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 4e"; fi ;;
-    1) $echo "Test 4e failed: files t4e.out and $srcdir/t4e.exp differ" 1>&2;
+    1) $echo "Test 4e failed: files 4e.O and $srcdir/4e.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 4e may have failed." 1>&2;
-       $echo The command "cmp t4e.out $srcdir/t4e.exp" failed. 1>&2 ;
+       $echo The command "cmp 4e.O $srcdir/4e.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4e.err || rm -f t4e.err
-$xx -a1 -e - -o 1.1 2.2 $srcdir/t5a.in1 $srcdir/t5a.in2 > t5a.out 2> t5a.err
+test -s 4e.E || rm -f 4e.E
+$xx -a1 -e - -o 1.1 2.2 $srcdir/5a.I1 $srcdir/5a.I2 > 5a.O 2> 5a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5a failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5a.out $srcdir/t5a.exp
+  cmp 5a.O $srcdir/5a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5a"; fi ;;
-    1) $echo "Test 5a failed: files t5a.out and $srcdir/t5a.exp differ" 1>&2;
+    1) $echo "Test 5a failed: files 5a.O and $srcdir/5a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5a may have failed." 1>&2;
-       $echo The command "cmp t5a.out $srcdir/t5a.exp" failed. 1>&2 ;
+       $echo The command "cmp 5a.O $srcdir/5a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5a.err || rm -f t5a.err
-$xx -a1 -e - -o 1.1 2.2 $srcdir/t5b.in1 $srcdir/t5b.in2 > t5b.out 2> t5b.err
+test -s 5a.E || rm -f 5a.E
+$xx -a1 -e - -o 1.1 2.2 $srcdir/5b.I1 $srcdir/5b.I2 > 5b.O 2> 5b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5b failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5b.out $srcdir/t5b.exp
+  cmp 5b.O $srcdir/5b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5b"; fi ;;
-    1) $echo "Test 5b failed: files t5b.out and $srcdir/t5b.exp differ" 1>&2;
+    1) $echo "Test 5b failed: files 5b.O and $srcdir/5b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5b may have failed." 1>&2;
-       $echo The command "cmp t5b.out $srcdir/t5b.exp" failed. 1>&2 ;
+       $echo The command "cmp 5b.O $srcdir/5b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5b.err || rm -f t5b.err
-$xx -a1 -e - -o 1.1 2.2 $srcdir/t5c.in1 $srcdir/t5c.in2 > t5c.out 2> t5c.err
+test -s 5b.E || rm -f 5b.E
+$xx -a1 -e - -o 1.1 2.2 $srcdir/5c.I1 $srcdir/5c.I2 > 5c.O 2> 5c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5c failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5c.out $srcdir/t5c.exp
+  cmp 5c.O $srcdir/5c.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5c"; fi ;;
-    1) $echo "Test 5c failed: files t5c.out and $srcdir/t5c.exp differ" 1>&2;
+    1) $echo "Test 5c failed: files 5c.O and $srcdir/5c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5c may have failed." 1>&2;
-       $echo The command "cmp t5c.out $srcdir/t5c.exp" failed. 1>&2 ;
+       $echo The command "cmp 5c.O $srcdir/5c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5c.err || rm -f t5c.err
-$xx -a1 -e - -o 1.1 2.2 $srcdir/t5d.in1 $srcdir/t5d.in2 > t5d.out 2> t5d.err
+test -s 5c.E || rm -f 5c.E
+$xx -a1 -e - -o 1.1 2.2 $srcdir/5d.I1 $srcdir/5d.I2 > 5d.O 2> 5d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5d failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5d.out $srcdir/t5d.exp
+  cmp 5d.O $srcdir/5d.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5d"; fi ;;
-    1) $echo "Test 5d failed: files t5d.out and $srcdir/t5d.exp differ" 1>&2;
+    1) $echo "Test 5d failed: files 5d.O and $srcdir/5d.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5d may have failed." 1>&2;
-       $echo The command "cmp t5d.out $srcdir/t5d.exp" failed. 1>&2 ;
+       $echo The command "cmp 5d.O $srcdir/5d.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5d.err || rm -f t5d.err
-$xx -a2 -e - -o 1.1 2.2 $srcdir/t5e.in1 $srcdir/t5e.in2 > t5e.out 2> t5e.err
+test -s 5d.E || rm -f 5d.E
+$xx -a2 -e - -o 1.1 2.2 $srcdir/5e.I1 $srcdir/5e.I2 > 5e.O 2> 5e.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5e failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5e.out $srcdir/t5e.exp
+  cmp 5e.O $srcdir/5e.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5e"; fi ;;
-    1) $echo "Test 5e failed: files t5e.out and $srcdir/t5e.exp differ" 1>&2;
+    1) $echo "Test 5e failed: files 5e.O and $srcdir/5e.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5e may have failed." 1>&2;
-       $echo The command "cmp t5e.out $srcdir/t5e.exp" failed. 1>&2 ;
+       $echo The command "cmp 5e.O $srcdir/5e.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5e.err || rm -f t5e.err
-$xx -a2 -e - -o 2.2 1.1 $srcdir/t5f.in1 $srcdir/t5f.in2 > t5f.out 2> t5f.err
+test -s 5e.E || rm -f 5e.E
+$xx -a2 -e - -o 2.2 1.1 $srcdir/5f.I1 $srcdir/5f.I2 > 5f.O 2> 5f.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5f failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5f.out $srcdir/t5f.exp
+  cmp 5f.O $srcdir/5f.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5f"; fi ;;
-    1) $echo "Test 5f failed: files t5f.out and $srcdir/t5f.exp differ" 1>&2;
+    1) $echo "Test 5f failed: files 5f.O and $srcdir/5f.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5f may have failed." 1>&2;
-       $echo The command "cmp t5f.out $srcdir/t5f.exp" failed. 1>&2 ;
+       $echo The command "cmp 5f.O $srcdir/5f.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5f.err || rm -f t5f.err
-$xx -a1 -e - -o 2.2 1.1 $srcdir/t5g.in1 $srcdir/t5g.in2 > t5g.out 2> t5g.err
+test -s 5f.E || rm -f 5f.E
+$xx -a1 -e - -o 2.2 1.1 $srcdir/5g.I1 $srcdir/5g.I2 > 5g.O 2> 5g.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5g failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5g.out $srcdir/t5g.exp
+  cmp 5g.O $srcdir/5g.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5g"; fi ;;
-    1) $echo "Test 5g failed: files t5g.out and $srcdir/t5g.exp differ" 1>&2;
+    1) $echo "Test 5g failed: files 5g.O and $srcdir/5g.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5g may have failed." 1>&2;
-       $echo The command "cmp t5g.out $srcdir/t5g.exp" failed. 1>&2 ;
+       $echo The command "cmp 5g.O $srcdir/5g.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5g.err || rm -f t5g.err
-$xx -a1 -e - -o 2.2 1.1 $srcdir/t5h.in1 $srcdir/t5h.in2 > t5h.out 2> t5h.err
+test -s 5g.E || rm -f 5g.E
+$xx -a1 -e - -o 2.2 1.1 $srcdir/5h.I1 $srcdir/5h.I2 > 5h.O 2> 5h.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5h failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5h.out $srcdir/t5h.exp
+  cmp 5h.O $srcdir/5h.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5h"; fi ;;
-    1) $echo "Test 5h failed: files t5h.out and $srcdir/t5h.exp differ" 1>&2;
+    1) $echo "Test 5h failed: files 5h.O and $srcdir/5h.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5h may have failed." 1>&2;
-       $echo The command "cmp t5h.out $srcdir/t5h.exp" failed. 1>&2 ;
+       $echo The command "cmp 5h.O $srcdir/5h.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5h.err || rm -f t5h.err
-$xx -a1 -e - -o 1.1 2.2 $srcdir/t5i.in1 $srcdir/t5i.in2 > t5i.out 2> t5i.err
+test -s 5h.E || rm -f 5h.E
+$xx -a1 -e - -o 1.1 2.2 $srcdir/5i.I1 $srcdir/5i.I2 > 5i.O 2> 5i.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5i failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5i.out $srcdir/t5i.exp
+  cmp 5i.O $srcdir/5i.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5i"; fi ;;
-    1) $echo "Test 5i failed: files t5i.out and $srcdir/t5i.exp differ" 1>&2;
+    1) $echo "Test 5i failed: files 5i.O and $srcdir/5i.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5i may have failed." 1>&2;
-       $echo The command "cmp t5i.out $srcdir/t5i.exp" failed. 1>&2 ;
+       $echo The command "cmp 5i.O $srcdir/5i.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5i.err || rm -f t5i.err
-$xx -a2 -e - -o 2.2 1.1 $srcdir/t5j.in1 $srcdir/t5j.in2 > t5j.out 2> t5j.err
+test -s 5i.E || rm -f 5i.E
+$xx -a2 -e - -o 2.2 1.1 $srcdir/5j.I1 $srcdir/5j.I2 > 5j.O 2> 5j.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5j failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5j.out $srcdir/t5j.exp
+  cmp 5j.O $srcdir/5j.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5j"; fi ;;
-    1) $echo "Test 5j failed: files t5j.out and $srcdir/t5j.exp differ" 1>&2;
+    1) $echo "Test 5j failed: files 5j.O and $srcdir/5j.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5j may have failed." 1>&2;
-       $echo The command "cmp t5j.out $srcdir/t5j.exp" failed. 1>&2 ;
+       $echo The command "cmp 5j.O $srcdir/5j.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5j.err || rm -f t5j.err
-$xx -a2 -e - -o 2.2 1.1 $srcdir/t5k.in1 $srcdir/t5k.in2 > t5k.out 2> t5k.err
+test -s 5j.E || rm -f 5j.E
+$xx -a2 -e - -o 2.2 1.1 $srcdir/5k.I1 $srcdir/5k.I2 > 5k.O 2> 5k.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5k failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5k.out $srcdir/t5k.exp
+  cmp 5k.O $srcdir/5k.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5k"; fi ;;
-    1) $echo "Test 5k failed: files t5k.out and $srcdir/t5k.exp differ" 1>&2;
+    1) $echo "Test 5k failed: files 5k.O and $srcdir/5k.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5k may have failed." 1>&2;
-       $echo The command "cmp t5k.out $srcdir/t5k.exp" failed. 1>&2 ;
+       $echo The command "cmp 5k.O $srcdir/5k.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5k.err || rm -f t5k.err
-$xx -a1 -e - -o 2.2 1.1 $srcdir/t5l.in1 $srcdir/t5l.in2 > t5l.out 2> t5l.err
+test -s 5k.E || rm -f 5k.E
+$xx -a1 -e - -o 2.2 1.1 $srcdir/5l.I1 $srcdir/5l.I2 > 5l.O 2> 5l.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5l failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5l.out $srcdir/t5l.exp
+  cmp 5l.O $srcdir/5l.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5l"; fi ;;
-    1) $echo "Test 5l failed: files t5l.out and $srcdir/t5l.exp differ" 1>&2;
+    1) $echo "Test 5l failed: files 5l.O and $srcdir/5l.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5l may have failed." 1>&2;
-       $echo The command "cmp t5l.out $srcdir/t5l.exp" failed. 1>&2 ;
+       $echo The command "cmp 5l.O $srcdir/5l.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5l.err || rm -f t5l.err
-$xx -a2 -e - -o 2.2 1.1 $srcdir/t5m.in1 $srcdir/t5m.in2 > t5m.out 2> t5m.err
+test -s 5l.E || rm -f 5l.E
+$xx -a2 -e - -o 2.2 1.1 $srcdir/5m.I1 $srcdir/5m.I2 > 5m.O 2> 5m.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5m failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5m.out $srcdir/t5m.exp
+  cmp 5m.O $srcdir/5m.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5m"; fi ;;
-    1) $echo "Test 5m failed: files t5m.out and $srcdir/t5m.exp differ" 1>&2;
+    1) $echo "Test 5m failed: files 5m.O and $srcdir/5m.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5m may have failed." 1>&2;
-       $echo The command "cmp t5m.out $srcdir/t5m.exp" failed. 1>&2 ;
+       $echo The command "cmp 5m.O $srcdir/5m.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5m.err || rm -f t5m.err
-$xx -e - $srcdir/t6a.in1 $srcdir/t6a.in2 > t6a.out 2> t6a.err
+test -s 5m.E || rm -f 5m.E
+$xx -e - $srcdir/6a.I1 $srcdir/6a.I2 > 6a.O 2> 6a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 6a failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t6a.out $srcdir/t6a.exp
+  cmp 6a.O $srcdir/6a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 6a"; fi ;;
-    1) $echo "Test 6a failed: files t6a.out and $srcdir/t6a.exp differ" 1>&2;
+    1) $echo "Test 6a failed: files 6a.O and $srcdir/6a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 6a may have failed." 1>&2;
-       $echo The command "cmp t6a.out $srcdir/t6a.exp" failed. 1>&2 ;
+       $echo The command "cmp 6a.O $srcdir/6a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t6a.err || rm -f t6a.err
-$xx -a1 -e - $srcdir/t6b.in1 $srcdir/t6b.in2 > t6b.out 2> t6b.err
+test -s 6a.E || rm -f 6a.E
+$xx -a1 -e - $srcdir/6b.I1 $srcdir/6b.I2 > 6b.O 2> 6b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 6b failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t6b.out $srcdir/t6b.exp
+  cmp 6b.O $srcdir/6b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 6b"; fi ;;
-    1) $echo "Test 6b failed: files t6b.out and $srcdir/t6b.exp differ" 1>&2;
+    1) $echo "Test 6b failed: files 6b.O and $srcdir/6b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 6b may have failed." 1>&2;
-       $echo The command "cmp t6b.out $srcdir/t6b.exp" failed. 1>&2 ;
+       $echo The command "cmp 6b.O $srcdir/6b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t6b.err || rm -f t6b.err
-$xx -a1 -e - $srcdir/t6c.in1 $srcdir/t6c.in2 > t6c.out 2> t6c.err
+test -s 6b.E || rm -f 6b.E
+$xx -a1 -e - $srcdir/6c.I1 $srcdir/6c.I2 > 6c.O 2> 6c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 6c failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t6c.out $srcdir/t6c.exp
+  cmp 6c.O $srcdir/6c.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 6c"; fi ;;
-    1) $echo "Test 6c failed: files t6c.out and $srcdir/t6c.exp differ" 1>&2;
+    1) $echo "Test 6c failed: files 6c.O and $srcdir/6c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 6c may have failed." 1>&2;
-       $echo The command "cmp t6c.out $srcdir/t6c.exp" failed. 1>&2 ;
+       $echo The command "cmp 6c.O $srcdir/6c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t6c.err || rm -f t6c.err
-$xx -a1 -e . -o 2.7 $srcdir/t7a.in1 $srcdir/t7a.in2 > t7a.out 2> t7a.err
+test -s 6c.E || rm -f 6c.E
+$xx -a1 -e . -o 2.7 $srcdir/7a.I1 $srcdir/7a.I2 > 7a.O 2> 7a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 7a failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t7a.out $srcdir/t7a.exp
+  cmp 7a.O $srcdir/7a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 7a"; fi ;;
-    1) $echo "Test 7a failed: files t7a.out and $srcdir/t7a.exp differ" 1>&2;
+    1) $echo "Test 7a failed: files 7a.O and $srcdir/7a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 7a may have failed." 1>&2;
-       $echo The command "cmp t7a.out $srcdir/t7a.exp" failed. 1>&2 ;
+       $echo The command "cmp 7a.O $srcdir/7a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t7a.err || rm -f t7a.err
-$xx -a1 -e . -o 0,1.2 $srcdir/t8a.in1 $srcdir/t8a.in2 > t8a.out 2> t8a.err
+test -s 7a.E || rm -f 7a.E
+$xx -a1 -e . -o 0,1.2 $srcdir/8a.I1 $srcdir/8a.I2 > 8a.O 2> 8a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 8a failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t8a.out $srcdir/t8a.exp
+  cmp 8a.O $srcdir/8a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 8a"; fi ;;
-    1) $echo "Test 8a failed: files t8a.out and $srcdir/t8a.exp differ" 1>&2;
+    1) $echo "Test 8a failed: files 8a.O and $srcdir/8a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 8a may have failed." 1>&2;
-       $echo The command "cmp t8a.out $srcdir/t8a.exp" failed. 1>&2 ;
+       $echo The command "cmp 8a.O $srcdir/8a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t8a.err || rm -f t8a.err
-$xx -a1 -a2 -e . -o 0,1.2 $srcdir/t8b.in1 $srcdir/t8b.in2 > t8b.out 2> t8b.err
+test -s 8a.E || rm -f 8a.E
+$xx -a1 -a2 -e . -o 0,1.2 $srcdir/8b.I1 $srcdir/8b.I2 > 8b.O 2> 8b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 8b failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t8b.out $srcdir/t8b.exp
+  cmp 8b.O $srcdir/8b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 8b"; fi ;;
-    1) $echo "Test 8b failed: files t8b.out and $srcdir/t8b.exp differ" 1>&2;
+    1) $echo "Test 8b failed: files 8b.O and $srcdir/8b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 8b may have failed." 1>&2;
-       $echo The command "cmp t8b.out $srcdir/t8b.exp" failed. 1>&2 ;
+       $echo The command "cmp 8b.O $srcdir/8b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t8b.err || rm -f t8b.err
-$xx  $srcdir/t9a.in1 $srcdir/t9a.in2 > t9a.out 2> t9a.err
+test -s 8b.E || rm -f 8b.E
+$xx  $srcdir/9a.I1 $srcdir/9a.I2 > 9a.O 2> 9a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9a failed: ../../src/join return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9a.out $srcdir/t9a.exp
+  cmp 9a.O $srcdir/9a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9a"; fi ;;
-    1) $echo "Test 9a failed: files t9a.out and $srcdir/t9a.exp differ" 1>&2;
+    1) $echo "Test 9a failed: files 9a.O and $srcdir/9a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9a may have failed." 1>&2;
-       $echo The command "cmp t9a.out $srcdir/t9a.exp" failed. 1>&2 ;
+       $echo The command "cmp 9a.O $srcdir/9a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9a.err || rm -f t9a.err
+test -s 9a.E || rm -f 9a.E
 if test $errors = 0 ; then
   $echo Passed all 35 tests. 1>&2
 else
diff --git a/tests/md5sum/.cvsignore b/tests/md5sum/.cvsignore
index 992c83aca..852508156 100644
--- a/tests/md5sum/.cvsignore
+++ b/tests/md5sum/.cvsignore
@@ -1,7 +1,8 @@
+*.I
+*.E
+*.X
+*.O
+*-tests
+build-script
 Makefile
-join-tests
 mk-script
-t*.exp
-t*.in
-t*.log
-t*.out
diff --git a/tests/md5sum/Makefile.am b/tests/md5sum/Makefile.am
index 10256cfe4..df7e25a95 100644
--- a/tests/md5sum/Makefile.am
+++ b/tests/md5sum/Makefile.am
@@ -3,10 +3,8 @@
 ##test-files-begin
 x = md5sum
 explicit =
-maint_gen = t1.in t1.exp t2.in t2.exp t3.in t3.exp t4.in t4.exp t5.in t5.exp \
-t6.in t6.exp t7.in t7.exp
-run_gen = t1.out t1.err t2.out t2.err t3.out t3.err t4.out t4.err t5.out \
-t5.err t6.out t6.err t7.out t7.err
+maint_gen = 1.I 1.X 2.I 2.X 3.I 3.X 4.I 4.X 5.I 5.X 6.I 6.X 7.I 7.X
+run_gen = 1.O 1.E 2.O 2.E 3.O 3.E 4.O 4.E 5.O 5.E 6.O 6.E 7.O 7.E
 ##test-files-end
 
 EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
diff --git a/tests/md5sum/Makefile.in b/tests/md5sum/Makefile.in
index 0d371b575..d7b392254 100644
--- a/tests/md5sum/Makefile.in
+++ b/tests/md5sum/Makefile.in
@@ -44,10 +44,8 @@ CC = @CC@
 
 x = md5sum
 explicit =
-maint_gen = t1.in t1.exp t2.in t2.exp t3.in t3.exp t4.in t4.exp t5.in t5.exp \
-t6.in t6.exp t7.in t7.exp
-run_gen = t1.out t1.err t2.out t2.err t3.out t3.err t4.out t4.err t5.out \
-t5.err t6.out t6.err t7.out t7.err
+maint_gen = 1.I 1.X 2.I 2.X 3.I 3.X 4.I 4.X 5.I 5.X 6.I 6.X 7.I 7.X
+run_gen = 1.O 1.E 2.O 2.E 3.O 3.E 4.O 4.E 5.O 5.E 6.O 6.E 7.O 7.E
 
 EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
diff --git a/tests/md5sum/md5sum-tests b/tests/md5sum/md5sum-tests
index b3b7db0e3..6fee9f805 100755
--- a/tests/md5sum/md5sum-tests
+++ b/tests/md5sum/md5sum-tests
@@ -9,125 +9,244 @@ $echo testing program: $xx
 errors=0
 test "$srcdir" || srcdir=.
 test "$VERBOSE" && $xx --version 2> /dev/null
-$xx  < $srcdir/t1.in > t1.out 2> t1.err
+cat $srcdir/1.I | $xx  > 1.O 2> 1.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test 1 failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
+  $echo "Test 1(|) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1.out $srcdir/t1.exp
+  cmp 1.O $srcdir/1.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 1"; fi ;;
-    1) $echo "Test 1 failed: files t1.out and $srcdir/t1.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1(|)"; fi ;;
+    1) $echo "Test 1(|) failed: files 1.O and $srcdir/1.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 1 may have failed." 1>&2;
-       $echo The command "cmp t1.out $srcdir/t1.exp" failed. 1>&2 ;
+    2) $echo "Test 1(|) may have failed." 1>&2;
+       $echo The command "cmp 1.O $srcdir/1.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1.err || rm -f t1.err
-$xx  < $srcdir/t2.in > t2.out 2> t2.err
+test -s 1.E || rm -f 1.E
+$xx  < $srcdir/1.I > 1.O 2> 1.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test 2 failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
+  $echo "Test 1(<) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t2.out $srcdir/t2.exp
+  cmp 1.O $srcdir/1.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 2"; fi ;;
-    1) $echo "Test 2 failed: files t2.out and $srcdir/t2.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1(<)"; fi ;;
+    1) $echo "Test 1(<) failed: files 1.O and $srcdir/1.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 2 may have failed." 1>&2;
-       $echo The command "cmp t2.out $srcdir/t2.exp" failed. 1>&2 ;
+    2) $echo "Test 1(<) may have failed." 1>&2;
+       $echo The command "cmp 1.O $srcdir/1.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t2.err || rm -f t2.err
-$xx  < $srcdir/t3.in > t3.out 2> t3.err
+test -s 1.E || rm -f 1.E
+cat $srcdir/2.I | $xx  > 2.O 2> 2.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test 3 failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
+  $echo "Test 2(|) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3.out $srcdir/t3.exp
+  cmp 2.O $srcdir/2.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 3"; fi ;;
-    1) $echo "Test 3 failed: files t3.out and $srcdir/t3.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2(|)"; fi ;;
+    1) $echo "Test 2(|) failed: files 2.O and $srcdir/2.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 3 may have failed." 1>&2;
-       $echo The command "cmp t3.out $srcdir/t3.exp" failed. 1>&2 ;
+    2) $echo "Test 2(|) may have failed." 1>&2;
+       $echo The command "cmp 2.O $srcdir/2.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3.err || rm -f t3.err
-$xx  < $srcdir/t4.in > t4.out 2> t4.err
+test -s 2.E || rm -f 2.E
+$xx  < $srcdir/2.I > 2.O 2> 2.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test 4 failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
+  $echo "Test 2(<) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4.out $srcdir/t4.exp
+  cmp 2.O $srcdir/2.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 4"; fi ;;
-    1) $echo "Test 4 failed: files t4.out and $srcdir/t4.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2(<)"; fi ;;
+    1) $echo "Test 2(<) failed: files 2.O and $srcdir/2.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 4 may have failed." 1>&2;
-       $echo The command "cmp t4.out $srcdir/t4.exp" failed. 1>&2 ;
+    2) $echo "Test 2(<) may have failed." 1>&2;
+       $echo The command "cmp 2.O $srcdir/2.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4.err || rm -f t4.err
-$xx  < $srcdir/t5.in > t5.out 2> t5.err
+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 5 failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
+  $echo "Test 3(|) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5.out $srcdir/t5.exp
+  cmp 3.O $srcdir/3.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 5"; fi ;;
-    1) $echo "Test 5 failed: files t5.out and $srcdir/t5.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3(|)"; fi ;;
+    1) $echo "Test 3(|) failed: files 3.O and $srcdir/3.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 5 may have failed." 1>&2;
-       $echo The command "cmp t5.out $srcdir/t5.exp" failed. 1>&2 ;
+    2) $echo "Test 3(|) may have failed." 1>&2;
+       $echo The command "cmp 3.O $srcdir/3.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5.err || rm -f t5.err
-$xx  < $srcdir/t6.in > t6.out 2> t6.err
+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 6 failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
+  $echo "Test 3(<) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t6.out $srcdir/t6.exp
+  cmp 3.O $srcdir/3.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 6"; fi ;;
-    1) $echo "Test 6 failed: files t6.out and $srcdir/t6.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3(<)"; fi ;;
+    1) $echo "Test 3(<) failed: files 3.O and $srcdir/3.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 6 may have failed." 1>&2;
-       $echo The command "cmp t6.out $srcdir/t6.exp" failed. 1>&2 ;
+    2) $echo "Test 3(<) may have failed." 1>&2;
+       $echo The command "cmp 3.O $srcdir/3.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t6.err || rm -f t6.err
-$xx  < $srcdir/t7.in > t7.out 2> t7.err
+test -s 3.E || rm -f 3.E
+cat $srcdir/4.I | $xx  > 4.O 2> 4.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test 7 failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
+  $echo "Test 4(|) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t7.out $srcdir/t7.exp
+  cmp 4.O $srcdir/4.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 7"; fi ;;
-    1) $echo "Test 7 failed: files t7.out and $srcdir/t7.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4(|)"; fi ;;
+    1) $echo "Test 4(|) failed: files 4.O and $srcdir/4.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 7 may have failed." 1>&2;
-       $echo The command "cmp t7.out $srcdir/t7.exp" failed. 1>&2 ;
+    2) $echo "Test 4(|) may have failed." 1>&2;
+       $echo The command "cmp 4.O $srcdir/4.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t7.err || rm -f t7.err
+test -s 4.E || rm -f 4.E
+$xx  < $srcdir/4.I > 4.O 2> 4.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 4(<) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 4.O $srcdir/4.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 4(<)"; fi ;;
+    1) $echo "Test 4(<) failed: files 4.O and $srcdir/4.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 4(<) may have failed." 1>&2;
+       $echo The command "cmp 4.O $srcdir/4.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 4.E || rm -f 4.E
+cat $srcdir/5.I | $xx  > 5.O 2> 5.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 5(|) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 5.O $srcdir/5.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 5(|)"; fi ;;
+    1) $echo "Test 5(|) failed: files 5.O and $srcdir/5.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 5(|) may have failed." 1>&2;
+       $echo The command "cmp 5.O $srcdir/5.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 5.E || rm -f 5.E
+$xx  < $srcdir/5.I > 5.O 2> 5.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 5(<) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 5.O $srcdir/5.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 5(<)"; fi ;;
+    1) $echo "Test 5(<) failed: files 5.O and $srcdir/5.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 5(<) may have failed." 1>&2;
+       $echo The command "cmp 5.O $srcdir/5.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 5.E || rm -f 5.E
+cat $srcdir/6.I | $xx  > 6.O 2> 6.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 6(|) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 6.O $srcdir/6.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 6(|)"; fi ;;
+    1) $echo "Test 6(|) failed: files 6.O and $srcdir/6.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 6(|) may have failed." 1>&2;
+       $echo The command "cmp 6.O $srcdir/6.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 6.E || rm -f 6.E
+$xx  < $srcdir/6.I > 6.O 2> 6.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 6(<) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 6.O $srcdir/6.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 6(<)"; fi ;;
+    1) $echo "Test 6(<) failed: files 6.O and $srcdir/6.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 6(<) may have failed." 1>&2;
+       $echo The command "cmp 6.O $srcdir/6.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 6.E || rm -f 6.E
+cat $srcdir/7.I | $xx  > 7.O 2> 7.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 7(|) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 7.O $srcdir/7.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 7(|)"; fi ;;
+    1) $echo "Test 7(|) failed: files 7.O and $srcdir/7.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 7(|) may have failed." 1>&2;
+       $echo The command "cmp 7.O $srcdir/7.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 7.E || rm -f 7.E
+$xx  < $srcdir/7.I > 7.O 2> 7.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test 7(<) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp 7.O $srcdir/7.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed 7(<)"; fi ;;
+    1) $echo "Test 7(<) failed: files 7.O and $srcdir/7.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test 7(<) may have failed." 1>&2;
+       $echo The command "cmp 7.O $srcdir/7.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s 7.E || rm -f 7.E
 if test $errors = 0 ; then
   $echo Passed all 7 tests. 1>&2
 else
diff --git a/tests/pr/.cvsignore b/tests/pr/.cvsignore
index 8f8f8b0bb..852508156 100644
--- a/tests/pr/.cvsignore
+++ b/tests/pr/.cvsignore
@@ -1,6 +1,8 @@
-t*.out
-t*.in
-t*.exp
-t*.err
+*.I
+*.E
+*.X
+*.O
+*-tests
+build-script
 Makefile
 mk-script
diff --git a/tests/pr/Makefile.am b/tests/pr/Makefile.am
index d6fdb07c8..e7e8ee34a 100644
--- a/tests/pr/Makefile.am
+++ b/tests/pr/Makefile.am
@@ -22,60 +22,40 @@ ta3-FF tb3-0FF tb3-FF tn w20l17f-lm w25l17f-lm w26l17f-lm w35a3l17f-lm \
 w35b3l17f-lm w35ja3l17f-lm w35jb3l17f-lm w35jml17f-lm-lo w35ml17f-lm-lo \
 w48l17f-lm w72j-0FF
 maint_gen =
-run_gen = t1a.out t1a.err t1b.out t1b.err t1c.out t1c.err t1d.out t1d.err \
-t1e.out t1e.err t1f.out t1f.err t1g.out t1g.err t1h.out t1h.err t1i.out \
-t1i.err t1j.out t1j.err t1k.out t1k.err t1l.out t1l.err t2a.out t2a.err \
-t2b.out t2b.err t2c.out t2c.err t2d.out t2d.err t2e.out t2e.err t2f.out \
-t2f.err t2g.out t2g.err t2h.out t2h.err t2i.out t2i.err t2j.out t2j.err \
-t3a.out t3a.err t3b.out t3b.err t3c.out t3c.err t3d.out t3d.err t3e.out \
-t3e.err t3f.out t3f.err t3g.out t3g.err t3h.out t3h.err t3i.out t3i.err \
-t3j.out t3j.err t3k.out t3k.err t3l.out t3l.err t3m.out t3m.err t3la.out \
-t3la.err t3lb.out t3lb.err t3lc.out t3lc.err t3ld.out t3ld.err t3le.out \
-t3le.err t3lf.out t3lf.err t3aa.out t3aa.err t3ab.out t3ab.err t3ac.out \
-t3ac.err t3ad.out t3ad.err t3ae.out t3ae.err t3af.out t3af.err t3ag.out \
-t3ag.err t3ah.out t3ah.err t3ai.out t3ai.err t3aj.out t3aj.err t3ak.out \
-t3ak.err t3ba.out t3ba.err t3bb.out t3bb.err t3bc.out t3bc.err t3bd.out \
-t3bd.err t3be.out t3be.err t3bf.out t3bf.err t3bg.out t3bg.err t3bh.out \
-t3bh.err t3bi.out t3bi.err t3bj.out t3bj.err t3bk.out t3bk.err t3Pa.out \
-t3Pa.err t3Pb.out t3Pb.err t3Pc.out t3Pc.err t3Pd.out t3Pd.err t3Pe.out \
-t3Pe.err t3Pf.out t3Pf.err t3Pg.out t3Pg.err t3Paa.out t3Paa.err t3Pab.out \
-t3Pab.err t3Pac.out t3Pac.err t3Pad.out t3Pad.err t3Pae.out t3Pae.err \
-t3Paf.out t3Paf.err t3Pba.out t3Pba.err t3Pbb.out t3Pbb.err t3Pbc.out \
-t3Pbc.err t3Pbd.out t3Pbd.err t3Pbe.out t3Pbe.err t3Pbf.out t3Pbf.err t4a.out \
-t4a.err t4b.out t4b.err t4c.out t4c.err t4d.out t4d.err t4e.out t4e.err \
-t4f.out t4f.err t4g.out t4g.err t4h.out t4h.err t4i.out t4i.err t4j.out \
-t4j.err t4k.out t4k.err t4l.out t4l.err t4m.out t4m.err t5a.out t5a.err \
-t5b.out t5b.err t5c.out t5c.err t5d.out t5d.err t5e.out t5e.err t5f.out \
-t5f.err t5g.out t5g.err t5ma.out t5ma.err t5mb.out t5mb.err t5mc.out t5mc.err \
-t5md.out t5md.err t5Pma.out t5Pma.err t5Pmb.out t5Pmb.err t5Pmc.out t5Pmc.err \
-t6a.out t6a.err t6b.out t6b.err t6c.out t6c.err t6d.out t6d.err t6e.out \
-t6e.err t6f.out t6f.err t6g.out t6g.err t6aa.out t6aa.err t6ab.out t6ab.err \
-t6ac.out t6ac.err t6ba.out t6ba.err t6bb.out t6bb.err t6bc.out t6bc.err \
-t7a.out t7a.err t7b.out t7b.err t7c.out t7c.err t7d.out t7d.err t7e.out \
-t7e.err t7f.out t7f.err t7g.out t7g.err t7aa.out t7aa.err t7ab.out t7ab.err \
-t7ac.out t7ac.err t7ba.out t7ba.err t7bb.out t7bb.err t7bc.out t7bc.err \
-t9a.out t9a.err t9b.out t9b.err t9Pa.out t9Pa.err t9Pb.out t9Pb.err t9Pc.out \
-t9Pc.err t9Pe.out t9Pe.err t9Pf.out t9Pf.err t9Pg.out t9Pg.err t9Ph.out \
-t9Ph.err t9Pi.out t9Pi.err t9Pj.out t9Pj.err t9Pk.out t9Pk.err t9Pl.out \
-t9Pl.err t9Pm.out t9Pm.err t9Pn.out t9Pn.err t9Po.out t9Po.err t9Pp.out \
-t9Pp.err t9Pq.out t9Pq.err t9Pr.out t9Pr.err t9Ps.out t9Ps.err t9Pt.out \
-t9Pt.err t9Paa.out t9Paa.err t9Pab.out t9Pab.err t9Pac.out t9Pac.err \
-t9Pad.out t9Pad.err t9Pae.out t9Pae.err t9Paf.out t9Paf.err t9Pag.out \
-t9Pag.err t9Pah.out t9Pah.err t9Pai.out t9Pai.err t9Paj.out t9Paj.err \
-t9Pak.out t9Pak.err t9Pba.out t9Pba.err t9Pbb.out t9Pbb.err t9Pbc.out \
-t9Pbc.err t9Pbd.out t9Pbd.err t9Pbe.out t9Pbe.err t9Pbf.out t9Pbf.err \
-t9Pbg.out t9Pbg.err t9Pbh.out t9Pbh.err t9Pbi.out t9Pbi.err t9Pbj.out \
-t9Pbj.err t9Pbk.out t9Pbk.err t9Pma.out t9Pma.err t9Pmb.out t9Pmb.err \
-t9Pmc.out t9Pmc.err t10a.out t10a.err t10b.out t10b.err t10c.out t10c.err \
-t10d.out t10d.err t10e.out t10e.err t10ma.out t10ma.err t10mb.out t10mb.err \
-t10mc.out t10mc.err t10md.out t10md.err t10me.out t10me.err t10mf.out \
-t10mf.err t10aa.out t10aa.err t10ab.out t10ab.err t10ac.out t10ac.err \
-t10ad.out t10ad.err t10ba.out t10ba.err t10bb.out t10bb.err t10bc.out \
-t10bc.err t10bd.out t10bd.err t11a.out t11a.err t11b.out t11b.err t11e.out \
-t11e.err t11f.out t11f.err t11g.out t11g.err t11h.out t11h.err t12aa.out \
-t12aa.err t12ab.out t12ab.err t12ac.out t12ac.err t12ba.out t12ba.err \
-t12bb.out t12bb.err t12bc.out t12bc.err t12ma.out t12ma.err t12mb.out \
-t12mb.err t12mc.out t12mc.err t12md.out t12md.err
+run_gen = 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 1g.O \
+1g.E 1h.O 1h.E 1i.O 1i.E 1j.O 1j.E 1k.O 1k.E 1l.O 1l.E 2a.O 2a.E 2b.O 2b.E \
+2c.O 2c.E 2d.O 2d.E 2e.O 2e.E 2f.O 2f.E 2g.O 2g.E 2h.O 2h.E 2i.O 2i.E 2j.O \
+2j.E 3a.O 3a.E 3b.O 3b.E 3c.O 3c.E 3d.O 3d.E 3e.O 3e.E 3f.O 3f.E 3g.O 3g.E \
+3h.O 3h.E 3i.O 3i.E 3j.O 3j.E 3k.O 3k.E 3l.O 3l.E 3m.O 3m.E 3la.O 3la.E 3lb.O \
+3lb.E 3lc.O 3lc.E 3ld.O 3ld.E 3le.O 3le.E 3lf.O 3lf.E 3aa.O 3aa.E 3ab.O 3ab.E \
+3ac.O 3ac.E 3ad.O 3ad.E 3ae.O 3ae.E 3af.O 3af.E 3ag.O 3ag.E 3ah.O 3ah.E 3ai.O \
+3ai.E 3aj.O 3aj.E 3ak.O 3ak.E 3ba.O 3ba.E 3bb.O 3bb.E 3bc.O 3bc.E 3bd.O 3bd.E \
+3be.O 3be.E 3bf.O 3bf.E 3bg.O 3bg.E 3bh.O 3bh.E 3bi.O 3bi.E 3bj.O 3bj.E 3bk.O \
+3bk.E 3Pa.O 3Pa.E 3Pb.O 3Pb.E 3Pc.O 3Pc.E 3Pd.O 3Pd.E 3Pe.O 3Pe.E 3Pf.O 3Pf.E \
+3Pg.O 3Pg.E 3Paa.O 3Paa.E 3Pab.O 3Pab.E 3Pac.O 3Pac.E 3Pad.O 3Pad.E 3Pae.O \
+3Pae.E 3Paf.O 3Paf.E 3Pba.O 3Pba.E 3Pbb.O 3Pbb.E 3Pbc.O 3Pbc.E 3Pbd.O 3Pbd.E \
+3Pbe.O 3Pbe.E 3Pbf.O 3Pbf.E 4a.O 4a.E 4b.O 4b.E 4c.O 4c.E 4d.O 4d.E 4e.O 4e.E \
+4f.O 4f.E 4g.O 4g.E 4h.O 4h.E 4i.O 4i.E 4j.O 4j.E 4k.O 4k.E 4l.O 4l.E 4m.O \
+4m.E 5a.O 5a.E 5b.O 5b.E 5c.O 5c.E 5d.O 5d.E 5e.O 5e.E 5f.O 5f.E 5g.O 5g.E \
+5ma.O 5ma.E 5mb.O 5mb.E 5mc.O 5mc.E 5md.O 5md.E 5Pma.O 5Pma.E 5Pmb.O 5Pmb.E \
+5Pmc.O 5Pmc.E 6a.O 6a.E 6b.O 6b.E 6c.O 6c.E 6d.O 6d.E 6e.O 6e.E 6f.O 6f.E \
+6g.O 6g.E 6aa.O 6aa.E 6ab.O 6ab.E 6ac.O 6ac.E 6ba.O 6ba.E 6bb.O 6bb.E 6bc.O \
+6bc.E 7a.O 7a.E 7b.O 7b.E 7c.O 7c.E 7d.O 7d.E 7e.O 7e.E 7f.O 7f.E 7g.O 7g.E \
+7aa.O 7aa.E 7ab.O 7ab.E 7ac.O 7ac.E 7ba.O 7ba.E 7bb.O 7bb.E 7bc.O 7bc.E 9a.O \
+9a.E 9b.O 9b.E 9Pa.O 9Pa.E 9Pb.O 9Pb.E 9Pc.O 9Pc.E 9Pe.O 9Pe.E 9Pf.O 9Pf.E \
+9Pg.O 9Pg.E 9Ph.O 9Ph.E 9Pi.O 9Pi.E 9Pj.O 9Pj.E 9Pk.O 9Pk.E 9Pl.O 9Pl.E 9Pm.O \
+9Pm.E 9Pn.O 9Pn.E 9Po.O 9Po.E 9Pp.O 9Pp.E 9Pq.O 9Pq.E 9Pr.O 9Pr.E 9Ps.O 9Ps.E \
+9Pt.O 9Pt.E 9Paa.O 9Paa.E 9Pab.O 9Pab.E 9Pac.O 9Pac.E 9Pad.O 9Pad.E 9Pae.O \
+9Pae.E 9Paf.O 9Paf.E 9Pag.O 9Pag.E 9Pah.O 9Pah.E 9Pai.O 9Pai.E 9Paj.O 9Paj.E \
+9Pak.O 9Pak.E 9Pba.O 9Pba.E 9Pbb.O 9Pbb.E 9Pbc.O 9Pbc.E 9Pbd.O 9Pbd.E 9Pbe.O \
+9Pbe.E 9Pbf.O 9Pbf.E 9Pbg.O 9Pbg.E 9Pbh.O 9Pbh.E 9Pbi.O 9Pbi.E 9Pbj.O 9Pbj.E \
+9Pbk.O 9Pbk.E 9Pma.O 9Pma.E 9Pmb.O 9Pmb.E 9Pmc.O 9Pmc.E 10a.O 10a.E 10b.O \
+10b.E 10c.O 10c.E 10d.O 10d.E 10e.O 10e.E 10ma.O 10ma.E 10mb.O 10mb.E 10mc.O \
+10mc.E 10md.O 10md.E 10me.O 10me.E 10mf.O 10mf.E 10aa.O 10aa.E 10ab.O 10ab.E \
+10ac.O 10ac.E 10ad.O 10ad.E 10ba.O 10ba.E 10bb.O 10bb.E 10bc.O 10bc.E 10bd.O \
+10bd.E 11a.O 11a.E 11b.O 11b.E 11e.O 11e.E 11f.O 11f.E 11g.O 11g.E 11h.O \
+11h.E 12aa.O 12aa.E 12ab.O 12ab.E 12ac.O 12ac.E 12ba.O 12ba.E 12bb.O 12bb.E \
+12bc.O 12bc.E 12ma.O 12ma.E 12mb.O 12mb.E 12mc.O 12mc.E 12md.O 12md.E
 ##test-files-end
 
 EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
diff --git a/tests/pr/Makefile.in b/tests/pr/Makefile.in
index 5dd7c6217..bad4dee87 100644
--- a/tests/pr/Makefile.in
+++ b/tests/pr/Makefile.in
@@ -63,60 +63,40 @@ ta3-FF tb3-0FF tb3-FF tn w20l17f-lm w25l17f-lm w26l17f-lm w35a3l17f-lm \
 w35b3l17f-lm w35ja3l17f-lm w35jb3l17f-lm w35jml17f-lm-lo w35ml17f-lm-lo \
 w48l17f-lm w72j-0FF
 maint_gen =
-run_gen = t1a.out t1a.err t1b.out t1b.err t1c.out t1c.err t1d.out t1d.err \
-t1e.out t1e.err t1f.out t1f.err t1g.out t1g.err t1h.out t1h.err t1i.out \
-t1i.err t1j.out t1j.err t1k.out t1k.err t1l.out t1l.err t2a.out t2a.err \
-t2b.out t2b.err t2c.out t2c.err t2d.out t2d.err t2e.out t2e.err t2f.out \
-t2f.err t2g.out t2g.err t2h.out t2h.err t2i.out t2i.err t2j.out t2j.err \
-t3a.out t3a.err t3b.out t3b.err t3c.out t3c.err t3d.out t3d.err t3e.out \
-t3e.err t3f.out t3f.err t3g.out t3g.err t3h.out t3h.err t3i.out t3i.err \
-t3j.out t3j.err t3k.out t3k.err t3l.out t3l.err t3m.out t3m.err t3la.out \
-t3la.err t3lb.out t3lb.err t3lc.out t3lc.err t3ld.out t3ld.err t3le.out \
-t3le.err t3lf.out t3lf.err t3aa.out t3aa.err t3ab.out t3ab.err t3ac.out \
-t3ac.err t3ad.out t3ad.err t3ae.out t3ae.err t3af.out t3af.err t3ag.out \
-t3ag.err t3ah.out t3ah.err t3ai.out t3ai.err t3aj.out t3aj.err t3ak.out \
-t3ak.err t3ba.out t3ba.err t3bb.out t3bb.err t3bc.out t3bc.err t3bd.out \
-t3bd.err t3be.out t3be.err t3bf.out t3bf.err t3bg.out t3bg.err t3bh.out \
-t3bh.err t3bi.out t3bi.err t3bj.out t3bj.err t3bk.out t3bk.err t3Pa.out \
-t3Pa.err t3Pb.out t3Pb.err t3Pc.out t3Pc.err t3Pd.out t3Pd.err t3Pe.out \
-t3Pe.err t3Pf.out t3Pf.err t3Pg.out t3Pg.err t3Paa.out t3Paa.err t3Pab.out \
-t3Pab.err t3Pac.out t3Pac.err t3Pad.out t3Pad.err t3Pae.out t3Pae.err \
-t3Paf.out t3Paf.err t3Pba.out t3Pba.err t3Pbb.out t3Pbb.err t3Pbc.out \
-t3Pbc.err t3Pbd.out t3Pbd.err t3Pbe.out t3Pbe.err t3Pbf.out t3Pbf.err t4a.out \
-t4a.err t4b.out t4b.err t4c.out t4c.err t4d.out t4d.err t4e.out t4e.err \
-t4f.out t4f.err t4g.out t4g.err t4h.out t4h.err t4i.out t4i.err t4j.out \
-t4j.err t4k.out t4k.err t4l.out t4l.err t4m.out t4m.err t5a.out t5a.err \
-t5b.out t5b.err t5c.out t5c.err t5d.out t5d.err t5e.out t5e.err t5f.out \
-t5f.err t5g.out t5g.err t5ma.out t5ma.err t5mb.out t5mb.err t5mc.out t5mc.err \
-t5md.out t5md.err t5Pma.out t5Pma.err t5Pmb.out t5Pmb.err t5Pmc.out t5Pmc.err \
-t6a.out t6a.err t6b.out t6b.err t6c.out t6c.err t6d.out t6d.err t6e.out \
-t6e.err t6f.out t6f.err t6g.out t6g.err t6aa.out t6aa.err t6ab.out t6ab.err \
-t6ac.out t6ac.err t6ba.out t6ba.err t6bb.out t6bb.err t6bc.out t6bc.err \
-t7a.out t7a.err t7b.out t7b.err t7c.out t7c.err t7d.out t7d.err t7e.out \
-t7e.err t7f.out t7f.err t7g.out t7g.err t7aa.out t7aa.err t7ab.out t7ab.err \
-t7ac.out t7ac.err t7ba.out t7ba.err t7bb.out t7bb.err t7bc.out t7bc.err \
-t9a.out t9a.err t9b.out t9b.err t9Pa.out t9Pa.err t9Pb.out t9Pb.err t9Pc.out \
-t9Pc.err t9Pe.out t9Pe.err t9Pf.out t9Pf.err t9Pg.out t9Pg.err t9Ph.out \
-t9Ph.err t9Pi.out t9Pi.err t9Pj.out t9Pj.err t9Pk.out t9Pk.err t9Pl.out \
-t9Pl.err t9Pm.out t9Pm.err t9Pn.out t9Pn.err t9Po.out t9Po.err t9Pp.out \
-t9Pp.err t9Pq.out t9Pq.err t9Pr.out t9Pr.err t9Ps.out t9Ps.err t9Pt.out \
-t9Pt.err t9Paa.out t9Paa.err t9Pab.out t9Pab.err t9Pac.out t9Pac.err \
-t9Pad.out t9Pad.err t9Pae.out t9Pae.err t9Paf.out t9Paf.err t9Pag.out \
-t9Pag.err t9Pah.out t9Pah.err t9Pai.out t9Pai.err t9Paj.out t9Paj.err \
-t9Pak.out t9Pak.err t9Pba.out t9Pba.err t9Pbb.out t9Pbb.err t9Pbc.out \
-t9Pbc.err t9Pbd.out t9Pbd.err t9Pbe.out t9Pbe.err t9Pbf.out t9Pbf.err \
-t9Pbg.out t9Pbg.err t9Pbh.out t9Pbh.err t9Pbi.out t9Pbi.err t9Pbj.out \
-t9Pbj.err t9Pbk.out t9Pbk.err t9Pma.out t9Pma.err t9Pmb.out t9Pmb.err \
-t9Pmc.out t9Pmc.err t10a.out t10a.err t10b.out t10b.err t10c.out t10c.err \
-t10d.out t10d.err t10e.out t10e.err t10ma.out t10ma.err t10mb.out t10mb.err \
-t10mc.out t10mc.err t10md.out t10md.err t10me.out t10me.err t10mf.out \
-t10mf.err t10aa.out t10aa.err t10ab.out t10ab.err t10ac.out t10ac.err \
-t10ad.out t10ad.err t10ba.out t10ba.err t10bb.out t10bb.err t10bc.out \
-t10bc.err t10bd.out t10bd.err t11a.out t11a.err t11b.out t11b.err t11e.out \
-t11e.err t11f.out t11f.err t11g.out t11g.err t11h.out t11h.err t12aa.out \
-t12aa.err t12ab.out t12ab.err t12ac.out t12ac.err t12ba.out t12ba.err \
-t12bb.out t12bb.err t12bc.out t12bc.err t12ma.out t12ma.err t12mb.out \
-t12mb.err t12mc.out t12mc.err t12md.out t12md.err
+run_gen = 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 1g.O \
+1g.E 1h.O 1h.E 1i.O 1i.E 1j.O 1j.E 1k.O 1k.E 1l.O 1l.E 2a.O 2a.E 2b.O 2b.E \
+2c.O 2c.E 2d.O 2d.E 2e.O 2e.E 2f.O 2f.E 2g.O 2g.E 2h.O 2h.E 2i.O 2i.E 2j.O \
+2j.E 3a.O 3a.E 3b.O 3b.E 3c.O 3c.E 3d.O 3d.E 3e.O 3e.E 3f.O 3f.E 3g.O 3g.E \
+3h.O 3h.E 3i.O 3i.E 3j.O 3j.E 3k.O 3k.E 3l.O 3l.E 3m.O 3m.E 3la.O 3la.E 3lb.O \
+3lb.E 3lc.O 3lc.E 3ld.O 3ld.E 3le.O 3le.E 3lf.O 3lf.E 3aa.O 3aa.E 3ab.O 3ab.E \
+3ac.O 3ac.E 3ad.O 3ad.E 3ae.O 3ae.E 3af.O 3af.E 3ag.O 3ag.E 3ah.O 3ah.E 3ai.O \
+3ai.E 3aj.O 3aj.E 3ak.O 3ak.E 3ba.O 3ba.E 3bb.O 3bb.E 3bc.O 3bc.E 3bd.O 3bd.E \
+3be.O 3be.E 3bf.O 3bf.E 3bg.O 3bg.E 3bh.O 3bh.E 3bi.O 3bi.E 3bj.O 3bj.E 3bk.O \
+3bk.E 3Pa.O 3Pa.E 3Pb.O 3Pb.E 3Pc.O 3Pc.E 3Pd.O 3Pd.E 3Pe.O 3Pe.E 3Pf.O 3Pf.E \
+3Pg.O 3Pg.E 3Paa.O 3Paa.E 3Pab.O 3Pab.E 3Pac.O 3Pac.E 3Pad.O 3Pad.E 3Pae.O \
+3Pae.E 3Paf.O 3Paf.E 3Pba.O 3Pba.E 3Pbb.O 3Pbb.E 3Pbc.O 3Pbc.E 3Pbd.O 3Pbd.E \
+3Pbe.O 3Pbe.E 3Pbf.O 3Pbf.E 4a.O 4a.E 4b.O 4b.E 4c.O 4c.E 4d.O 4d.E 4e.O 4e.E \
+4f.O 4f.E 4g.O 4g.E 4h.O 4h.E 4i.O 4i.E 4j.O 4j.E 4k.O 4k.E 4l.O 4l.E 4m.O \
+4m.E 5a.O 5a.E 5b.O 5b.E 5c.O 5c.E 5d.O 5d.E 5e.O 5e.E 5f.O 5f.E 5g.O 5g.E \
+5ma.O 5ma.E 5mb.O 5mb.E 5mc.O 5mc.E 5md.O 5md.E 5Pma.O 5Pma.E 5Pmb.O 5Pmb.E \
+5Pmc.O 5Pmc.E 6a.O 6a.E 6b.O 6b.E 6c.O 6c.E 6d.O 6d.E 6e.O 6e.E 6f.O 6f.E \
+6g.O 6g.E 6aa.O 6aa.E 6ab.O 6ab.E 6ac.O 6ac.E 6ba.O 6ba.E 6bb.O 6bb.E 6bc.O \
+6bc.E 7a.O 7a.E 7b.O 7b.E 7c.O 7c.E 7d.O 7d.E 7e.O 7e.E 7f.O 7f.E 7g.O 7g.E \
+7aa.O 7aa.E 7ab.O 7ab.E 7ac.O 7ac.E 7ba.O 7ba.E 7bb.O 7bb.E 7bc.O 7bc.E 9a.O \
+9a.E 9b.O 9b.E 9Pa.O 9Pa.E 9Pb.O 9Pb.E 9Pc.O 9Pc.E 9Pe.O 9Pe.E 9Pf.O 9Pf.E \
+9Pg.O 9Pg.E 9Ph.O 9Ph.E 9Pi.O 9Pi.E 9Pj.O 9Pj.E 9Pk.O 9Pk.E 9Pl.O 9Pl.E 9Pm.O \
+9Pm.E 9Pn.O 9Pn.E 9Po.O 9Po.E 9Pp.O 9Pp.E 9Pq.O 9Pq.E 9Pr.O 9Pr.E 9Ps.O 9Ps.E \
+9Pt.O 9Pt.E 9Paa.O 9Paa.E 9Pab.O 9Pab.E 9Pac.O 9Pac.E 9Pad.O 9Pad.E 9Pae.O \
+9Pae.E 9Paf.O 9Paf.E 9Pag.O 9Pag.E 9Pah.O 9Pah.E 9Pai.O 9Pai.E 9Paj.O 9Paj.E \
+9Pak.O 9Pak.E 9Pba.O 9Pba.E 9Pbb.O 9Pbb.E 9Pbc.O 9Pbc.E 9Pbd.O 9Pbd.E 9Pbe.O \
+9Pbe.E 9Pbf.O 9Pbf.E 9Pbg.O 9Pbg.E 9Pbh.O 9Pbh.E 9Pbi.O 9Pbi.E 9Pbj.O 9Pbj.E \
+9Pbk.O 9Pbk.E 9Pma.O 9Pma.E 9Pmb.O 9Pmb.E 9Pmc.O 9Pmc.E 10a.O 10a.E 10b.O \
+10b.E 10c.O 10c.E 10d.O 10d.E 10e.O 10e.E 10ma.O 10ma.E 10mb.O 10mb.E 10mc.O \
+10mc.E 10md.O 10md.E 10me.O 10me.E 10mf.O 10mf.E 10aa.O 10aa.E 10ab.O 10ab.E \
+10ac.O 10ac.E 10ad.O 10ad.E 10ba.O 10ba.E 10bb.O 10bb.E 10bc.O 10bc.E 10bd.O \
+10bd.E 11a.O 11a.E 11b.O 11b.E 11e.O 11e.E 11f.O 11f.E 11g.O 11g.E 11h.O \
+11h.E 12aa.O 12aa.E 12ab.O 12ab.E 12ac.O 12ac.E 12ba.O 12ba.E 12bb.O 12bb.E \
+12bc.O 12bc.E 12ma.O 12ma.E 12mb.O 12mb.E 12mc.O 12mc.E 12md.O 12md.E
 
 EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
diff --git a/tests/pr/pr-tests b/tests/pr/pr-tests
index eedbe3cb4..6101a163d 100755
--- a/tests/pr/pr-tests
+++ b/tests/pr/pr-tests
@@ -9,3678 +9,3678 @@ $echo testing program: $xx
 errors=0
 test "$srcdir" || srcdir=.
 test "$VERBOSE" && $xx --version 2> /dev/null
-$xx --test -h x  $srcdir/0Ft > t1a.out 2> t1a.err
+$xx --test -h x $srcdir/0Ft > 1a.O 2> 1a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 1a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1a.out $srcdir/0F
+  cmp 1a.O $srcdir/0F
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 1a"; fi ;;
-    1) $echo "Test 1a failed: files t1a.out and $srcdir/0F differ" 1>&2;
+    1) $echo "Test 1a failed: files 1a.O and $srcdir/0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 1a may have failed." 1>&2;
-       $echo The command "cmp t1a.out $srcdir/0F" failed. 1>&2 ;
+       $echo The command "cmp 1a.O $srcdir/0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1a.err || rm -f t1a.err
-$xx --test -h x  $srcdir/0Fnt > t1b.out 2> t1b.err
+test -s 1a.E || rm -f 1a.E
+$xx --test -h x $srcdir/0Fnt > 1b.O 2> 1b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 1b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1b.out $srcdir/0F
+  cmp 1b.O $srcdir/0F
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 1b"; fi ;;
-    1) $echo "Test 1b failed: files t1b.out and $srcdir/0F differ" 1>&2;
+    1) $echo "Test 1b failed: files 1b.O and $srcdir/0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 1b may have failed." 1>&2;
-       $echo The command "cmp t1b.out $srcdir/0F" failed. 1>&2 ;
+       $echo The command "cmp 1b.O $srcdir/0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1b.err || rm -f t1b.err
-$xx --test -h x +3 $srcdir/0Ft > t1c.out 2> t1c.err
+test -s 1b.E || rm -f 1b.E
+$xx --test -h x +3 $srcdir/0Ft > 1c.O 2> 1c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 1c failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1c.out $srcdir/3-0F
+  cmp 1c.O $srcdir/3-0F
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 1c"; fi ;;
-    1) $echo "Test 1c failed: files t1c.out and $srcdir/3-0F differ" 1>&2;
+    1) $echo "Test 1c failed: files 1c.O and $srcdir/3-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 1c may have failed." 1>&2;
-       $echo The command "cmp t1c.out $srcdir/3-0F" failed. 1>&2 ;
+       $echo The command "cmp 1c.O $srcdir/3-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1c.err || rm -f t1c.err
-$xx --test -h x +3 -f $srcdir/0Ft > t1d.out 2> t1d.err
+test -s 1c.E || rm -f 1c.E
+$xx --test -h x +3 -f $srcdir/0Ft > 1d.O 2> 1d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 1d failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1d.out $srcdir/3f-0F
+  cmp 1d.O $srcdir/3f-0F
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 1d"; fi ;;
-    1) $echo "Test 1d failed: files t1d.out and $srcdir/3f-0F differ" 1>&2;
+    1) $echo "Test 1d failed: files 1d.O and $srcdir/3f-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 1d may have failed." 1>&2;
-       $echo The command "cmp t1d.out $srcdir/3f-0F" failed. 1>&2 ;
+       $echo The command "cmp 1d.O $srcdir/3f-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1d.err || rm -f t1d.err
-$xx --test -h x -a -3 $srcdir/0Ft > t1e.out 2> t1e.err
+test -s 1d.E || rm -f 1d.E
+$xx --test -h x -a -3 $srcdir/0Ft > 1e.O 2> 1e.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 1e failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1e.out $srcdir/a3-0F
+  cmp 1e.O $srcdir/a3-0F
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 1e"; fi ;;
-    1) $echo "Test 1e failed: files t1e.out and $srcdir/a3-0F differ" 1>&2;
+    1) $echo "Test 1e failed: files 1e.O and $srcdir/a3-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 1e may have failed." 1>&2;
-       $echo The command "cmp t1e.out $srcdir/a3-0F" failed. 1>&2 ;
+       $echo The command "cmp 1e.O $srcdir/a3-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1e.err || rm -f t1e.err
-$xx --test -h x -a -3 -f $srcdir/0Ft > t1f.out 2> t1f.err
+test -s 1e.E || rm -f 1e.E
+$xx --test -h x -a -3 -f $srcdir/0Ft > 1f.O 2> 1f.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 1f failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1f.out $srcdir/a3f-0F
+  cmp 1f.O $srcdir/a3f-0F
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 1f"; fi ;;
-    1) $echo "Test 1f failed: files t1f.out and $srcdir/a3f-0F differ" 1>&2;
+    1) $echo "Test 1f failed: files 1f.O and $srcdir/a3f-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 1f may have failed." 1>&2;
-       $echo The command "cmp t1f.out $srcdir/a3f-0F" failed. 1>&2 ;
+       $echo The command "cmp 1f.O $srcdir/a3f-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1f.err || rm -f t1f.err
-$xx --test -h x -a -3 -f $srcdir/0Fnt > t1g.out 2> t1g.err
+test -s 1f.E || rm -f 1f.E
+$xx --test -h x -a -3 -f $srcdir/0Fnt > 1g.O 2> 1g.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 1g failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1g.out $srcdir/a3f-0F
+  cmp 1g.O $srcdir/a3f-0F
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 1g"; fi ;;
-    1) $echo "Test 1g failed: files t1g.out and $srcdir/a3f-0F differ" 1>&2;
+    1) $echo "Test 1g failed: files 1g.O and $srcdir/a3f-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 1g may have failed." 1>&2;
-       $echo The command "cmp t1g.out $srcdir/a3f-0F" failed. 1>&2 ;
+       $echo The command "cmp 1g.O $srcdir/a3f-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1g.err || rm -f t1g.err
-$xx --test -h x +3 -a -3 -f $srcdir/0Ft > t1h.out 2> t1h.err
+test -s 1g.E || rm -f 1g.E
+$xx --test -h x +3 -a -3 -f $srcdir/0Ft > 1h.O 2> 1h.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 1h failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1h.out $srcdir/3a3f-0F
+  cmp 1h.O $srcdir/3a3f-0F
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 1h"; fi ;;
-    1) $echo "Test 1h failed: files t1h.out and $srcdir/3a3f-0F differ" 1>&2;
+    1) $echo "Test 1h failed: files 1h.O and $srcdir/3a3f-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 1h may have failed." 1>&2;
-       $echo The command "cmp t1h.out $srcdir/3a3f-0F" failed. 1>&2 ;
+       $echo The command "cmp 1h.O $srcdir/3a3f-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1h.err || rm -f t1h.err
-$xx --test -h x -b -3 $srcdir/0Ft > t1i.out 2> t1i.err
+test -s 1h.E || rm -f 1h.E
+$xx --test -h x -b -3 $srcdir/0Ft > 1i.O 2> 1i.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 1i failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1i.out $srcdir/b3-0F
+  cmp 1i.O $srcdir/b3-0F
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 1i"; fi ;;
-    1) $echo "Test 1i failed: files t1i.out and $srcdir/b3-0F differ" 1>&2;
+    1) $echo "Test 1i failed: files 1i.O and $srcdir/b3-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 1i may have failed." 1>&2;
-       $echo The command "cmp t1i.out $srcdir/b3-0F" failed. 1>&2 ;
+       $echo The command "cmp 1i.O $srcdir/b3-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1i.err || rm -f t1i.err
-$xx --test -h x -b -3 -f $srcdir/0Ft > t1j.out 2> t1j.err
+test -s 1i.E || rm -f 1i.E
+$xx --test -h x -b -3 -f $srcdir/0Ft > 1j.O 2> 1j.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 1j failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1j.out $srcdir/b3f-0F
+  cmp 1j.O $srcdir/b3f-0F
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 1j"; fi ;;
-    1) $echo "Test 1j failed: files t1j.out and $srcdir/b3f-0F differ" 1>&2;
+    1) $echo "Test 1j failed: files 1j.O and $srcdir/b3f-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 1j may have failed." 1>&2;
-       $echo The command "cmp t1j.out $srcdir/b3f-0F" failed. 1>&2 ;
+       $echo The command "cmp 1j.O $srcdir/b3f-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1j.err || rm -f t1j.err
-$xx --test -h x -b -3 -f $srcdir/0Fnt > t1k.out 2> t1k.err
+test -s 1j.E || rm -f 1j.E
+$xx --test -h x -b -3 -f $srcdir/0Fnt > 1k.O 2> 1k.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 1k failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1k.out $srcdir/b3f-0F
+  cmp 1k.O $srcdir/b3f-0F
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 1k"; fi ;;
-    1) $echo "Test 1k failed: files t1k.out and $srcdir/b3f-0F differ" 1>&2;
+    1) $echo "Test 1k failed: files 1k.O and $srcdir/b3f-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 1k may have failed." 1>&2;
-       $echo The command "cmp t1k.out $srcdir/b3f-0F" failed. 1>&2 ;
+       $echo The command "cmp 1k.O $srcdir/b3f-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1k.err || rm -f t1k.err
-$xx --test -h x +3 -b -3 -f $srcdir/0Ft > t1l.out 2> t1l.err
+test -s 1k.E || rm -f 1k.E
+$xx --test -h x +3 -b -3 -f $srcdir/0Ft > 1l.O 2> 1l.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 1l failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1l.out $srcdir/3b3f-0F
+  cmp 1l.O $srcdir/3b3f-0F
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 1l"; fi ;;
-    1) $echo "Test 1l failed: files t1l.out and $srcdir/3b3f-0F differ" 1>&2;
+    1) $echo "Test 1l failed: files 1l.O and $srcdir/3b3f-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 1l may have failed." 1>&2;
-       $echo The command "cmp t1l.out $srcdir/3b3f-0F" failed. 1>&2 ;
+       $echo The command "cmp 1l.O $srcdir/3b3f-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1l.err || rm -f t1l.err
-$xx --test -h x  $srcdir/0FFt > t2a.out 2> t2a.err
+test -s 1l.E || rm -f 1l.E
+$xx --test -h x $srcdir/0FFt > 2a.O 2> 2a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 2a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t2a.out $srcdir/0FF
+  cmp 2a.O $srcdir/0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 2a"; fi ;;
-    1) $echo "Test 2a failed: files t2a.out and $srcdir/0FF differ" 1>&2;
+    1) $echo "Test 2a failed: files 2a.O and $srcdir/0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 2a may have failed." 1>&2;
-       $echo The command "cmp t2a.out $srcdir/0FF" failed. 1>&2 ;
+       $echo The command "cmp 2a.O $srcdir/0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t2a.err || rm -f t2a.err
-$xx --test -h x  $srcdir/0FnFnt > t2b.out 2> t2b.err
+test -s 2a.E || rm -f 2a.E
+$xx --test -h x $srcdir/0FnFnt > 2b.O 2> 2b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 2b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t2b.out $srcdir/0FF
+  cmp 2b.O $srcdir/0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 2b"; fi ;;
-    1) $echo "Test 2b failed: files t2b.out and $srcdir/0FF differ" 1>&2;
+    1) $echo "Test 2b failed: files 2b.O and $srcdir/0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 2b may have failed." 1>&2;
-       $echo The command "cmp t2b.out $srcdir/0FF" failed. 1>&2 ;
+       $echo The command "cmp 2b.O $srcdir/0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t2b.err || rm -f t2b.err
-$xx --test -h x -a -3 -f $srcdir/0FFt > t2c.out 2> t2c.err
+test -s 2b.E || rm -f 2b.E
+$xx --test -h x -a -3 -f $srcdir/0FFt > 2c.O 2> 2c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 2c failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t2c.out $srcdir/a3f-0FF
+  cmp 2c.O $srcdir/a3f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 2c"; fi ;;
-    1) $echo "Test 2c failed: files t2c.out and $srcdir/a3f-0FF differ" 1>&2;
+    1) $echo "Test 2c failed: files 2c.O and $srcdir/a3f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 2c may have failed." 1>&2;
-       $echo The command "cmp t2c.out $srcdir/a3f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 2c.O $srcdir/a3f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t2c.err || rm -f t2c.err
-$xx --test -h x -a -3 -f $srcdir/0FFnt > t2d.out 2> t2d.err
+test -s 2c.E || rm -f 2c.E
+$xx --test -h x -a -3 -f $srcdir/0FFnt > 2d.O 2> 2d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 2d failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t2d.out $srcdir/a3f-0FF
+  cmp 2d.O $srcdir/a3f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 2d"; fi ;;
-    1) $echo "Test 2d failed: files t2d.out and $srcdir/a3f-0FF differ" 1>&2;
+    1) $echo "Test 2d failed: files 2d.O and $srcdir/a3f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 2d may have failed." 1>&2;
-       $echo The command "cmp t2d.out $srcdir/a3f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 2d.O $srcdir/a3f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t2d.err || rm -f t2d.err
-$xx --test -h x -b -3 -f $srcdir/0FFt > t2e.out 2> t2e.err
+test -s 2d.E || rm -f 2d.E
+$xx --test -h x -b -3 -f $srcdir/0FFt > 2e.O 2> 2e.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 2e failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t2e.out $srcdir/b3f-0FF
+  cmp 2e.O $srcdir/b3f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 2e"; fi ;;
-    1) $echo "Test 2e failed: files t2e.out and $srcdir/b3f-0FF differ" 1>&2;
+    1) $echo "Test 2e failed: files 2e.O and $srcdir/b3f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 2e may have failed." 1>&2;
-       $echo The command "cmp t2e.out $srcdir/b3f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 2e.O $srcdir/b3f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t2e.err || rm -f t2e.err
-$xx --test -h x -b -3 -f $srcdir/0FFnt > t2f.out 2> t2f.err
+test -s 2e.E || rm -f 2e.E
+$xx --test -h x -b -3 -f $srcdir/0FFnt > 2f.O 2> 2f.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 2f failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t2f.out $srcdir/b3f-0FF
+  cmp 2f.O $srcdir/b3f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 2f"; fi ;;
-    1) $echo "Test 2f failed: files t2f.out and $srcdir/b3f-0FF differ" 1>&2;
+    1) $echo "Test 2f failed: files 2f.O and $srcdir/b3f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 2f may have failed." 1>&2;
-       $echo The command "cmp t2f.out $srcdir/b3f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 2f.O $srcdir/b3f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t2f.err || rm -f t2f.err
-$xx --test -h x -b -3 -f $srcdir/0FnFt > t2g.out 2> t2g.err
+test -s 2f.E || rm -f 2f.E
+$xx --test -h x -b -3 -f $srcdir/0FnFt > 2g.O 2> 2g.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 2g failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t2g.out $srcdir/b3f-0FF
+  cmp 2g.O $srcdir/b3f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 2g"; fi ;;
-    1) $echo "Test 2g failed: files t2g.out and $srcdir/b3f-0FF differ" 1>&2;
+    1) $echo "Test 2g failed: files 2g.O and $srcdir/b3f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 2g may have failed." 1>&2;
-       $echo The command "cmp t2g.out $srcdir/b3f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 2g.O $srcdir/b3f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t2g.err || rm -f t2g.err
-$xx --test -h x -b -3 -f $srcdir/0FnFnt > t2h.out 2> t2h.err
+test -s 2g.E || rm -f 2g.E
+$xx --test -h x -b -3 -f $srcdir/0FnFnt > 2h.O 2> 2h.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 2h failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t2h.out $srcdir/b3f-0FF
+  cmp 2h.O $srcdir/b3f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 2h"; fi ;;
-    1) $echo "Test 2h failed: files t2h.out and $srcdir/b3f-0FF differ" 1>&2;
+    1) $echo "Test 2h failed: files 2h.O and $srcdir/b3f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 2h may have failed." 1>&2;
-       $echo The command "cmp t2h.out $srcdir/b3f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 2h.O $srcdir/b3f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t2h.err || rm -f t2h.err
-$xx --test -h x +3 -b -3 -f $srcdir/0FFt > t2i.out 2> t2i.err
+test -s 2h.E || rm -f 2h.E
+$xx --test -h x +3 -b -3 -f $srcdir/0FFt > 2i.O 2> 2i.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 2i failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t2i.out $srcdir/3b3f-0FF
+  cmp 2i.O $srcdir/3b3f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 2i"; fi ;;
-    1) $echo "Test 2i failed: files t2i.out and $srcdir/3b3f-0FF differ" 1>&2;
+    1) $echo "Test 2i failed: files 2i.O and $srcdir/3b3f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 2i may have failed." 1>&2;
-       $echo The command "cmp t2i.out $srcdir/3b3f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 2i.O $srcdir/3b3f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t2i.err || rm -f t2i.err
-$xx --test -h x +3 -b -3 -f $srcdir/0FFnt > t2j.out 2> t2j.err
+test -s 2i.E || rm -f 2i.E
+$xx --test -h x +3 -b -3 -f $srcdir/0FFnt > 2j.O 2> 2j.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 2j failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t2j.out $srcdir/3b3f-0FF
+  cmp 2j.O $srcdir/3b3f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 2j"; fi ;;
-    1) $echo "Test 2j failed: files t2j.out and $srcdir/3b3f-0FF differ" 1>&2;
+    1) $echo "Test 2j failed: files 2j.O and $srcdir/3b3f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 2j may have failed." 1>&2;
-       $echo The command "cmp t2j.out $srcdir/3b3f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 2j.O $srcdir/3b3f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t2j.err || rm -f t2j.err
-$xx --test -h x  $srcdir/FFn > t3a.out 2> t3a.err
+test -s 2j.E || rm -f 2j.E
+$xx --test -h x $srcdir/FFn > 3a.O 2> 3a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3a.out $srcdir/FF
+  cmp 3a.O $srcdir/FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3a"; fi ;;
-    1) $echo "Test 3a failed: files t3a.out and $srcdir/FF differ" 1>&2;
+    1) $echo "Test 3a failed: files 3a.O and $srcdir/FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3a may have failed." 1>&2;
-       $echo The command "cmp t3a.out $srcdir/FF" failed. 1>&2 ;
+       $echo The command "cmp 3a.O $srcdir/FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3a.err || rm -f t3a.err
-$xx --test -h x  $srcdir/FnFn > t3b.out 2> t3b.err
+test -s 3a.E || rm -f 3a.E
+$xx --test -h x $srcdir/FnFn > 3b.O 2> 3b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3b.out $srcdir/FF
+  cmp 3b.O $srcdir/FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3b"; fi ;;
-    1) $echo "Test 3b failed: files t3b.out and $srcdir/FF differ" 1>&2;
+    1) $echo "Test 3b failed: files 3b.O and $srcdir/FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3b may have failed." 1>&2;
-       $echo The command "cmp t3b.out $srcdir/FF" failed. 1>&2 ;
+       $echo The command "cmp 3b.O $srcdir/FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3b.err || rm -f t3b.err
-$xx --test -h x +3 $srcdir/FFn > t3c.out 2> t3c.err
+test -s 3b.E || rm -f 3b.E
+$xx --test -h x +3 $srcdir/FFn > 3c.O 2> 3c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3c failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3c.out $srcdir/3-FF
+  cmp 3c.O $srcdir/3-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3c"; fi ;;
-    1) $echo "Test 3c failed: files t3c.out and $srcdir/3-FF differ" 1>&2;
+    1) $echo "Test 3c failed: files 3c.O and $srcdir/3-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3c may have failed." 1>&2;
-       $echo The command "cmp t3c.out $srcdir/3-FF" failed. 1>&2 ;
+       $echo The command "cmp 3c.O $srcdir/3-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3c.err || rm -f t3c.err
-$xx --test -h x +3 -f $srcdir/FFn > t3d.out 2> t3d.err
+test -s 3c.E || rm -f 3c.E
+$xx --test -h x +3 -f $srcdir/FFn > 3d.O 2> 3d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3d failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3d.out $srcdir/3f-FF
+  cmp 3d.O $srcdir/3f-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3d"; fi ;;
-    1) $echo "Test 3d failed: files t3d.out and $srcdir/3f-FF differ" 1>&2;
+    1) $echo "Test 3d failed: files 3d.O and $srcdir/3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3d may have failed." 1>&2;
-       $echo The command "cmp t3d.out $srcdir/3f-FF" failed. 1>&2 ;
+       $echo The command "cmp 3d.O $srcdir/3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3d.err || rm -f t3d.err
-$xx --test -h x -a -3 -f $srcdir/FFn > t3e.out 2> t3e.err
+test -s 3d.E || rm -f 3d.E
+$xx --test -h x -a -3 -f $srcdir/FFn > 3e.O 2> 3e.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3e failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3e.out $srcdir/a3f-FF
+  cmp 3e.O $srcdir/a3f-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3e"; fi ;;
-    1) $echo "Test 3e failed: files t3e.out and $srcdir/a3f-FF differ" 1>&2;
+    1) $echo "Test 3e failed: files 3e.O and $srcdir/a3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3e may have failed." 1>&2;
-       $echo The command "cmp t3e.out $srcdir/a3f-FF" failed. 1>&2 ;
+       $echo The command "cmp 3e.O $srcdir/a3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3e.err || rm -f t3e.err
-$xx --test -h x -a -3 -f $srcdir/FFtn > t3f.out 2> t3f.err
+test -s 3e.E || rm -f 3e.E
+$xx --test -h x -a -3 -f $srcdir/FFtn > 3f.O 2> 3f.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3f failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3f.out $srcdir/a3f-FF
+  cmp 3f.O $srcdir/a3f-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3f"; fi ;;
-    1) $echo "Test 3f failed: files t3f.out and $srcdir/a3f-FF differ" 1>&2;
+    1) $echo "Test 3f failed: files 3f.O and $srcdir/a3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3f may have failed." 1>&2;
-       $echo The command "cmp t3f.out $srcdir/a3f-FF" failed. 1>&2 ;
+       $echo The command "cmp 3f.O $srcdir/a3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3f.err || rm -f t3f.err
-$xx --test -h x -b -3 -f $srcdir/FFn > t3g.out 2> t3g.err
+test -s 3f.E || rm -f 3f.E
+$xx --test -h x -b -3 -f $srcdir/FFn > 3g.O 2> 3g.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3g failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3g.out $srcdir/b3f-FF
+  cmp 3g.O $srcdir/b3f-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3g"; fi ;;
-    1) $echo "Test 3g failed: files t3g.out and $srcdir/b3f-FF differ" 1>&2;
+    1) $echo "Test 3g failed: files 3g.O and $srcdir/b3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3g may have failed." 1>&2;
-       $echo The command "cmp t3g.out $srcdir/b3f-FF" failed. 1>&2 ;
+       $echo The command "cmp 3g.O $srcdir/b3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3g.err || rm -f t3g.err
-$xx --test -h x -b -3 -f $srcdir/FFtn > t3h.out 2> t3h.err
+test -s 3g.E || rm -f 3g.E
+$xx --test -h x -b -3 -f $srcdir/FFtn > 3h.O 2> 3h.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3h failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3h.out $srcdir/b3f-FF
+  cmp 3h.O $srcdir/b3f-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3h"; fi ;;
-    1) $echo "Test 3h failed: files t3h.out and $srcdir/b3f-FF differ" 1>&2;
+    1) $echo "Test 3h failed: files 3h.O and $srcdir/b3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3h may have failed." 1>&2;
-       $echo The command "cmp t3h.out $srcdir/b3f-FF" failed. 1>&2 ;
+       $echo The command "cmp 3h.O $srcdir/b3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3h.err || rm -f t3h.err
-$xx --test -h x -b -3 -f $srcdir/FnFn > t3i.out 2> t3i.err
+test -s 3h.E || rm -f 3h.E
+$xx --test -h x -b -3 -f $srcdir/FnFn > 3i.O 2> 3i.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3i failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3i.out $srcdir/b3f-FF
+  cmp 3i.O $srcdir/b3f-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3i"; fi ;;
-    1) $echo "Test 3i failed: files t3i.out and $srcdir/b3f-FF differ" 1>&2;
+    1) $echo "Test 3i failed: files 3i.O and $srcdir/b3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3i may have failed." 1>&2;
-       $echo The command "cmp t3i.out $srcdir/b3f-FF" failed. 1>&2 ;
+       $echo The command "cmp 3i.O $srcdir/b3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3i.err || rm -f t3i.err
-$xx --test -h x -b -3 -f $srcdir/tFFn > t3j.out 2> t3j.err
+test -s 3i.E || rm -f 3i.E
+$xx --test -h x -b -3 -f $srcdir/tFFn > 3j.O 2> 3j.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3j failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3j.out $srcdir/b3f-FF
+  cmp 3j.O $srcdir/b3f-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3j"; fi ;;
-    1) $echo "Test 3j failed: files t3j.out and $srcdir/b3f-FF differ" 1>&2;
+    1) $echo "Test 3j failed: files 3j.O and $srcdir/b3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3j may have failed." 1>&2;
-       $echo The command "cmp t3j.out $srcdir/b3f-FF" failed. 1>&2 ;
+       $echo The command "cmp 3j.O $srcdir/b3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3j.err || rm -f t3j.err
-$xx --test -h x -b -3 -f $srcdir/tFnFt > t3k.out 2> t3k.err
+test -s 3j.E || rm -f 3j.E
+$xx --test -h x -b -3 -f $srcdir/tFnFt > 3k.O 2> 3k.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3k failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3k.out $srcdir/b3f-FF
+  cmp 3k.O $srcdir/b3f-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3k"; fi ;;
-    1) $echo "Test 3k failed: files t3k.out and $srcdir/b3f-FF differ" 1>&2;
+    1) $echo "Test 3k failed: files 3k.O and $srcdir/b3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3k may have failed." 1>&2;
-       $echo The command "cmp t3k.out $srcdir/b3f-FF" failed. 1>&2 ;
+       $echo The command "cmp 3k.O $srcdir/b3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3k.err || rm -f t3k.err
-$xx --test -h x +3 -b -3 -f $srcdir/FFn > t3l.out 2> t3l.err
+test -s 3k.E || rm -f 3k.E
+$xx --test -h x +3 -b -3 -f $srcdir/FFn > 3l.O 2> 3l.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3l failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3l.out $srcdir/3b3f-FF
+  cmp 3l.O $srcdir/3b3f-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3l"; fi ;;
-    1) $echo "Test 3l failed: files t3l.out and $srcdir/3b3f-FF differ" 1>&2;
+    1) $echo "Test 3l failed: files 3l.O and $srcdir/3b3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3l may have failed." 1>&2;
-       $echo The command "cmp t3l.out $srcdir/3b3f-FF" failed. 1>&2 ;
+       $echo The command "cmp 3l.O $srcdir/3b3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3l.err || rm -f t3l.err
-$xx --test -h x +3 -b -3 -f $srcdir/FFtn > t3m.out 2> t3m.err
+test -s 3l.E || rm -f 3l.E
+$xx --test -h x +3 -b -3 -f $srcdir/FFtn > 3m.O 2> 3m.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3m failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3m.out $srcdir/3b3f-FF
+  cmp 3m.O $srcdir/3b3f-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3m"; fi ;;
-    1) $echo "Test 3m failed: files t3m.out and $srcdir/3b3f-FF differ" 1>&2;
+    1) $echo "Test 3m failed: files 3m.O and $srcdir/3b3f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3m may have failed." 1>&2;
-       $echo The command "cmp t3m.out $srcdir/3b3f-FF" failed. 1>&2 ;
+       $echo The command "cmp 3m.O $srcdir/3b3f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3m.err || rm -f t3m.err
-$xx --test -h x -l 24 $srcdir/FFn > t3la.out 2> t3la.err
+test -s 3m.E || rm -f 3m.E
+$xx --test -h x -l 24 $srcdir/FFn > 3la.O 2> 3la.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3la failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3la.out $srcdir/l24-FF
+  cmp 3la.O $srcdir/l24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3la"; fi ;;
-    1) $echo "Test 3la failed: files t3la.out and $srcdir/l24-FF differ" 1>&2;
+    1) $echo "Test 3la failed: files 3la.O and $srcdir/l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3la may have failed." 1>&2;
-       $echo The command "cmp t3la.out $srcdir/l24-FF" failed. 1>&2 ;
+       $echo The command "cmp 3la.O $srcdir/l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3la.err || rm -f t3la.err
-$xx --test -h x -l 24 $srcdir/FFtn > t3lb.out 2> t3lb.err
+test -s 3la.E || rm -f 3la.E
+$xx --test -h x -l 24 $srcdir/FFtn > 3lb.O 2> 3lb.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3lb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3lb.out $srcdir/l24-FF
+  cmp 3lb.O $srcdir/l24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3lb"; fi ;;
-    1) $echo "Test 3lb failed: files t3lb.out and $srcdir/l24-FF differ" 1>&2;
+    1) $echo "Test 3lb failed: files 3lb.O and $srcdir/l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3lb may have failed." 1>&2;
-       $echo The command "cmp t3lb.out $srcdir/l24-FF" failed. 1>&2 ;
+       $echo The command "cmp 3lb.O $srcdir/l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3lb.err || rm -f t3lb.err
-$xx --test -h x -l 24 $srcdir/FnFn > t3lc.out 2> t3lc.err
+test -s 3lb.E || rm -f 3lb.E
+$xx --test -h x -l 24 $srcdir/FnFn > 3lc.O 2> 3lc.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3lc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3lc.out $srcdir/l24-FF
+  cmp 3lc.O $srcdir/l24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3lc"; fi ;;
-    1) $echo "Test 3lc failed: files t3lc.out and $srcdir/l24-FF differ" 1>&2;
+    1) $echo "Test 3lc failed: files 3lc.O and $srcdir/l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3lc may have failed." 1>&2;
-       $echo The command "cmp t3lc.out $srcdir/l24-FF" failed. 1>&2 ;
+       $echo The command "cmp 3lc.O $srcdir/l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3lc.err || rm -f t3lc.err
-$xx --test -h x -l 24 $srcdir/tFFn > t3ld.out 2> t3ld.err
+test -s 3lc.E || rm -f 3lc.E
+$xx --test -h x -l 24 $srcdir/tFFn > 3ld.O 2> 3ld.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3ld failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3ld.out $srcdir/l24-FF
+  cmp 3ld.O $srcdir/l24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3ld"; fi ;;
-    1) $echo "Test 3ld failed: files t3ld.out and $srcdir/l24-FF differ" 1>&2;
+    1) $echo "Test 3ld failed: files 3ld.O and $srcdir/l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3ld may have failed." 1>&2;
-       $echo The command "cmp t3ld.out $srcdir/l24-FF" failed. 1>&2 ;
+       $echo The command "cmp 3ld.O $srcdir/l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3ld.err || rm -f t3ld.err
-$xx --test -h x -l 24 $srcdir/tFnFt > t3le.out 2> t3le.err
+test -s 3ld.E || rm -f 3ld.E
+$xx --test -h x -l 24 $srcdir/tFnFt > 3le.O 2> 3le.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3le failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3le.out $srcdir/l24-FF
+  cmp 3le.O $srcdir/l24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3le"; fi ;;
-    1) $echo "Test 3le failed: files t3le.out and $srcdir/l24-FF differ" 1>&2;
+    1) $echo "Test 3le failed: files 3le.O and $srcdir/l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3le may have failed." 1>&2;
-       $echo The command "cmp t3le.out $srcdir/l24-FF" failed. 1>&2 ;
+       $echo The command "cmp 3le.O $srcdir/l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3le.err || rm -f t3le.err
-$xx --test -h x -l 24 $srcdir/tFFt > t3lf.out 2> t3lf.err
+test -s 3le.E || rm -f 3le.E
+$xx --test -h x -l 24 $srcdir/tFFt > 3lf.O 2> 3lf.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3lf failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3lf.out $srcdir/l24-FF
+  cmp 3lf.O $srcdir/l24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3lf"; fi ;;
-    1) $echo "Test 3lf failed: files t3lf.out and $srcdir/l24-FF differ" 1>&2;
+    1) $echo "Test 3lf failed: files 3lf.O and $srcdir/l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3lf may have failed." 1>&2;
-       $echo The command "cmp t3lf.out $srcdir/l24-FF" failed. 1>&2 ;
+       $echo The command "cmp 3lf.O $srcdir/l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3lf.err || rm -f t3lf.err
-$xx --test -h x -a -2 -l 17 $srcdir/FFn > t3aa.out 2> t3aa.err
+test -s 3lf.E || rm -f 3lf.E
+$xx --test -h x -a -2 -l 17 $srcdir/FFn > 3aa.O 2> 3aa.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3aa failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3aa.out $srcdir/a2l17-FF
+  cmp 3aa.O $srcdir/a2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3aa"; fi ;;
-    1) $echo "Test 3aa failed: files t3aa.out and $srcdir/a2l17-FF differ" 1>&2;
+    1) $echo "Test 3aa failed: files 3aa.O and $srcdir/a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3aa may have failed." 1>&2;
-       $echo The command "cmp t3aa.out $srcdir/a2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3aa.O $srcdir/a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3aa.err || rm -f t3aa.err
-$xx --test -h x -a -2 -l 17 $srcdir/FFtn > t3ab.out 2> t3ab.err
+test -s 3aa.E || rm -f 3aa.E
+$xx --test -h x -a -2 -l 17 $srcdir/FFtn > 3ab.O 2> 3ab.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3ab failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3ab.out $srcdir/a2l17-FF
+  cmp 3ab.O $srcdir/a2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3ab"; fi ;;
-    1) $echo "Test 3ab failed: files t3ab.out and $srcdir/a2l17-FF differ" 1>&2;
+    1) $echo "Test 3ab failed: files 3ab.O and $srcdir/a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3ab may have failed." 1>&2;
-       $echo The command "cmp t3ab.out $srcdir/a2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3ab.O $srcdir/a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3ab.err || rm -f t3ab.err
-$xx --test -h x -a -2 -l 17 $srcdir/FnFn > t3ac.out 2> t3ac.err
+test -s 3ab.E || rm -f 3ab.E
+$xx --test -h x -a -2 -l 17 $srcdir/FnFn > 3ac.O 2> 3ac.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3ac failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3ac.out $srcdir/a2l17-FF
+  cmp 3ac.O $srcdir/a2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3ac"; fi ;;
-    1) $echo "Test 3ac failed: files t3ac.out and $srcdir/a2l17-FF differ" 1>&2;
+    1) $echo "Test 3ac failed: files 3ac.O and $srcdir/a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3ac may have failed." 1>&2;
-       $echo The command "cmp t3ac.out $srcdir/a2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3ac.O $srcdir/a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3ac.err || rm -f t3ac.err
-$xx --test -h x -a -2 -l 17 $srcdir/tFFn > t3ad.out 2> t3ad.err
+test -s 3ac.E || rm -f 3ac.E
+$xx --test -h x -a -2 -l 17 $srcdir/tFFn > 3ad.O 2> 3ad.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3ad failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3ad.out $srcdir/a2l17-FF
+  cmp 3ad.O $srcdir/a2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3ad"; fi ;;
-    1) $echo "Test 3ad failed: files t3ad.out and $srcdir/a2l17-FF differ" 1>&2;
+    1) $echo "Test 3ad failed: files 3ad.O and $srcdir/a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3ad may have failed." 1>&2;
-       $echo The command "cmp t3ad.out $srcdir/a2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3ad.O $srcdir/a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3ad.err || rm -f t3ad.err
-$xx --test -h x -a -2 -l 17 $srcdir/tFnFt > t3ae.out 2> t3ae.err
+test -s 3ad.E || rm -f 3ad.E
+$xx --test -h x -a -2 -l 17 $srcdir/tFnFt > 3ae.O 2> 3ae.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3ae failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3ae.out $srcdir/a2l17-FF
+  cmp 3ae.O $srcdir/a2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3ae"; fi ;;
-    1) $echo "Test 3ae failed: files t3ae.out and $srcdir/a2l17-FF differ" 1>&2;
+    1) $echo "Test 3ae failed: files 3ae.O and $srcdir/a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3ae may have failed." 1>&2;
-       $echo The command "cmp t3ae.out $srcdir/a2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3ae.O $srcdir/a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3ae.err || rm -f t3ae.err
-$xx --test -h x -a -2 -l 17 $srcdir/tFFt > t3af.out 2> t3af.err
+test -s 3ae.E || rm -f 3ae.E
+$xx --test -h x -a -2 -l 17 $srcdir/tFFt > 3af.O 2> 3af.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3af failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3af.out $srcdir/a2l17-FF
+  cmp 3af.O $srcdir/a2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3af"; fi ;;
-    1) $echo "Test 3af failed: files t3af.out and $srcdir/a2l17-FF differ" 1>&2;
+    1) $echo "Test 3af failed: files 3af.O and $srcdir/a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3af may have failed." 1>&2;
-       $echo The command "cmp t3af.out $srcdir/a2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3af.O $srcdir/a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3af.err || rm -f t3af.err
-$xx --test -h x -a -2 -l 15 $srcdir/FFn > t3ag.out 2> t3ag.err
+test -s 3af.E || rm -f 3af.E
+$xx --test -h x -a -2 -l 15 $srcdir/FFn > 3ag.O 2> 3ag.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3ag failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3ag.out $srcdir/a2l15-FF
+  cmp 3ag.O $srcdir/a2l15-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3ag"; fi ;;
-    1) $echo "Test 3ag failed: files t3ag.out and $srcdir/a2l15-FF differ" 1>&2;
+    1) $echo "Test 3ag failed: files 3ag.O and $srcdir/a2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3ag may have failed." 1>&2;
-       $echo The command "cmp t3ag.out $srcdir/a2l15-FF" failed. 1>&2 ;
+       $echo The command "cmp 3ag.O $srcdir/a2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3ag.err || rm -f t3ag.err
-$xx --test -h x -a -2 -l 15 $srcdir/FFtn > t3ah.out 2> t3ah.err
+test -s 3ag.E || rm -f 3ag.E
+$xx --test -h x -a -2 -l 15 $srcdir/FFtn > 3ah.O 2> 3ah.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3ah failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3ah.out $srcdir/a2l15-FF
+  cmp 3ah.O $srcdir/a2l15-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3ah"; fi ;;
-    1) $echo "Test 3ah failed: files t3ah.out and $srcdir/a2l15-FF differ" 1>&2;
+    1) $echo "Test 3ah failed: files 3ah.O and $srcdir/a2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3ah may have failed." 1>&2;
-       $echo The command "cmp t3ah.out $srcdir/a2l15-FF" failed. 1>&2 ;
+       $echo The command "cmp 3ah.O $srcdir/a2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3ah.err || rm -f t3ah.err
-$xx --test -h x -a -2 -l 15 $srcdir/FnFn > t3ai.out 2> t3ai.err
+test -s 3ah.E || rm -f 3ah.E
+$xx --test -h x -a -2 -l 15 $srcdir/FnFn > 3ai.O 2> 3ai.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3ai failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3ai.out $srcdir/a2l15-FF
+  cmp 3ai.O $srcdir/a2l15-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3ai"; fi ;;
-    1) $echo "Test 3ai failed: files t3ai.out and $srcdir/a2l15-FF differ" 1>&2;
+    1) $echo "Test 3ai failed: files 3ai.O and $srcdir/a2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3ai may have failed." 1>&2;
-       $echo The command "cmp t3ai.out $srcdir/a2l15-FF" failed. 1>&2 ;
+       $echo The command "cmp 3ai.O $srcdir/a2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3ai.err || rm -f t3ai.err
-$xx --test -h x -a -2 -l 15 $srcdir/tFFn > t3aj.out 2> t3aj.err
+test -s 3ai.E || rm -f 3ai.E
+$xx --test -h x -a -2 -l 15 $srcdir/tFFn > 3aj.O 2> 3aj.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3aj failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3aj.out $srcdir/a2l15-FF
+  cmp 3aj.O $srcdir/a2l15-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3aj"; fi ;;
-    1) $echo "Test 3aj failed: files t3aj.out and $srcdir/a2l15-FF differ" 1>&2;
+    1) $echo "Test 3aj failed: files 3aj.O and $srcdir/a2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3aj may have failed." 1>&2;
-       $echo The command "cmp t3aj.out $srcdir/a2l15-FF" failed. 1>&2 ;
+       $echo The command "cmp 3aj.O $srcdir/a2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3aj.err || rm -f t3aj.err
-$xx --test -h x -a -2 -l 15 $srcdir/tFnFt > t3ak.out 2> t3ak.err
+test -s 3aj.E || rm -f 3aj.E
+$xx --test -h x -a -2 -l 15 $srcdir/tFnFt > 3ak.O 2> 3ak.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3ak failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3ak.out $srcdir/a2l15-FF
+  cmp 3ak.O $srcdir/a2l15-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3ak"; fi ;;
-    1) $echo "Test 3ak failed: files t3ak.out and $srcdir/a2l15-FF differ" 1>&2;
+    1) $echo "Test 3ak failed: files 3ak.O and $srcdir/a2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3ak may have failed." 1>&2;
-       $echo The command "cmp t3ak.out $srcdir/a2l15-FF" failed. 1>&2 ;
+       $echo The command "cmp 3ak.O $srcdir/a2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3ak.err || rm -f t3ak.err
-$xx --test -h x -b -2 -l 17 $srcdir/FFn > t3ba.out 2> t3ba.err
+test -s 3ak.E || rm -f 3ak.E
+$xx --test -h x -b -2 -l 17 $srcdir/FFn > 3ba.O 2> 3ba.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3ba failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3ba.out $srcdir/b2l17-FF
+  cmp 3ba.O $srcdir/b2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3ba"; fi ;;
-    1) $echo "Test 3ba failed: files t3ba.out and $srcdir/b2l17-FF differ" 1>&2;
+    1) $echo "Test 3ba failed: files 3ba.O and $srcdir/b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3ba may have failed." 1>&2;
-       $echo The command "cmp t3ba.out $srcdir/b2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3ba.O $srcdir/b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3ba.err || rm -f t3ba.err
-$xx --test -h x -b -2 -l 17 $srcdir/FFtn > t3bb.out 2> t3bb.err
+test -s 3ba.E || rm -f 3ba.E
+$xx --test -h x -b -2 -l 17 $srcdir/FFtn > 3bb.O 2> 3bb.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3bb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3bb.out $srcdir/b2l17-FF
+  cmp 3bb.O $srcdir/b2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3bb"; fi ;;
-    1) $echo "Test 3bb failed: files t3bb.out and $srcdir/b2l17-FF differ" 1>&2;
+    1) $echo "Test 3bb failed: files 3bb.O and $srcdir/b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3bb may have failed." 1>&2;
-       $echo The command "cmp t3bb.out $srcdir/b2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3bb.O $srcdir/b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3bb.err || rm -f t3bb.err
-$xx --test -h x -b -2 -l 17 $srcdir/FnFn > t3bc.out 2> t3bc.err
+test -s 3bb.E || rm -f 3bb.E
+$xx --test -h x -b -2 -l 17 $srcdir/FnFn > 3bc.O 2> 3bc.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3bc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3bc.out $srcdir/b2l17-FF
+  cmp 3bc.O $srcdir/b2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3bc"; fi ;;
-    1) $echo "Test 3bc failed: files t3bc.out and $srcdir/b2l17-FF differ" 1>&2;
+    1) $echo "Test 3bc failed: files 3bc.O and $srcdir/b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3bc may have failed." 1>&2;
-       $echo The command "cmp t3bc.out $srcdir/b2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3bc.O $srcdir/b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3bc.err || rm -f t3bc.err
-$xx --test -h x -b -2 -l 17 $srcdir/tFFn > t3bd.out 2> t3bd.err
+test -s 3bc.E || rm -f 3bc.E
+$xx --test -h x -b -2 -l 17 $srcdir/tFFn > 3bd.O 2> 3bd.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3bd failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3bd.out $srcdir/b2l17-FF
+  cmp 3bd.O $srcdir/b2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3bd"; fi ;;
-    1) $echo "Test 3bd failed: files t3bd.out and $srcdir/b2l17-FF differ" 1>&2;
+    1) $echo "Test 3bd failed: files 3bd.O and $srcdir/b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3bd may have failed." 1>&2;
-       $echo The command "cmp t3bd.out $srcdir/b2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3bd.O $srcdir/b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3bd.err || rm -f t3bd.err
-$xx --test -h x -b -2 -l 17 $srcdir/tFnFt > t3be.out 2> t3be.err
+test -s 3bd.E || rm -f 3bd.E
+$xx --test -h x -b -2 -l 17 $srcdir/tFnFt > 3be.O 2> 3be.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3be failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3be.out $srcdir/b2l17-FF
+  cmp 3be.O $srcdir/b2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3be"; fi ;;
-    1) $echo "Test 3be failed: files t3be.out and $srcdir/b2l17-FF differ" 1>&2;
+    1) $echo "Test 3be failed: files 3be.O and $srcdir/b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3be may have failed." 1>&2;
-       $echo The command "cmp t3be.out $srcdir/b2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3be.O $srcdir/b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3be.err || rm -f t3be.err
-$xx --test -h x -b -2 -l 17 $srcdir/tFFt > t3bf.out 2> t3bf.err
+test -s 3be.E || rm -f 3be.E
+$xx --test -h x -b -2 -l 17 $srcdir/tFFt > 3bf.O 2> 3bf.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3bf failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3bf.out $srcdir/b2l17-FF
+  cmp 3bf.O $srcdir/b2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3bf"; fi ;;
-    1) $echo "Test 3bf failed: files t3bf.out and $srcdir/b2l17-FF differ" 1>&2;
+    1) $echo "Test 3bf failed: files 3bf.O and $srcdir/b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3bf may have failed." 1>&2;
-       $echo The command "cmp t3bf.out $srcdir/b2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3bf.O $srcdir/b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3bf.err || rm -f t3bf.err
-$xx --test -h x -b -2 -l 15 $srcdir/FFn > t3bg.out 2> t3bg.err
+test -s 3bf.E || rm -f 3bf.E
+$xx --test -h x -b -2 -l 15 $srcdir/FFn > 3bg.O 2> 3bg.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3bg failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3bg.out $srcdir/b2l15-FF
+  cmp 3bg.O $srcdir/b2l15-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3bg"; fi ;;
-    1) $echo "Test 3bg failed: files t3bg.out and $srcdir/b2l15-FF differ" 1>&2;
+    1) $echo "Test 3bg failed: files 3bg.O and $srcdir/b2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3bg may have failed." 1>&2;
-       $echo The command "cmp t3bg.out $srcdir/b2l15-FF" failed. 1>&2 ;
+       $echo The command "cmp 3bg.O $srcdir/b2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3bg.err || rm -f t3bg.err
-$xx --test -h x -b -2 -l 15 $srcdir/FFtn > t3bh.out 2> t3bh.err
+test -s 3bg.E || rm -f 3bg.E
+$xx --test -h x -b -2 -l 15 $srcdir/FFtn > 3bh.O 2> 3bh.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3bh failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3bh.out $srcdir/b2l15-FF
+  cmp 3bh.O $srcdir/b2l15-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3bh"; fi ;;
-    1) $echo "Test 3bh failed: files t3bh.out and $srcdir/b2l15-FF differ" 1>&2;
+    1) $echo "Test 3bh failed: files 3bh.O and $srcdir/b2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3bh may have failed." 1>&2;
-       $echo The command "cmp t3bh.out $srcdir/b2l15-FF" failed. 1>&2 ;
+       $echo The command "cmp 3bh.O $srcdir/b2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3bh.err || rm -f t3bh.err
-$xx --test -h x -b -2 -l 15 $srcdir/FnFn > t3bi.out 2> t3bi.err
+test -s 3bh.E || rm -f 3bh.E
+$xx --test -h x -b -2 -l 15 $srcdir/FnFn > 3bi.O 2> 3bi.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3bi failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3bi.out $srcdir/b2l15-FF
+  cmp 3bi.O $srcdir/b2l15-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3bi"; fi ;;
-    1) $echo "Test 3bi failed: files t3bi.out and $srcdir/b2l15-FF differ" 1>&2;
+    1) $echo "Test 3bi failed: files 3bi.O and $srcdir/b2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3bi may have failed." 1>&2;
-       $echo The command "cmp t3bi.out $srcdir/b2l15-FF" failed. 1>&2 ;
+       $echo The command "cmp 3bi.O $srcdir/b2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3bi.err || rm -f t3bi.err
-$xx --test -h x -b -2 -l 15 $srcdir/tFFn > t3bj.out 2> t3bj.err
+test -s 3bi.E || rm -f 3bi.E
+$xx --test -h x -b -2 -l 15 $srcdir/tFFn > 3bj.O 2> 3bj.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3bj failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3bj.out $srcdir/b2l15-FF
+  cmp 3bj.O $srcdir/b2l15-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3bj"; fi ;;
-    1) $echo "Test 3bj failed: files t3bj.out and $srcdir/b2l15-FF differ" 1>&2;
+    1) $echo "Test 3bj failed: files 3bj.O and $srcdir/b2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3bj may have failed." 1>&2;
-       $echo The command "cmp t3bj.out $srcdir/b2l15-FF" failed. 1>&2 ;
+       $echo The command "cmp 3bj.O $srcdir/b2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3bj.err || rm -f t3bj.err
-$xx --test -h x -b -2 -l 15 $srcdir/tFnFt > t3bk.out 2> t3bk.err
+test -s 3bj.E || rm -f 3bj.E
+$xx --test -h x -b -2 -l 15 $srcdir/tFnFt > 3bk.O 2> 3bk.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3bk failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3bk.out $srcdir/b2l15-FF
+  cmp 3bk.O $srcdir/b2l15-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3bk"; fi ;;
-    1) $echo "Test 3bk failed: files t3bk.out and $srcdir/b2l15-FF differ" 1>&2;
+    1) $echo "Test 3bk failed: files 3bk.O and $srcdir/b2l15-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3bk may have failed." 1>&2;
-       $echo The command "cmp t3bk.out $srcdir/b2l15-FF" failed. 1>&2 ;
+       $echo The command "cmp 3bk.O $srcdir/b2l15-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3bk.err || rm -f t3bk.err
-$xx --test -h x +4 -l 24 $srcdir/FFn > t3Pa.out 2> t3Pa.err
+test -s 3bk.E || rm -f 3bk.E
+$xx --test -h x +4 -l 24 $srcdir/FFn > 3Pa.O 2> 3Pa.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3Pa failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3Pa.out $srcdir/4l24-FF
+  cmp 3Pa.O $srcdir/4l24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3Pa"; fi ;;
-    1) $echo "Test 3Pa failed: files t3Pa.out and $srcdir/4l24-FF differ" 1>&2;
+    1) $echo "Test 3Pa failed: files 3Pa.O and $srcdir/4l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3Pa may have failed." 1>&2;
-       $echo The command "cmp t3Pa.out $srcdir/4l24-FF" failed. 1>&2 ;
+       $echo The command "cmp 3Pa.O $srcdir/4l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3Pa.err || rm -f t3Pa.err
-$xx --test -h x +4 -l 24 $srcdir/FFtn > t3Pb.out 2> t3Pb.err
+test -s 3Pa.E || rm -f 3Pa.E
+$xx --test -h x +4 -l 24 $srcdir/FFtn > 3Pb.O 2> 3Pb.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3Pb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3Pb.out $srcdir/4l24-FF
+  cmp 3Pb.O $srcdir/4l24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3Pb"; fi ;;
-    1) $echo "Test 3Pb failed: files t3Pb.out and $srcdir/4l24-FF differ" 1>&2;
+    1) $echo "Test 3Pb failed: files 3Pb.O and $srcdir/4l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3Pb may have failed." 1>&2;
-       $echo The command "cmp t3Pb.out $srcdir/4l24-FF" failed. 1>&2 ;
+       $echo The command "cmp 3Pb.O $srcdir/4l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3Pb.err || rm -f t3Pb.err
-$xx --test -h x +4 -l 24 $srcdir/FnFn > t3Pc.out 2> t3Pc.err
+test -s 3Pb.E || rm -f 3Pb.E
+$xx --test -h x +4 -l 24 $srcdir/FnFn > 3Pc.O 2> 3Pc.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3Pc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3Pc.out $srcdir/4l24-FF
+  cmp 3Pc.O $srcdir/4l24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3Pc"; fi ;;
-    1) $echo "Test 3Pc failed: files t3Pc.out and $srcdir/4l24-FF differ" 1>&2;
+    1) $echo "Test 3Pc failed: files 3Pc.O and $srcdir/4l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3Pc may have failed." 1>&2;
-       $echo The command "cmp t3Pc.out $srcdir/4l24-FF" failed. 1>&2 ;
+       $echo The command "cmp 3Pc.O $srcdir/4l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3Pc.err || rm -f t3Pc.err
-$xx --test -h x +4 -l 24 $srcdir/tFFn > t3Pd.out 2> t3Pd.err
+test -s 3Pc.E || rm -f 3Pc.E
+$xx --test -h x +4 -l 24 $srcdir/tFFn > 3Pd.O 2> 3Pd.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3Pd failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3Pd.out $srcdir/4l24-FF
+  cmp 3Pd.O $srcdir/4l24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3Pd"; fi ;;
-    1) $echo "Test 3Pd failed: files t3Pd.out and $srcdir/4l24-FF differ" 1>&2;
+    1) $echo "Test 3Pd failed: files 3Pd.O and $srcdir/4l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3Pd may have failed." 1>&2;
-       $echo The command "cmp t3Pd.out $srcdir/4l24-FF" failed. 1>&2 ;
+       $echo The command "cmp 3Pd.O $srcdir/4l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3Pd.err || rm -f t3Pd.err
-$xx --test -h x +4 -l 24 $srcdir/tFnFt > t3Pe.out 2> t3Pe.err
+test -s 3Pd.E || rm -f 3Pd.E
+$xx --test -h x +4 -l 24 $srcdir/tFnFt > 3Pe.O 2> 3Pe.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3Pe failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3Pe.out $srcdir/4l24-FF
+  cmp 3Pe.O $srcdir/4l24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3Pe"; fi ;;
-    1) $echo "Test 3Pe failed: files t3Pe.out and $srcdir/4l24-FF differ" 1>&2;
+    1) $echo "Test 3Pe failed: files 3Pe.O and $srcdir/4l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3Pe may have failed." 1>&2;
-       $echo The command "cmp t3Pe.out $srcdir/4l24-FF" failed. 1>&2 ;
+       $echo The command "cmp 3Pe.O $srcdir/4l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3Pe.err || rm -f t3Pe.err
-$xx --test -h x +4 -l 24 $srcdir/tFFt > t3Pf.out 2> t3Pf.err
+test -s 3Pe.E || rm -f 3Pe.E
+$xx --test -h x +4 -l 24 $srcdir/tFFt > 3Pf.O 2> 3Pf.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3Pf failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3Pf.out $srcdir/4l24-FF
+  cmp 3Pf.O $srcdir/4l24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3Pf"; fi ;;
-    1) $echo "Test 3Pf failed: files t3Pf.out and $srcdir/4l24-FF differ" 1>&2;
+    1) $echo "Test 3Pf failed: files 3Pf.O and $srcdir/4l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3Pf may have failed." 1>&2;
-       $echo The command "cmp t3Pf.out $srcdir/4l24-FF" failed. 1>&2 ;
+       $echo The command "cmp 3Pf.O $srcdir/4l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3Pf.err || rm -f t3Pf.err
-$xx --test -h x +4:7 -l 24 $srcdir/tFFt > t3Pg.out 2> t3Pg.err
+test -s 3Pf.E || rm -f 3Pf.E
+$xx --test -h x +4:7 -l 24 $srcdir/tFFt > 3Pg.O 2> 3Pg.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3Pg failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3Pg.out $srcdir/4-7l24-FF
+  cmp 3Pg.O $srcdir/4-7l24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3Pg"; fi ;;
-    1) $echo "Test 3Pg failed: files t3Pg.out and $srcdir/4-7l24-FF differ" 1>&2;
+    1) $echo "Test 3Pg failed: files 3Pg.O and $srcdir/4-7l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3Pg may have failed." 1>&2;
-       $echo The command "cmp t3Pg.out $srcdir/4-7l24-FF" failed. 1>&2 ;
+       $echo The command "cmp 3Pg.O $srcdir/4-7l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3Pg.err || rm -f t3Pg.err
-$xx --test -h x +3 -a -2 -l 17 $srcdir/FFn > t3Paa.out 2> t3Paa.err
+test -s 3Pg.E || rm -f 3Pg.E
+$xx --test -h x +3 -a -2 -l 17 $srcdir/FFn > 3Paa.O 2> 3Paa.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3Paa failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3Paa.out $srcdir/3a2l17-FF
+  cmp 3Paa.O $srcdir/3a2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3Paa"; fi ;;
-    1) $echo "Test 3Paa failed: files t3Paa.out and $srcdir/3a2l17-FF differ" 1>&2;
+    1) $echo "Test 3Paa failed: files 3Paa.O and $srcdir/3a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3Paa may have failed." 1>&2;
-       $echo The command "cmp t3Paa.out $srcdir/3a2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3Paa.O $srcdir/3a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3Paa.err || rm -f t3Paa.err
-$xx --test -h x +3 -a -2 -l 17 $srcdir/FFtn > t3Pab.out 2> t3Pab.err
+test -s 3Paa.E || rm -f 3Paa.E
+$xx --test -h x +3 -a -2 -l 17 $srcdir/FFtn > 3Pab.O 2> 3Pab.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3Pab failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3Pab.out $srcdir/3a2l17-FF
+  cmp 3Pab.O $srcdir/3a2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3Pab"; fi ;;
-    1) $echo "Test 3Pab failed: files t3Pab.out and $srcdir/3a2l17-FF differ" 1>&2;
+    1) $echo "Test 3Pab failed: files 3Pab.O and $srcdir/3a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3Pab may have failed." 1>&2;
-       $echo The command "cmp t3Pab.out $srcdir/3a2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3Pab.O $srcdir/3a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3Pab.err || rm -f t3Pab.err
-$xx --test -h x +3 -a -2 -l 17 $srcdir/FnFn > t3Pac.out 2> t3Pac.err
+test -s 3Pab.E || rm -f 3Pab.E
+$xx --test -h x +3 -a -2 -l 17 $srcdir/FnFn > 3Pac.O 2> 3Pac.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3Pac failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3Pac.out $srcdir/3a2l17-FF
+  cmp 3Pac.O $srcdir/3a2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3Pac"; fi ;;
-    1) $echo "Test 3Pac failed: files t3Pac.out and $srcdir/3a2l17-FF differ" 1>&2;
+    1) $echo "Test 3Pac failed: files 3Pac.O and $srcdir/3a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3Pac may have failed." 1>&2;
-       $echo The command "cmp t3Pac.out $srcdir/3a2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3Pac.O $srcdir/3a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3Pac.err || rm -f t3Pac.err
-$xx --test -h x +3 -a -2 -l 17 $srcdir/tFFn > t3Pad.out 2> t3Pad.err
+test -s 3Pac.E || rm -f 3Pac.E
+$xx --test -h x +3 -a -2 -l 17 $srcdir/tFFn > 3Pad.O 2> 3Pad.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3Pad failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3Pad.out $srcdir/3a2l17-FF
+  cmp 3Pad.O $srcdir/3a2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3Pad"; fi ;;
-    1) $echo "Test 3Pad failed: files t3Pad.out and $srcdir/3a2l17-FF differ" 1>&2;
+    1) $echo "Test 3Pad failed: files 3Pad.O and $srcdir/3a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3Pad may have failed." 1>&2;
-       $echo The command "cmp t3Pad.out $srcdir/3a2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3Pad.O $srcdir/3a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3Pad.err || rm -f t3Pad.err
-$xx --test -h x +3 -a -2 -l 17 $srcdir/tFnFt > t3Pae.out 2> t3Pae.err
+test -s 3Pad.E || rm -f 3Pad.E
+$xx --test -h x +3 -a -2 -l 17 $srcdir/tFnFt > 3Pae.O 2> 3Pae.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3Pae failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3Pae.out $srcdir/3a2l17-FF
+  cmp 3Pae.O $srcdir/3a2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3Pae"; fi ;;
-    1) $echo "Test 3Pae failed: files t3Pae.out and $srcdir/3a2l17-FF differ" 1>&2;
+    1) $echo "Test 3Pae failed: files 3Pae.O and $srcdir/3a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3Pae may have failed." 1>&2;
-       $echo The command "cmp t3Pae.out $srcdir/3a2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3Pae.O $srcdir/3a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3Pae.err || rm -f t3Pae.err
-$xx --test -h x +3 -a -2 -l 17 $srcdir/tFFt > t3Paf.out 2> t3Paf.err
+test -s 3Pae.E || rm -f 3Pae.E
+$xx --test -h x +3 -a -2 -l 17 $srcdir/tFFt > 3Paf.O 2> 3Paf.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3Paf failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3Paf.out $srcdir/3a2l17-FF
+  cmp 3Paf.O $srcdir/3a2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3Paf"; fi ;;
-    1) $echo "Test 3Paf failed: files t3Paf.out and $srcdir/3a2l17-FF differ" 1>&2;
+    1) $echo "Test 3Paf failed: files 3Paf.O and $srcdir/3a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3Paf may have failed." 1>&2;
-       $echo The command "cmp t3Paf.out $srcdir/3a2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3Paf.O $srcdir/3a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3Paf.err || rm -f t3Paf.err
-$xx --test -h x +3 -b -2 -l 17 $srcdir/FFn > t3Pba.out 2> t3Pba.err
+test -s 3Paf.E || rm -f 3Paf.E
+$xx --test -h x +3 -b -2 -l 17 $srcdir/FFn > 3Pba.O 2> 3Pba.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3Pba failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3Pba.out $srcdir/3b2l17-FF
+  cmp 3Pba.O $srcdir/3b2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3Pba"; fi ;;
-    1) $echo "Test 3Pba failed: files t3Pba.out and $srcdir/3b2l17-FF differ" 1>&2;
+    1) $echo "Test 3Pba failed: files 3Pba.O and $srcdir/3b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3Pba may have failed." 1>&2;
-       $echo The command "cmp t3Pba.out $srcdir/3b2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3Pba.O $srcdir/3b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3Pba.err || rm -f t3Pba.err
-$xx --test -h x +3 -b -2 -l 17 $srcdir/FFtn > t3Pbb.out 2> t3Pbb.err
+test -s 3Pba.E || rm -f 3Pba.E
+$xx --test -h x +3 -b -2 -l 17 $srcdir/FFtn > 3Pbb.O 2> 3Pbb.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3Pbb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3Pbb.out $srcdir/3b2l17-FF
+  cmp 3Pbb.O $srcdir/3b2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3Pbb"; fi ;;
-    1) $echo "Test 3Pbb failed: files t3Pbb.out and $srcdir/3b2l17-FF differ" 1>&2;
+    1) $echo "Test 3Pbb failed: files 3Pbb.O and $srcdir/3b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3Pbb may have failed." 1>&2;
-       $echo The command "cmp t3Pbb.out $srcdir/3b2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3Pbb.O $srcdir/3b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3Pbb.err || rm -f t3Pbb.err
-$xx --test -h x +3 -b -2 -l 17 $srcdir/FnFn > t3Pbc.out 2> t3Pbc.err
+test -s 3Pbb.E || rm -f 3Pbb.E
+$xx --test -h x +3 -b -2 -l 17 $srcdir/FnFn > 3Pbc.O 2> 3Pbc.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3Pbc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3Pbc.out $srcdir/3b2l17-FF
+  cmp 3Pbc.O $srcdir/3b2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3Pbc"; fi ;;
-    1) $echo "Test 3Pbc failed: files t3Pbc.out and $srcdir/3b2l17-FF differ" 1>&2;
+    1) $echo "Test 3Pbc failed: files 3Pbc.O and $srcdir/3b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3Pbc may have failed." 1>&2;
-       $echo The command "cmp t3Pbc.out $srcdir/3b2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3Pbc.O $srcdir/3b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3Pbc.err || rm -f t3Pbc.err
-$xx --test -h x +3 -b -2 -l 17 $srcdir/tFFn > t3Pbd.out 2> t3Pbd.err
+test -s 3Pbc.E || rm -f 3Pbc.E
+$xx --test -h x +3 -b -2 -l 17 $srcdir/tFFn > 3Pbd.O 2> 3Pbd.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3Pbd failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3Pbd.out $srcdir/3b2l17-FF
+  cmp 3Pbd.O $srcdir/3b2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3Pbd"; fi ;;
-    1) $echo "Test 3Pbd failed: files t3Pbd.out and $srcdir/3b2l17-FF differ" 1>&2;
+    1) $echo "Test 3Pbd failed: files 3Pbd.O and $srcdir/3b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3Pbd may have failed." 1>&2;
-       $echo The command "cmp t3Pbd.out $srcdir/3b2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3Pbd.O $srcdir/3b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3Pbd.err || rm -f t3Pbd.err
-$xx --test -h x +3 -b -2 -l 17 $srcdir/tFnFt > t3Pbe.out 2> t3Pbe.err
+test -s 3Pbd.E || rm -f 3Pbd.E
+$xx --test -h x +3 -b -2 -l 17 $srcdir/tFnFt > 3Pbe.O 2> 3Pbe.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3Pbe failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3Pbe.out $srcdir/3b2l17-FF
+  cmp 3Pbe.O $srcdir/3b2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3Pbe"; fi ;;
-    1) $echo "Test 3Pbe failed: files t3Pbe.out and $srcdir/3b2l17-FF differ" 1>&2;
+    1) $echo "Test 3Pbe failed: files 3Pbe.O and $srcdir/3b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3Pbe may have failed." 1>&2;
-       $echo The command "cmp t3Pbe.out $srcdir/3b2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3Pbe.O $srcdir/3b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3Pbe.err || rm -f t3Pbe.err
-$xx --test -h x +3 -b -2 -l 17 $srcdir/tFFt > t3Pbf.out 2> t3Pbf.err
+test -s 3Pbe.E || rm -f 3Pbe.E
+$xx --test -h x +3 -b -2 -l 17 $srcdir/tFFt > 3Pbf.O 2> 3Pbf.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 3Pbf failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3Pbf.out $srcdir/3b2l17-FF
+  cmp 3Pbf.O $srcdir/3b2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 3Pbf"; fi ;;
-    1) $echo "Test 3Pbf failed: files t3Pbf.out and $srcdir/3b2l17-FF differ" 1>&2;
+    1) $echo "Test 3Pbf failed: files 3Pbf.O and $srcdir/3b2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 3Pbf may have failed." 1>&2;
-       $echo The command "cmp t3Pbf.out $srcdir/3b2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 3Pbf.O $srcdir/3b2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3Pbf.err || rm -f t3Pbf.err
-$xx --test -h x -l 24 $srcdir/tn > t4a.out 2> t4a.err
+test -s 3Pbf.E || rm -f 3Pbf.E
+$xx --test -h x -l 24 $srcdir/tn > 4a.O 2> 4a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 4a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4a.out $srcdir/l24-t
+  cmp 4a.O $srcdir/l24-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 4a"; fi ;;
-    1) $echo "Test 4a failed: files t4a.out and $srcdir/l24-t differ" 1>&2;
+    1) $echo "Test 4a failed: files 4a.O and $srcdir/l24-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 4a may have failed." 1>&2;
-       $echo The command "cmp t4a.out $srcdir/l24-t" failed. 1>&2 ;
+       $echo The command "cmp 4a.O $srcdir/l24-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4a.err || rm -f t4a.err
-$xx --test -h x -l 17 -f $srcdir/tn > t4b.out 2> t4b.err
+test -s 4a.E || rm -f 4a.E
+$xx --test -h x -l 17 -f $srcdir/tn > 4b.O 2> 4b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 4b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4b.out $srcdir/l17f-t
+  cmp 4b.O $srcdir/l17f-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 4b"; fi ;;
-    1) $echo "Test 4b failed: files t4b.out and $srcdir/l17f-t differ" 1>&2;
+    1) $echo "Test 4b failed: files 4b.O and $srcdir/l17f-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 4b may have failed." 1>&2;
-       $echo The command "cmp t4b.out $srcdir/l17f-t" failed. 1>&2 ;
+       $echo The command "cmp 4b.O $srcdir/l17f-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4b.err || rm -f t4b.err
-$xx --test -h x +3 -l 24 $srcdir/tn > t4c.out 2> t4c.err
+test -s 4b.E || rm -f 4b.E
+$xx --test -h x +3 -l 24 $srcdir/tn > 4c.O 2> 4c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 4c failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4c.out $srcdir/3l24-t
+  cmp 4c.O $srcdir/3l24-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 4c"; fi ;;
-    1) $echo "Test 4c failed: files t4c.out and $srcdir/3l24-t differ" 1>&2;
+    1) $echo "Test 4c failed: files 4c.O and $srcdir/3l24-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 4c may have failed." 1>&2;
-       $echo The command "cmp t4c.out $srcdir/3l24-t" failed. 1>&2 ;
+       $echo The command "cmp 4c.O $srcdir/3l24-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4c.err || rm -f t4c.err
-$xx --test -h x +3 -l 17 -f $srcdir/tn > t4d.out 2> t4d.err
+test -s 4c.E || rm -f 4c.E
+$xx --test -h x +3 -l 17 -f $srcdir/tn > 4d.O 2> 4d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 4d failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4d.out $srcdir/3l17f-t
+  cmp 4d.O $srcdir/3l17f-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 4d"; fi ;;
-    1) $echo "Test 4d failed: files t4d.out and $srcdir/3l17f-t differ" 1>&2;
+    1) $echo "Test 4d failed: files 4d.O and $srcdir/3l17f-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 4d may have failed." 1>&2;
-       $echo The command "cmp t4d.out $srcdir/3l17f-t" failed. 1>&2 ;
+       $echo The command "cmp 4d.O $srcdir/3l17f-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4d.err || rm -f t4d.err
-$xx --test -h x +3:5 -l 17 -f $srcdir/tn > t4e.out 2> t4e.err
+test -s 4d.E || rm -f 4d.E
+$xx --test -h x +3:5 -l 17 -f $srcdir/tn > 4e.O 2> 4e.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 4e failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4e.out $srcdir/3-5l17f-t
+  cmp 4e.O $srcdir/3-5l17f-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 4e"; fi ;;
-    1) $echo "Test 4e failed: files t4e.out and $srcdir/3-5l17f-t differ" 1>&2;
+    1) $echo "Test 4e failed: files 4e.O and $srcdir/3-5l17f-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 4e may have failed." 1>&2;
-       $echo The command "cmp t4e.out $srcdir/3-5l17f-t" failed. 1>&2 ;
+       $echo The command "cmp 4e.O $srcdir/3-5l17f-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4e.err || rm -f t4e.err
-$xx --test -h x -a -3 -l 15 $srcdir/tn > t4f.out 2> t4f.err
+test -s 4e.E || rm -f 4e.E
+$xx --test -h x -a -3 -l 15 $srcdir/tn > 4f.O 2> 4f.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 4f failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4f.out $srcdir/a3l15-t
+  cmp 4f.O $srcdir/a3l15-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 4f"; fi ;;
-    1) $echo "Test 4f failed: files t4f.out and $srcdir/a3l15-t differ" 1>&2;
+    1) $echo "Test 4f failed: files 4f.O and $srcdir/a3l15-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 4f may have failed." 1>&2;
-       $echo The command "cmp t4f.out $srcdir/a3l15-t" failed. 1>&2 ;
+       $echo The command "cmp 4f.O $srcdir/a3l15-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4f.err || rm -f t4f.err
-$xx --test -h x -a -3 -l 8 -f $srcdir/tn > t4g.out 2> t4g.err
+test -s 4f.E || rm -f 4f.E
+$xx --test -h x -a -3 -l 8 -f $srcdir/tn > 4g.O 2> 4g.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 4g failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4g.out $srcdir/a3l8f-t
+  cmp 4g.O $srcdir/a3l8f-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 4g"; fi ;;
-    1) $echo "Test 4g failed: files t4g.out and $srcdir/a3l8f-t differ" 1>&2;
+    1) $echo "Test 4g failed: files 4g.O and $srcdir/a3l8f-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 4g may have failed." 1>&2;
-       $echo The command "cmp t4g.out $srcdir/a3l8f-t" failed. 1>&2 ;
+       $echo The command "cmp 4g.O $srcdir/a3l8f-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4g.err || rm -f t4g.err
-$xx --test -h x +3 -a -3 -l 15 $srcdir/tn > t4h.out 2> t4h.err
+test -s 4g.E || rm -f 4g.E
+$xx --test -h x +3 -a -3 -l 15 $srcdir/tn > 4h.O 2> 4h.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 4h failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4h.out $srcdir/3a3l15-t
+  cmp 4h.O $srcdir/3a3l15-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 4h"; fi ;;
-    1) $echo "Test 4h failed: files t4h.out and $srcdir/3a3l15-t differ" 1>&2;
+    1) $echo "Test 4h failed: files 4h.O and $srcdir/3a3l15-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 4h may have failed." 1>&2;
-       $echo The command "cmp t4h.out $srcdir/3a3l15-t" failed. 1>&2 ;
+       $echo The command "cmp 4h.O $srcdir/3a3l15-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4h.err || rm -f t4h.err
-$xx --test -h x +3 -a -3 -l 8 -f $srcdir/tn > t4i.out 2> t4i.err
+test -s 4h.E || rm -f 4h.E
+$xx --test -h x +3 -a -3 -l 8 -f $srcdir/tn > 4i.O 2> 4i.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 4i failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4i.out $srcdir/3a3l8f-t
+  cmp 4i.O $srcdir/3a3l8f-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 4i"; fi ;;
-    1) $echo "Test 4i failed: files t4i.out and $srcdir/3a3l8f-t differ" 1>&2;
+    1) $echo "Test 4i failed: files 4i.O and $srcdir/3a3l8f-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 4i may have failed." 1>&2;
-       $echo The command "cmp t4i.out $srcdir/3a3l8f-t" failed. 1>&2 ;
+       $echo The command "cmp 4i.O $srcdir/3a3l8f-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4i.err || rm -f t4i.err
-$xx --test -h x -b -3 -l 15 $srcdir/tn > t4j.out 2> t4j.err
+test -s 4i.E || rm -f 4i.E
+$xx --test -h x -b -3 -l 15 $srcdir/tn > 4j.O 2> 4j.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 4j failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4j.out $srcdir/b3l15-t
+  cmp 4j.O $srcdir/b3l15-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 4j"; fi ;;
-    1) $echo "Test 4j failed: files t4j.out and $srcdir/b3l15-t differ" 1>&2;
+    1) $echo "Test 4j failed: files 4j.O and $srcdir/b3l15-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 4j may have failed." 1>&2;
-       $echo The command "cmp t4j.out $srcdir/b3l15-t" failed. 1>&2 ;
+       $echo The command "cmp 4j.O $srcdir/b3l15-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4j.err || rm -f t4j.err
-$xx --test -h x -b -3 -l 8 -f $srcdir/tn > t4k.out 2> t4k.err
+test -s 4j.E || rm -f 4j.E
+$xx --test -h x -b -3 -l 8 -f $srcdir/tn > 4k.O 2> 4k.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 4k failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4k.out $srcdir/b3l8f-t
+  cmp 4k.O $srcdir/b3l8f-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 4k"; fi ;;
-    1) $echo "Test 4k failed: files t4k.out and $srcdir/b3l8f-t differ" 1>&2;
+    1) $echo "Test 4k failed: files 4k.O and $srcdir/b3l8f-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 4k may have failed." 1>&2;
-       $echo The command "cmp t4k.out $srcdir/b3l8f-t" failed. 1>&2 ;
+       $echo The command "cmp 4k.O $srcdir/b3l8f-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4k.err || rm -f t4k.err
-$xx --test -h x +3 -b -3 -l 15 $srcdir/tn > t4l.out 2> t4l.err
+test -s 4k.E || rm -f 4k.E
+$xx --test -h x +3 -b -3 -l 15 $srcdir/tn > 4l.O 2> 4l.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 4l failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4l.out $srcdir/3b3l15-t
+  cmp 4l.O $srcdir/3b3l15-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 4l"; fi ;;
-    1) $echo "Test 4l failed: files t4l.out and $srcdir/3b3l15-t differ" 1>&2;
+    1) $echo "Test 4l failed: files 4l.O and $srcdir/3b3l15-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 4l may have failed." 1>&2;
-       $echo The command "cmp t4l.out $srcdir/3b3l15-t" failed. 1>&2 ;
+       $echo The command "cmp 4l.O $srcdir/3b3l15-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4l.err || rm -f t4l.err
-$xx --test -h x +3 -b -3 -l 8 -f $srcdir/tn > t4m.out 2> t4m.err
+test -s 4l.E || rm -f 4l.E
+$xx --test -h x +3 -b -3 -l 8 -f $srcdir/tn > 4m.O 2> 4m.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 4m failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4m.out $srcdir/3b3l8f-t
+  cmp 4m.O $srcdir/3b3l8f-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 4m"; fi ;;
-    1) $echo "Test 4m failed: files t4m.out and $srcdir/3b3l8f-t differ" 1>&2;
+    1) $echo "Test 4m failed: files 4m.O and $srcdir/3b3l8f-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 4m may have failed." 1>&2;
-       $echo The command "cmp t4m.out $srcdir/3b3l8f-t" failed. 1>&2 ;
+       $echo The command "cmp 4m.O $srcdir/3b3l8f-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4m.err || rm -f t4m.err
-$xx --test -h x -m -l 24 $srcdir/tn $srcdir/tn > t5a.out 2> t5a.err
+test -s 4m.E || rm -f 4m.E
+$xx --test -h x -m -l 24 $srcdir/tn $srcdir/tn > 5a.O 2> 5a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5a.out $srcdir/ml24-t
+  cmp 5a.O $srcdir/ml24-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5a"; fi ;;
-    1) $echo "Test 5a failed: files t5a.out and $srcdir/ml24-t differ" 1>&2;
+    1) $echo "Test 5a failed: files 5a.O and $srcdir/ml24-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5a may have failed." 1>&2;
-       $echo The command "cmp t5a.out $srcdir/ml24-t" failed. 1>&2 ;
+       $echo The command "cmp 5a.O $srcdir/ml24-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5a.err || rm -f t5a.err
-$xx --test -h x -m -l 17 -f $srcdir/tn $srcdir/tn > t5b.out 2> t5b.err
+test -s 5a.E || rm -f 5a.E
+$xx --test -h x -m -l 17 -f $srcdir/tn $srcdir/tn > 5b.O 2> 5b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5b.out $srcdir/ml17f-t
+  cmp 5b.O $srcdir/ml17f-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5b"; fi ;;
-    1) $echo "Test 5b failed: files t5b.out and $srcdir/ml17f-t differ" 1>&2;
+    1) $echo "Test 5b failed: files 5b.O and $srcdir/ml17f-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5b may have failed." 1>&2;
-       $echo The command "cmp t5b.out $srcdir/ml17f-t" failed. 1>&2 ;
+       $echo The command "cmp 5b.O $srcdir/ml17f-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5b.err || rm -f t5b.err
-$xx --test -h x +3 -m -l 24 $srcdir/tn $srcdir/tn > t5c.out 2> t5c.err
+test -s 5b.E || rm -f 5b.E
+$xx --test -h x +3 -m -l 24 $srcdir/tn $srcdir/tn > 5c.O 2> 5c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5c failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5c.out $srcdir/3ml24-t
+  cmp 5c.O $srcdir/3ml24-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5c"; fi ;;
-    1) $echo "Test 5c failed: files t5c.out and $srcdir/3ml24-t differ" 1>&2;
+    1) $echo "Test 5c failed: files 5c.O and $srcdir/3ml24-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5c may have failed." 1>&2;
-       $echo The command "cmp t5c.out $srcdir/3ml24-t" failed. 1>&2 ;
+       $echo The command "cmp 5c.O $srcdir/3ml24-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5c.err || rm -f t5c.err
-$xx --test -h x +3 -m -l 17 -f $srcdir/tn $srcdir/tn > t5d.out 2> t5d.err
+test -s 5c.E || rm -f 5c.E
+$xx --test -h x +3 -m -l 17 -f $srcdir/tn $srcdir/tn > 5d.O 2> 5d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5d failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5d.out $srcdir/3ml17f-t
+  cmp 5d.O $srcdir/3ml17f-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5d"; fi ;;
-    1) $echo "Test 5d failed: files t5d.out and $srcdir/3ml17f-t differ" 1>&2;
+    1) $echo "Test 5d failed: files 5d.O and $srcdir/3ml17f-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5d may have failed." 1>&2;
-       $echo The command "cmp t5d.out $srcdir/3ml17f-t" failed. 1>&2 ;
+       $echo The command "cmp 5d.O $srcdir/3ml17f-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5d.err || rm -f t5d.err
-$xx --test -h x -m -l 17 -f $srcdir/0Ft $srcdir/0Ft > t5e.out 2> t5e.err
+test -s 5d.E || rm -f 5d.E
+$xx --test -h x -m -l 17 -f $srcdir/0Ft $srcdir/0Ft > 5e.O 2> 5e.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5e failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5e.out $srcdir/ml17f-0F
+  cmp 5e.O $srcdir/ml17f-0F
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5e"; fi ;;
-    1) $echo "Test 5e failed: files t5e.out and $srcdir/ml17f-0F differ" 1>&2;
+    1) $echo "Test 5e failed: files 5e.O and $srcdir/ml17f-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5e may have failed." 1>&2;
-       $echo The command "cmp t5e.out $srcdir/ml17f-0F" failed. 1>&2 ;
+       $echo The command "cmp 5e.O $srcdir/ml17f-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5e.err || rm -f t5e.err
-$xx --test -h x -m -l 17 -f $srcdir/0Ft $srcdir/0Fnt > t5f.out 2> t5f.err
+test -s 5e.E || rm -f 5e.E
+$xx --test -h x -m -l 17 -f $srcdir/0Ft $srcdir/0Fnt > 5f.O 2> 5f.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5f failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5f.out $srcdir/ml17f-0F
+  cmp 5f.O $srcdir/ml17f-0F
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5f"; fi ;;
-    1) $echo "Test 5f failed: files t5f.out and $srcdir/ml17f-0F differ" 1>&2;
+    1) $echo "Test 5f failed: files 5f.O and $srcdir/ml17f-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5f may have failed." 1>&2;
-       $echo The command "cmp t5f.out $srcdir/ml17f-0F" failed. 1>&2 ;
+       $echo The command "cmp 5f.O $srcdir/ml17f-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5f.err || rm -f t5f.err
-$xx --test -h x -m -l 17 -f $srcdir/tn $srcdir/0Ft > t5g.out 2> t5g.err
+test -s 5f.E || rm -f 5f.E
+$xx --test -h x -m -l 17 -f $srcdir/tn $srcdir/0Ft > 5g.O 2> 5g.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5g failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5g.out $srcdir/ml17f-t-0F
+  cmp 5g.O $srcdir/ml17f-t-0F
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5g"; fi ;;
-    1) $echo "Test 5g failed: files t5g.out and $srcdir/ml17f-t-0F differ" 1>&2;
+    1) $echo "Test 5g failed: files 5g.O and $srcdir/ml17f-t-0F differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5g may have failed." 1>&2;
-       $echo The command "cmp t5g.out $srcdir/ml17f-t-0F" failed. 1>&2 ;
+       $echo The command "cmp 5g.O $srcdir/ml17f-t-0F" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5g.err || rm -f t5g.err
-$xx --test -h x -m -l 24 $srcdir/tFFn $srcdir/tFnFt > t5ma.out 2> t5ma.err
+test -s 5g.E || rm -f 5g.E
+$xx --test -h x -m -l 24 $srcdir/tFFn $srcdir/tFnFt > 5ma.O 2> 5ma.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5ma failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5ma.out $srcdir/ml24-FF
+  cmp 5ma.O $srcdir/ml24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5ma"; fi ;;
-    1) $echo "Test 5ma failed: files t5ma.out and $srcdir/ml24-FF differ" 1>&2;
+    1) $echo "Test 5ma failed: files 5ma.O and $srcdir/ml24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5ma may have failed." 1>&2;
-       $echo The command "cmp t5ma.out $srcdir/ml24-FF" failed. 1>&2 ;
+       $echo The command "cmp 5ma.O $srcdir/ml24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5ma.err || rm -f t5ma.err
-$xx --test -h x -m -l 24 $srcdir/tFFn $srcdir/FFn > t5mb.out 2> t5mb.err
+test -s 5ma.E || rm -f 5ma.E
+$xx --test -h x -m -l 24 $srcdir/tFFn $srcdir/FFn > 5mb.O 2> 5mb.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5mb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5mb.out $srcdir/ml24-FF
+  cmp 5mb.O $srcdir/ml24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5mb"; fi ;;
-    1) $echo "Test 5mb failed: files t5mb.out and $srcdir/ml24-FF differ" 1>&2;
+    1) $echo "Test 5mb failed: files 5mb.O and $srcdir/ml24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5mb may have failed." 1>&2;
-       $echo The command "cmp t5mb.out $srcdir/ml24-FF" failed. 1>&2 ;
+       $echo The command "cmp 5mb.O $srcdir/ml24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5mb.err || rm -f t5mb.err
-$xx --test -h x -m -l 24 $srcdir/tn $srcdir/FFn > t5mc.out 2> t5mc.err
+test -s 5mb.E || rm -f 5mb.E
+$xx --test -h x -m -l 24 $srcdir/tn $srcdir/FFn > 5mc.O 2> 5mc.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5mc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5mc.out $srcdir/ml24-t-FF
+  cmp 5mc.O $srcdir/ml24-t-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5mc"; fi ;;
-    1) $echo "Test 5mc failed: files t5mc.out and $srcdir/ml24-t-FF differ" 1>&2;
+    1) $echo "Test 5mc failed: files 5mc.O and $srcdir/ml24-t-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5mc may have failed." 1>&2;
-       $echo The command "cmp t5mc.out $srcdir/ml24-t-FF" failed. 1>&2 ;
+       $echo The command "cmp 5mc.O $srcdir/ml24-t-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5mc.err || rm -f t5mc.err
-$xx --test -h x -m -l 20 $srcdir/FFn $srcdir/tn > t5md.out 2> t5md.err
+test -s 5mc.E || rm -f 5mc.E
+$xx --test -h x -m -l 20 $srcdir/FFn $srcdir/tn > 5md.O 2> 5md.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5md failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5md.out $srcdir/ml20-FF-t
+  cmp 5md.O $srcdir/ml20-FF-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5md"; fi ;;
-    1) $echo "Test 5md failed: files t5md.out and $srcdir/ml20-FF-t differ" 1>&2;
+    1) $echo "Test 5md failed: files 5md.O and $srcdir/ml20-FF-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5md may have failed." 1>&2;
-       $echo The command "cmp t5md.out $srcdir/ml20-FF-t" failed. 1>&2 ;
+       $echo The command "cmp 5md.O $srcdir/ml20-FF-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5md.err || rm -f t5md.err
-$xx --test -h x +3 -m -l 24 $srcdir/FFn $srcdir/FnFn > t5Pma.out 2> t5Pma.err
+test -s 5md.E || rm -f 5md.E
+$xx --test -h x +3 -m -l 24 $srcdir/FFn $srcdir/FnFn > 5Pma.O 2> 5Pma.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5Pma failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5Pma.out $srcdir/3ml24-FF
+  cmp 5Pma.O $srcdir/3ml24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5Pma"; fi ;;
-    1) $echo "Test 5Pma failed: files t5Pma.out and $srcdir/3ml24-FF differ" 1>&2;
+    1) $echo "Test 5Pma failed: files 5Pma.O and $srcdir/3ml24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5Pma may have failed." 1>&2;
-       $echo The command "cmp t5Pma.out $srcdir/3ml24-FF" failed. 1>&2 ;
+       $echo The command "cmp 5Pma.O $srcdir/3ml24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5Pma.err || rm -f t5Pma.err
-$xx --test -h x +3 -m -l 24 $srcdir/tFFn $srcdir/FFn > t5Pmb.out 2> t5Pmb.err
+test -s 5Pma.E || rm -f 5Pma.E
+$xx --test -h x +3 -m -l 24 $srcdir/tFFn $srcdir/FFn > 5Pmb.O 2> 5Pmb.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5Pmb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5Pmb.out $srcdir/3ml24-FF
+  cmp 5Pmb.O $srcdir/3ml24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5Pmb"; fi ;;
-    1) $echo "Test 5Pmb failed: files t5Pmb.out and $srcdir/3ml24-FF differ" 1>&2;
+    1) $echo "Test 5Pmb failed: files 5Pmb.O and $srcdir/3ml24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5Pmb may have failed." 1>&2;
-       $echo The command "cmp t5Pmb.out $srcdir/3ml24-FF" failed. 1>&2 ;
+       $echo The command "cmp 5Pmb.O $srcdir/3ml24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5Pmb.err || rm -f t5Pmb.err
-$xx --test -h x +3 -m -l 24 $srcdir/tn $srcdir/FFn > t5Pmc.out 2> t5Pmc.err
+test -s 5Pmb.E || rm -f 5Pmb.E
+$xx --test -h x +3 -m -l 24 $srcdir/tn $srcdir/FFn > 5Pmc.O 2> 5Pmc.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 5Pmc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5Pmc.out $srcdir/3ml24-t-FF
+  cmp 5Pmc.O $srcdir/3ml24-t-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 5Pmc"; fi ;;
-    1) $echo "Test 5Pmc failed: files t5Pmc.out and $srcdir/3ml24-t-FF differ" 1>&2;
+    1) $echo "Test 5Pmc failed: files 5Pmc.O and $srcdir/3ml24-t-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 5Pmc may have failed." 1>&2;
-       $echo The command "cmp t5Pmc.out $srcdir/3ml24-t-FF" failed. 1>&2 ;
+       $echo The command "cmp 5Pmc.O $srcdir/3ml24-t-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5Pmc.err || rm -f t5Pmc.err
-$xx --test -h x -t -l 24 $srcdir/tn > t6a.out 2> t6a.err
+test -s 5Pmc.E || rm -f 5Pmc.E
+$xx --test -h x -t -l 24 $srcdir/tn > 6a.O 2> 6a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 6a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t6a.out $srcdir/t-t
+  cmp 6a.O $srcdir/t-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 6a"; fi ;;
-    1) $echo "Test 6a failed: files t6a.out and $srcdir/t-t differ" 1>&2;
+    1) $echo "Test 6a failed: files 6a.O and $srcdir/t-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 6a may have failed." 1>&2;
-       $echo The command "cmp t6a.out $srcdir/t-t" failed. 1>&2 ;
+       $echo The command "cmp 6a.O $srcdir/t-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t6a.err || rm -f t6a.err
-$xx --test -h x -t -l 17 -f $srcdir/tn > t6b.out 2> t6b.err
+test -s 6a.E || rm -f 6a.E
+$xx --test -h x -t -l 17 -f $srcdir/tn > 6b.O 2> 6b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 6b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t6b.out $srcdir/t-t
+  cmp 6b.O $srcdir/t-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 6b"; fi ;;
-    1) $echo "Test 6b failed: files t6b.out and $srcdir/t-t differ" 1>&2;
+    1) $echo "Test 6b failed: files 6b.O and $srcdir/t-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 6b may have failed." 1>&2;
-       $echo The command "cmp t6b.out $srcdir/t-t" failed. 1>&2 ;
+       $echo The command "cmp 6b.O $srcdir/t-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t6b.err || rm -f t6b.err
-$xx --test -h x -t -l 17 -f $srcdir/tFFt-bl > t6c.out 2> t6c.err
+test -s 6b.E || rm -f 6b.E
+$xx --test -h x -t -l 17 -f $srcdir/tFFt-bl > 6c.O 2> 6c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 6c failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t6c.out $srcdir/t-bl
+  cmp 6c.O $srcdir/t-bl
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 6c"; fi ;;
-    1) $echo "Test 6c failed: files t6c.out and $srcdir/t-bl differ" 1>&2;
+    1) $echo "Test 6c failed: files 6c.O and $srcdir/t-bl differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 6c may have failed." 1>&2;
-       $echo The command "cmp t6c.out $srcdir/t-bl" failed. 1>&2 ;
+       $echo The command "cmp 6c.O $srcdir/t-bl" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t6c.err || rm -f t6c.err
-$xx --test -h x -t -l 24 $srcdir/0FnFnt > t6d.out 2> t6d.err
+test -s 6c.E || rm -f 6c.E
+$xx --test -h x -t -l 24 $srcdir/0FnFnt > 6d.O 2> 6d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 6d failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t6d.out $srcdir/t-0FF
+  cmp 6d.O $srcdir/t-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 6d"; fi ;;
-    1) $echo "Test 6d failed: files t6d.out and $srcdir/t-0FF differ" 1>&2;
+    1) $echo "Test 6d failed: files 6d.O and $srcdir/t-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 6d may have failed." 1>&2;
-       $echo The command "cmp t6d.out $srcdir/t-0FF" failed. 1>&2 ;
+       $echo The command "cmp 6d.O $srcdir/t-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t6d.err || rm -f t6d.err
-$xx --test -h x -t -l 24 $srcdir/FFn > t6e.out 2> t6e.err
+test -s 6d.E || rm -f 6d.E
+$xx --test -h x -t -l 24 $srcdir/FFn > 6e.O 2> 6e.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 6e failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t6e.out $srcdir/t-FF
+  cmp 6e.O $srcdir/t-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 6e"; fi ;;
-    1) $echo "Test 6e failed: files t6e.out and $srcdir/t-FF differ" 1>&2;
+    1) $echo "Test 6e failed: files 6e.O and $srcdir/t-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 6e may have failed." 1>&2;
-       $echo The command "cmp t6e.out $srcdir/t-FF" failed. 1>&2 ;
+       $echo The command "cmp 6e.O $srcdir/t-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t6e.err || rm -f t6e.err
-$xx --test -h x -t -l 24 $srcdir/FnFn > t6f.out 2> t6f.err
+test -s 6e.E || rm -f 6e.E
+$xx --test -h x -t -l 24 $srcdir/FnFn > 6f.O 2> 6f.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 6f failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t6f.out $srcdir/t-FF
+  cmp 6f.O $srcdir/t-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 6f"; fi ;;
-    1) $echo "Test 6f failed: files t6f.out and $srcdir/t-FF differ" 1>&2;
+    1) $echo "Test 6f failed: files 6f.O and $srcdir/t-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 6f may have failed." 1>&2;
-       $echo The command "cmp t6f.out $srcdir/t-FF" failed. 1>&2 ;
+       $echo The command "cmp 6f.O $srcdir/t-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t6f.err || rm -f t6f.err
-$xx --test -h x -t -l 17 -f $srcdir/FFn > t6g.out 2> t6g.err
+test -s 6f.E || rm -f 6f.E
+$xx --test -h x -t -l 17 -f $srcdir/FFn > 6g.O 2> 6g.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 6g failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t6g.out $srcdir/t-FF
+  cmp 6g.O $srcdir/t-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 6g"; fi ;;
-    1) $echo "Test 6g failed: files t6g.out and $srcdir/t-FF differ" 1>&2;
+    1) $echo "Test 6g failed: files 6g.O and $srcdir/t-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 6g may have failed." 1>&2;
-       $echo The command "cmp t6g.out $srcdir/t-FF" failed. 1>&2 ;
+       $echo The command "cmp 6g.O $srcdir/t-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t6g.err || rm -f t6g.err
-$xx --test -h x -t -a -3 $srcdir/0FnFnt > t6aa.out 2> t6aa.err
+test -s 6g.E || rm -f 6g.E
+$xx --test -h x -t -a -3 $srcdir/0FnFnt > 6aa.O 2> 6aa.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 6aa failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t6aa.out $srcdir/ta3-0FF
+  cmp 6aa.O $srcdir/ta3-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 6aa"; fi ;;
-    1) $echo "Test 6aa failed: files t6aa.out and $srcdir/ta3-0FF differ" 1>&2;
+    1) $echo "Test 6aa failed: files 6aa.O and $srcdir/ta3-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 6aa may have failed." 1>&2;
-       $echo The command "cmp t6aa.out $srcdir/ta3-0FF" failed. 1>&2 ;
+       $echo The command "cmp 6aa.O $srcdir/ta3-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t6aa.err || rm -f t6aa.err
-$xx --test -h x -t -a -3 $srcdir/FFn > t6ab.out 2> t6ab.err
+test -s 6aa.E || rm -f 6aa.E
+$xx --test -h x -t -a -3 $srcdir/FFn > 6ab.O 2> 6ab.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 6ab failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t6ab.out $srcdir/ta3-FF
+  cmp 6ab.O $srcdir/ta3-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 6ab"; fi ;;
-    1) $echo "Test 6ab failed: files t6ab.out and $srcdir/ta3-FF differ" 1>&2;
+    1) $echo "Test 6ab failed: files 6ab.O and $srcdir/ta3-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 6ab may have failed." 1>&2;
-       $echo The command "cmp t6ab.out $srcdir/ta3-FF" failed. 1>&2 ;
+       $echo The command "cmp 6ab.O $srcdir/ta3-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t6ab.err || rm -f t6ab.err
-$xx --test -h x -t -a -3 -l 24 $srcdir/FnFn > t6ac.out 2> t6ac.err
+test -s 6ab.E || rm -f 6ab.E
+$xx --test -h x -t -a -3 -l 24 $srcdir/FnFn > 6ac.O 2> 6ac.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 6ac failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t6ac.out $srcdir/ta3-FF
+  cmp 6ac.O $srcdir/ta3-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 6ac"; fi ;;
-    1) $echo "Test 6ac failed: files t6ac.out and $srcdir/ta3-FF differ" 1>&2;
+    1) $echo "Test 6ac failed: files 6ac.O and $srcdir/ta3-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 6ac may have failed." 1>&2;
-       $echo The command "cmp t6ac.out $srcdir/ta3-FF" failed. 1>&2 ;
+       $echo The command "cmp 6ac.O $srcdir/ta3-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t6ac.err || rm -f t6ac.err
-$xx --test -h x -t -b -3 $srcdir/0FnFnt > t6ba.out 2> t6ba.err
+test -s 6ac.E || rm -f 6ac.E
+$xx --test -h x -t -b -3 $srcdir/0FnFnt > 6ba.O 2> 6ba.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 6ba failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t6ba.out $srcdir/tb3-0FF
+  cmp 6ba.O $srcdir/tb3-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 6ba"; fi ;;
-    1) $echo "Test 6ba failed: files t6ba.out and $srcdir/tb3-0FF differ" 1>&2;
+    1) $echo "Test 6ba failed: files 6ba.O and $srcdir/tb3-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 6ba may have failed." 1>&2;
-       $echo The command "cmp t6ba.out $srcdir/tb3-0FF" failed. 1>&2 ;
+       $echo The command "cmp 6ba.O $srcdir/tb3-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t6ba.err || rm -f t6ba.err
-$xx --test -h x -t -b -3 $srcdir/FFn > t6bb.out 2> t6bb.err
+test -s 6ba.E || rm -f 6ba.E
+$xx --test -h x -t -b -3 $srcdir/FFn > 6bb.O 2> 6bb.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 6bb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t6bb.out $srcdir/tb3-FF
+  cmp 6bb.O $srcdir/tb3-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 6bb"; fi ;;
-    1) $echo "Test 6bb failed: files t6bb.out and $srcdir/tb3-FF differ" 1>&2;
+    1) $echo "Test 6bb failed: files 6bb.O and $srcdir/tb3-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 6bb may have failed." 1>&2;
-       $echo The command "cmp t6bb.out $srcdir/tb3-FF" failed. 1>&2 ;
+       $echo The command "cmp 6bb.O $srcdir/tb3-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t6bb.err || rm -f t6bb.err
-$xx --test -h x -t -b -3 -l 24 $srcdir/FnFn > t6bc.out 2> t6bc.err
+test -s 6bb.E || rm -f 6bb.E
+$xx --test -h x -t -b -3 -l 24 $srcdir/FnFn > 6bc.O 2> 6bc.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 6bc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t6bc.out $srcdir/tb3-FF
+  cmp 6bc.O $srcdir/tb3-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 6bc"; fi ;;
-    1) $echo "Test 6bc failed: files t6bc.out and $srcdir/tb3-FF differ" 1>&2;
+    1) $echo "Test 6bc failed: files 6bc.O and $srcdir/tb3-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 6bc may have failed." 1>&2;
-       $echo The command "cmp t6bc.out $srcdir/tb3-FF" failed. 1>&2 ;
+       $echo The command "cmp 6bc.O $srcdir/tb3-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t6bc.err || rm -f t6bc.err
-$xx --test -h x -T -l 24 $srcdir/tn > t7a.out 2> t7a.err
+test -s 6bc.E || rm -f 6bc.E
+$xx --test -h x -T -l 24 $srcdir/tn > 7a.O 2> 7a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 7a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t7a.out $srcdir/T-t
+  cmp 7a.O $srcdir/T-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 7a"; fi ;;
-    1) $echo "Test 7a failed: files t7a.out and $srcdir/T-t differ" 1>&2;
+    1) $echo "Test 7a failed: files 7a.O and $srcdir/T-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 7a may have failed." 1>&2;
-       $echo The command "cmp t7a.out $srcdir/T-t" failed. 1>&2 ;
+       $echo The command "cmp 7a.O $srcdir/T-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t7a.err || rm -f t7a.err
-$xx --test -h x -T -l 17 -f $srcdir/tn > t7b.out 2> t7b.err
+test -s 7a.E || rm -f 7a.E
+$xx --test -h x -T -l 17 -f $srcdir/tn > 7b.O 2> 7b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 7b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t7b.out $srcdir/T-t
+  cmp 7b.O $srcdir/T-t
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 7b"; fi ;;
-    1) $echo "Test 7b failed: files t7b.out and $srcdir/T-t differ" 1>&2;
+    1) $echo "Test 7b failed: files 7b.O and $srcdir/T-t differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 7b may have failed." 1>&2;
-       $echo The command "cmp t7b.out $srcdir/T-t" failed. 1>&2 ;
+       $echo The command "cmp 7b.O $srcdir/T-t" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t7b.err || rm -f t7b.err
-$xx --test -h x -T -l 17 -f $srcdir/tFFt-bl > t7c.out 2> t7c.err
+test -s 7b.E || rm -f 7b.E
+$xx --test -h x -T -l 17 -f $srcdir/tFFt-bl > 7c.O 2> 7c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 7c failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t7c.out $srcdir/T-bl
+  cmp 7c.O $srcdir/T-bl
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 7c"; fi ;;
-    1) $echo "Test 7c failed: files t7c.out and $srcdir/T-bl differ" 1>&2;
+    1) $echo "Test 7c failed: files 7c.O and $srcdir/T-bl differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 7c may have failed." 1>&2;
-       $echo The command "cmp t7c.out $srcdir/T-bl" failed. 1>&2 ;
+       $echo The command "cmp 7c.O $srcdir/T-bl" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t7c.err || rm -f t7c.err
-$xx --test -h x -T -l 24 $srcdir/0FnFnt > t7d.out 2> t7d.err
+test -s 7c.E || rm -f 7c.E
+$xx --test -h x -T -l 24 $srcdir/0FnFnt > 7d.O 2> 7d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 7d failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t7d.out $srcdir/T-0FF
+  cmp 7d.O $srcdir/T-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 7d"; fi ;;
-    1) $echo "Test 7d failed: files t7d.out and $srcdir/T-0FF differ" 1>&2;
+    1) $echo "Test 7d failed: files 7d.O and $srcdir/T-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 7d may have failed." 1>&2;
-       $echo The command "cmp t7d.out $srcdir/T-0FF" failed. 1>&2 ;
+       $echo The command "cmp 7d.O $srcdir/T-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t7d.err || rm -f t7d.err
-$xx --test -h x -T -l 24 $srcdir/FFn > t7e.out 2> t7e.err
+test -s 7d.E || rm -f 7d.E
+$xx --test -h x -T -l 24 $srcdir/FFn > 7e.O 2> 7e.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 7e failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t7e.out $srcdir/T-FF
+  cmp 7e.O $srcdir/T-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 7e"; fi ;;
-    1) $echo "Test 7e failed: files t7e.out and $srcdir/T-FF differ" 1>&2;
+    1) $echo "Test 7e failed: files 7e.O and $srcdir/T-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 7e may have failed." 1>&2;
-       $echo The command "cmp t7e.out $srcdir/T-FF" failed. 1>&2 ;
+       $echo The command "cmp 7e.O $srcdir/T-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t7e.err || rm -f t7e.err
-$xx --test -h x -T -l 24 $srcdir/FnFn > t7f.out 2> t7f.err
+test -s 7e.E || rm -f 7e.E
+$xx --test -h x -T -l 24 $srcdir/FnFn > 7f.O 2> 7f.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 7f failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t7f.out $srcdir/T-FF
+  cmp 7f.O $srcdir/T-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 7f"; fi ;;
-    1) $echo "Test 7f failed: files t7f.out and $srcdir/T-FF differ" 1>&2;
+    1) $echo "Test 7f failed: files 7f.O and $srcdir/T-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 7f may have failed." 1>&2;
-       $echo The command "cmp t7f.out $srcdir/T-FF" failed. 1>&2 ;
+       $echo The command "cmp 7f.O $srcdir/T-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t7f.err || rm -f t7f.err
-$xx --test -h x -T -l 17 -f $srcdir/FFn > t7g.out 2> t7g.err
+test -s 7f.E || rm -f 7f.E
+$xx --test -h x -T -l 17 -f $srcdir/FFn > 7g.O 2> 7g.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 7g failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t7g.out $srcdir/T-FF
+  cmp 7g.O $srcdir/T-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 7g"; fi ;;
-    1) $echo "Test 7g failed: files t7g.out and $srcdir/T-FF differ" 1>&2;
+    1) $echo "Test 7g failed: files 7g.O and $srcdir/T-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 7g may have failed." 1>&2;
-       $echo The command "cmp t7g.out $srcdir/T-FF" failed. 1>&2 ;
+       $echo The command "cmp 7g.O $srcdir/T-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t7g.err || rm -f t7g.err
-$xx --test -h x -T -a -3 $srcdir/0FnFnt > t7aa.out 2> t7aa.err
+test -s 7g.E || rm -f 7g.E
+$xx --test -h x -T -a -3 $srcdir/0FnFnt > 7aa.O 2> 7aa.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 7aa failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t7aa.out $srcdir/Ta3-0FF
+  cmp 7aa.O $srcdir/Ta3-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 7aa"; fi ;;
-    1) $echo "Test 7aa failed: files t7aa.out and $srcdir/Ta3-0FF differ" 1>&2;
+    1) $echo "Test 7aa failed: files 7aa.O and $srcdir/Ta3-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 7aa may have failed." 1>&2;
-       $echo The command "cmp t7aa.out $srcdir/Ta3-0FF" failed. 1>&2 ;
+       $echo The command "cmp 7aa.O $srcdir/Ta3-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t7aa.err || rm -f t7aa.err
-$xx --test -h x -T -a -3 $srcdir/FFn > t7ab.out 2> t7ab.err
+test -s 7aa.E || rm -f 7aa.E
+$xx --test -h x -T -a -3 $srcdir/FFn > 7ab.O 2> 7ab.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 7ab failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t7ab.out $srcdir/Ta3-FF
+  cmp 7ab.O $srcdir/Ta3-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 7ab"; fi ;;
-    1) $echo "Test 7ab failed: files t7ab.out and $srcdir/Ta3-FF differ" 1>&2;
+    1) $echo "Test 7ab failed: files 7ab.O and $srcdir/Ta3-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 7ab may have failed." 1>&2;
-       $echo The command "cmp t7ab.out $srcdir/Ta3-FF" failed. 1>&2 ;
+       $echo The command "cmp 7ab.O $srcdir/Ta3-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t7ab.err || rm -f t7ab.err
-$xx --test -h x -T -a -3 -l 24 $srcdir/FnFn > t7ac.out 2> t7ac.err
+test -s 7ab.E || rm -f 7ab.E
+$xx --test -h x -T -a -3 -l 24 $srcdir/FnFn > 7ac.O 2> 7ac.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 7ac failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t7ac.out $srcdir/Ta3-FF
+  cmp 7ac.O $srcdir/Ta3-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 7ac"; fi ;;
-    1) $echo "Test 7ac failed: files t7ac.out and $srcdir/Ta3-FF differ" 1>&2;
+    1) $echo "Test 7ac failed: files 7ac.O and $srcdir/Ta3-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 7ac may have failed." 1>&2;
-       $echo The command "cmp t7ac.out $srcdir/Ta3-FF" failed. 1>&2 ;
+       $echo The command "cmp 7ac.O $srcdir/Ta3-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t7ac.err || rm -f t7ac.err
-$xx --test -h x -T -b -3 $srcdir/0FnFnt > t7ba.out 2> t7ba.err
+test -s 7ac.E || rm -f 7ac.E
+$xx --test -h x -T -b -3 $srcdir/0FnFnt > 7ba.O 2> 7ba.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 7ba failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t7ba.out $srcdir/Tb3-0FF
+  cmp 7ba.O $srcdir/Tb3-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 7ba"; fi ;;
-    1) $echo "Test 7ba failed: files t7ba.out and $srcdir/Tb3-0FF differ" 1>&2;
+    1) $echo "Test 7ba failed: files 7ba.O and $srcdir/Tb3-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 7ba may have failed." 1>&2;
-       $echo The command "cmp t7ba.out $srcdir/Tb3-0FF" failed. 1>&2 ;
+       $echo The command "cmp 7ba.O $srcdir/Tb3-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t7ba.err || rm -f t7ba.err
-$xx --test -h x -T -b -3 $srcdir/FFn > t7bb.out 2> t7bb.err
+test -s 7ba.E || rm -f 7ba.E
+$xx --test -h x -T -b -3 $srcdir/FFn > 7bb.O 2> 7bb.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 7bb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t7bb.out $srcdir/Tb3-FF
+  cmp 7bb.O $srcdir/Tb3-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 7bb"; fi ;;
-    1) $echo "Test 7bb failed: files t7bb.out and $srcdir/Tb3-FF differ" 1>&2;
+    1) $echo "Test 7bb failed: files 7bb.O and $srcdir/Tb3-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 7bb may have failed." 1>&2;
-       $echo The command "cmp t7bb.out $srcdir/Tb3-FF" failed. 1>&2 ;
+       $echo The command "cmp 7bb.O $srcdir/Tb3-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t7bb.err || rm -f t7bb.err
-$xx --test -h x -T -b -3 -l 24 $srcdir/FnFn > t7bc.out 2> t7bc.err
+test -s 7bb.E || rm -f 7bb.E
+$xx --test -h x -T -b -3 -l 24 $srcdir/FnFn > 7bc.O 2> 7bc.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 7bc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t7bc.out $srcdir/Tb3-FF
+  cmp 7bc.O $srcdir/Tb3-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 7bc"; fi ;;
-    1) $echo "Test 7bc failed: files t7bc.out and $srcdir/Tb3-FF differ" 1>&2;
+    1) $echo "Test 7bc failed: files 7bc.O and $srcdir/Tb3-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 7bc may have failed." 1>&2;
-       $echo The command "cmp t7bc.out $srcdir/Tb3-FF" failed. 1>&2 ;
+       $echo The command "cmp 7bc.O $srcdir/Tb3-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t7bc.err || rm -f t7bc.err
-$xx --test -h x -n.3 -l 17 -f $srcdir/tFFt-bl > t9a.out 2> t9a.err
+test -s 7bc.E || rm -f 7bc.E
+$xx --test -h x -n.3 -l 17 -f $srcdir/tFFt-bl > 9a.O 2> 9a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9a.out $srcdir/nl17f-bl
+  cmp 9a.O $srcdir/nl17f-bl
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9a"; fi ;;
-    1) $echo "Test 9a failed: files t9a.out and $srcdir/nl17f-bl differ" 1>&2;
+    1) $echo "Test 9a failed: files 9a.O and $srcdir/nl17f-bl differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9a may have failed." 1>&2;
-       $echo The command "cmp t9a.out $srcdir/nl17f-bl" failed. 1>&2 ;
+       $echo The command "cmp 9a.O $srcdir/nl17f-bl" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9a.err || rm -f t9a.err
-$xx --test -h x -n.3 -N 15 -l 17 -f $srcdir/tFFt-bl > t9b.out 2> t9b.err
+test -s 9a.E || rm -f 9a.E
+$xx --test -h x -n.3 -N 15 -l 17 -f $srcdir/tFFt-bl > 9b.O 2> 9b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9b.out $srcdir/nN15l17f-bl
+  cmp 9b.O $srcdir/nN15l17f-bl
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9b"; fi ;;
-    1) $echo "Test 9b failed: files t9b.out and $srcdir/nN15l17f-bl differ" 1>&2;
+    1) $echo "Test 9b failed: files 9b.O and $srcdir/nN15l17f-bl differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9b may have failed." 1>&2;
-       $echo The command "cmp t9b.out $srcdir/nN15l17f-bl" failed. 1>&2 ;
+       $echo The command "cmp 9b.O $srcdir/nN15l17f-bl" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9b.err || rm -f t9b.err
-$xx --test -h x -n.3 +2 -l 17 -f $srcdir/tFFt-bl > t9Pa.out 2> t9Pa.err
+test -s 9b.E || rm -f 9b.E
+$xx --test -h x -n.3 +2 -l 17 -f $srcdir/tFFt-bl > 9Pa.O 2> 9Pa.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pa failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pa.out $srcdir/n+2l17f-bl
+  cmp 9Pa.O $srcdir/n+2l17f-bl
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pa"; fi ;;
-    1) $echo "Test 9Pa failed: files t9Pa.out and $srcdir/n+2l17f-bl differ" 1>&2;
+    1) $echo "Test 9Pa failed: files 9Pa.O and $srcdir/n+2l17f-bl differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pa may have failed." 1>&2;
-       $echo The command "cmp t9Pa.out $srcdir/n+2l17f-bl" failed. 1>&2 ;
+       $echo The command "cmp 9Pa.O $srcdir/n+2l17f-bl" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pa.err || rm -f t9Pa.err
-$xx --test -h x -n.3 +3 -l 17 -f $srcdir/tFFt-bl > t9Pb.out 2> t9Pb.err
+test -s 9Pa.E || rm -f 9Pa.E
+$xx --test -h x -n.3 +3 -l 17 -f $srcdir/tFFt-bl > 9Pb.O 2> 9Pb.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pb.out $srcdir/n+3l17f-bl
+  cmp 9Pb.O $srcdir/n+3l17f-bl
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pb"; fi ;;
-    1) $echo "Test 9Pb failed: files t9Pb.out and $srcdir/n+3l17f-bl differ" 1>&2;
+    1) $echo "Test 9Pb failed: files 9Pb.O and $srcdir/n+3l17f-bl differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pb may have failed." 1>&2;
-       $echo The command "cmp t9Pb.out $srcdir/n+3l17f-bl" failed. 1>&2 ;
+       $echo The command "cmp 9Pb.O $srcdir/n+3l17f-bl" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pb.err || rm -f t9Pb.err
-$xx --test -h x -n.3 -N 1 +3 -l 17 -f $srcdir/tFFt-bl > t9Pc.out 2> t9Pc.err
+test -s 9Pb.E || rm -f 9Pb.E
+$xx --test -h x -n.3 -N 1 +3 -l 17 -f $srcdir/tFFt-bl > 9Pc.O 2> 9Pc.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pc.out $srcdir/nN1+3l17f-bl
+  cmp 9Pc.O $srcdir/nN1+3l17f-bl
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pc"; fi ;;
-    1) $echo "Test 9Pc failed: files t9Pc.out and $srcdir/nN1+3l17f-bl differ" 1>&2;
+    1) $echo "Test 9Pc failed: files 9Pc.O and $srcdir/nN1+3l17f-bl differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pc may have failed." 1>&2;
-       $echo The command "cmp t9Pc.out $srcdir/nN1+3l17f-bl" failed. 1>&2 ;
+       $echo The command "cmp 9Pc.O $srcdir/nN1+3l17f-bl" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pc.err || rm -f t9Pc.err
-$xx --test -h x -n.3 +2 -l 17 -f $srcdir/0FFt > t9Pe.out 2> t9Pe.err
+test -s 9Pc.E || rm -f 9Pc.E
+$xx --test -h x -n.3 +2 -l 17 -f $srcdir/0FFt > 9Pe.O 2> 9Pe.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pe failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pe.out $srcdir/n+2l17f-0FF
+  cmp 9Pe.O $srcdir/n+2l17f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pe"; fi ;;
-    1) $echo "Test 9Pe failed: files t9Pe.out and $srcdir/n+2l17f-0FF differ" 1>&2;
+    1) $echo "Test 9Pe failed: files 9Pe.O and $srcdir/n+2l17f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pe may have failed." 1>&2;
-       $echo The command "cmp t9Pe.out $srcdir/n+2l17f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pe.O $srcdir/n+2l17f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pe.err || rm -f t9Pe.err
-$xx --test -h x -n.3 +2 -l 17 -f $srcdir/0FFnt > t9Pf.out 2> t9Pf.err
+test -s 9Pe.E || rm -f 9Pe.E
+$xx --test -h x -n.3 +2 -l 17 -f $srcdir/0FFnt > 9Pf.O 2> 9Pf.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pf failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pf.out $srcdir/n+2l17f-0FF
+  cmp 9Pf.O $srcdir/n+2l17f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pf"; fi ;;
-    1) $echo "Test 9Pf failed: files t9Pf.out and $srcdir/n+2l17f-0FF differ" 1>&2;
+    1) $echo "Test 9Pf failed: files 9Pf.O and $srcdir/n+2l17f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pf may have failed." 1>&2;
-       $echo The command "cmp t9Pf.out $srcdir/n+2l17f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pf.O $srcdir/n+2l17f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pf.err || rm -f t9Pf.err
-$xx --test -h x -n.3 +2 -l 17 -f $srcdir/0FnFt > t9Pg.out 2> t9Pg.err
+test -s 9Pf.E || rm -f 9Pf.E
+$xx --test -h x -n.3 +2 -l 17 -f $srcdir/0FnFt > 9Pg.O 2> 9Pg.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pg failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pg.out $srcdir/n+2l17f-0FF
+  cmp 9Pg.O $srcdir/n+2l17f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pg"; fi ;;
-    1) $echo "Test 9Pg failed: files t9Pg.out and $srcdir/n+2l17f-0FF differ" 1>&2;
+    1) $echo "Test 9Pg failed: files 9Pg.O and $srcdir/n+2l17f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pg may have failed." 1>&2;
-       $echo The command "cmp t9Pg.out $srcdir/n+2l17f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pg.O $srcdir/n+2l17f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pg.err || rm -f t9Pg.err
-$xx --test -h x -n.3 +2 -l 17 -f $srcdir/0FnFnt > t9Ph.out 2> t9Ph.err
+test -s 9Pg.E || rm -f 9Pg.E
+$xx --test -h x -n.3 +2 -l 17 -f $srcdir/0FnFnt > 9Ph.O 2> 9Ph.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Ph failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Ph.out $srcdir/n+2l17f-0FF
+  cmp 9Ph.O $srcdir/n+2l17f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Ph"; fi ;;
-    1) $echo "Test 9Ph failed: files t9Ph.out and $srcdir/n+2l17f-0FF differ" 1>&2;
+    1) $echo "Test 9Ph failed: files 9Ph.O and $srcdir/n+2l17f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Ph may have failed." 1>&2;
-       $echo The command "cmp t9Ph.out $srcdir/n+2l17f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 9Ph.O $srcdir/n+2l17f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Ph.err || rm -f t9Ph.err
-$xx --test -h x -n.3 +2:5 -l 17 -f $srcdir/0FFt > t9Pi.out 2> t9Pi.err
+test -s 9Ph.E || rm -f 9Ph.E
+$xx --test -h x -n.3 +2:5 -l 17 -f $srcdir/0FFt > 9Pi.O 2> 9Pi.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pi failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pi.out $srcdir/n+2-5l17f-0FF
+  cmp 9Pi.O $srcdir/n+2-5l17f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pi"; fi ;;
-    1) $echo "Test 9Pi failed: files t9Pi.out and $srcdir/n+2-5l17f-0FF differ" 1>&2;
+    1) $echo "Test 9Pi failed: files 9Pi.O and $srcdir/n+2-5l17f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pi may have failed." 1>&2;
-       $echo The command "cmp t9Pi.out $srcdir/n+2-5l17f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pi.O $srcdir/n+2-5l17f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pi.err || rm -f t9Pi.err
-$xx --test -h x -n.3 +3 -l 17 -f $srcdir/0FFt > t9Pj.out 2> t9Pj.err
+test -s 9Pi.E || rm -f 9Pi.E
+$xx --test -h x -n.3 +3 -l 17 -f $srcdir/0FFt > 9Pj.O 2> 9Pj.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pj failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pj.out $srcdir/n+3l17f-0FF
+  cmp 9Pj.O $srcdir/n+3l17f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pj"; fi ;;
-    1) $echo "Test 9Pj failed: files t9Pj.out and $srcdir/n+3l17f-0FF differ" 1>&2;
+    1) $echo "Test 9Pj failed: files 9Pj.O and $srcdir/n+3l17f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pj may have failed." 1>&2;
-       $echo The command "cmp t9Pj.out $srcdir/n+3l17f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pj.O $srcdir/n+3l17f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pj.err || rm -f t9Pj.err
-$xx --test -h x -n.3 +3 -l 17 -f $srcdir/0FFnt > t9Pk.out 2> t9Pk.err
+test -s 9Pj.E || rm -f 9Pj.E
+$xx --test -h x -n.3 +3 -l 17 -f $srcdir/0FFnt > 9Pk.O 2> 9Pk.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pk failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pk.out $srcdir/n+3l17f-0FF
+  cmp 9Pk.O $srcdir/n+3l17f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pk"; fi ;;
-    1) $echo "Test 9Pk failed: files t9Pk.out and $srcdir/n+3l17f-0FF differ" 1>&2;
+    1) $echo "Test 9Pk failed: files 9Pk.O and $srcdir/n+3l17f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pk may have failed." 1>&2;
-       $echo The command "cmp t9Pk.out $srcdir/n+3l17f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pk.O $srcdir/n+3l17f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pk.err || rm -f t9Pk.err
-$xx --test -h x -n.3 +3 -l 17 -f $srcdir/0FnFt > t9Pl.out 2> t9Pl.err
+test -s 9Pk.E || rm -f 9Pk.E
+$xx --test -h x -n.3 +3 -l 17 -f $srcdir/0FnFt > 9Pl.O 2> 9Pl.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pl failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pl.out $srcdir/n+3l17f-0FF
+  cmp 9Pl.O $srcdir/n+3l17f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pl"; fi ;;
-    1) $echo "Test 9Pl failed: files t9Pl.out and $srcdir/n+3l17f-0FF differ" 1>&2;
+    1) $echo "Test 9Pl failed: files 9Pl.O and $srcdir/n+3l17f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pl may have failed." 1>&2;
-       $echo The command "cmp t9Pl.out $srcdir/n+3l17f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pl.O $srcdir/n+3l17f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pl.err || rm -f t9Pl.err
-$xx --test -h x -n.3 +3 -l 17 -f $srcdir/0FnFnt > t9Pm.out 2> t9Pm.err
+test -s 9Pl.E || rm -f 9Pl.E
+$xx --test -h x -n.3 +3 -l 17 -f $srcdir/0FnFnt > 9Pm.O 2> 9Pm.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pm failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pm.out $srcdir/n+3l17f-0FF
+  cmp 9Pm.O $srcdir/n+3l17f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pm"; fi ;;
-    1) $echo "Test 9Pm failed: files t9Pm.out and $srcdir/n+3l17f-0FF differ" 1>&2;
+    1) $echo "Test 9Pm failed: files 9Pm.O and $srcdir/n+3l17f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pm may have failed." 1>&2;
-       $echo The command "cmp t9Pm.out $srcdir/n+3l17f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pm.O $srcdir/n+3l17f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pm.err || rm -f t9Pm.err
-$xx --test -h x -n.3 +7 -l 24 $srcdir/FFn > t9Pn.out 2> t9Pn.err
+test -s 9Pm.E || rm -f 9Pm.E
+$xx --test -h x -n.3 +7 -l 24 $srcdir/FFn > 9Pn.O 2> 9Pn.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pn failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pn.out $srcdir/n+7l24-FF
+  cmp 9Pn.O $srcdir/n+7l24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pn"; fi ;;
-    1) $echo "Test 9Pn failed: files t9Pn.out and $srcdir/n+7l24-FF differ" 1>&2;
+    1) $echo "Test 9Pn failed: files 9Pn.O and $srcdir/n+7l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pn may have failed." 1>&2;
-       $echo The command "cmp t9Pn.out $srcdir/n+7l24-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pn.O $srcdir/n+7l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pn.err || rm -f t9Pn.err
-$xx --test -h x -n.3 +7 -l 24 $srcdir/FFtn > t9Po.out 2> t9Po.err
+test -s 9Pn.E || rm -f 9Pn.E
+$xx --test -h x -n.3 +7 -l 24 $srcdir/FFtn > 9Po.O 2> 9Po.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Po failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Po.out $srcdir/n+7l24-FF
+  cmp 9Po.O $srcdir/n+7l24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Po"; fi ;;
-    1) $echo "Test 9Po failed: files t9Po.out and $srcdir/n+7l24-FF differ" 1>&2;
+    1) $echo "Test 9Po failed: files 9Po.O and $srcdir/n+7l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Po may have failed." 1>&2;
-       $echo The command "cmp t9Po.out $srcdir/n+7l24-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Po.O $srcdir/n+7l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Po.err || rm -f t9Po.err
-$xx --test -h x -n.3 +7 -l 24 $srcdir/FnFn > t9Pp.out 2> t9Pp.err
+test -s 9Po.E || rm -f 9Po.E
+$xx --test -h x -n.3 +7 -l 24 $srcdir/FnFn > 9Pp.O 2> 9Pp.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pp failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pp.out $srcdir/n+7l24-FF
+  cmp 9Pp.O $srcdir/n+7l24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pp"; fi ;;
-    1) $echo "Test 9Pp failed: files t9Pp.out and $srcdir/n+7l24-FF differ" 1>&2;
+    1) $echo "Test 9Pp failed: files 9Pp.O and $srcdir/n+7l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pp may have failed." 1>&2;
-       $echo The command "cmp t9Pp.out $srcdir/n+7l24-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pp.O $srcdir/n+7l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pp.err || rm -f t9Pp.err
-$xx --test -h x -n.3 +3:7 -l 24 $srcdir/FnFn > t9Pq.out 2> t9Pq.err
+test -s 9Pp.E || rm -f 9Pp.E
+$xx --test -h x -n.3 +3:7 -l 24 $srcdir/FnFn > 9Pq.O 2> 9Pq.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pq failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pq.out $srcdir/n+3-7l24-FF
+  cmp 9Pq.O $srcdir/n+3-7l24-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pq"; fi ;;
-    1) $echo "Test 9Pq failed: files t9Pq.out and $srcdir/n+3-7l24-FF differ" 1>&2;
+    1) $echo "Test 9Pq failed: files 9Pq.O and $srcdir/n+3-7l24-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pq may have failed." 1>&2;
-       $echo The command "cmp t9Pq.out $srcdir/n+3-7l24-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pq.O $srcdir/n+3-7l24-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pq.err || rm -f t9Pq.err
-$xx --test -h x -n.3 +8 -l 20 $srcdir/tFFn > t9Pr.out 2> t9Pr.err
+test -s 9Pq.E || rm -f 9Pq.E
+$xx --test -h x -n.3 +8 -l 20 $srcdir/tFFn > 9Pr.O 2> 9Pr.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pr failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pr.out $srcdir/n+8l20-FF
+  cmp 9Pr.O $srcdir/n+8l20-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pr"; fi ;;
-    1) $echo "Test 9Pr failed: files t9Pr.out and $srcdir/n+8l20-FF differ" 1>&2;
+    1) $echo "Test 9Pr failed: files 9Pr.O and $srcdir/n+8l20-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pr may have failed." 1>&2;
-       $echo The command "cmp t9Pr.out $srcdir/n+8l20-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pr.O $srcdir/n+8l20-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pr.err || rm -f t9Pr.err
-$xx --test -h x -n.3 +8 -l 20 $srcdir/tFnFt > t9Ps.out 2> t9Ps.err
+test -s 9Pr.E || rm -f 9Pr.E
+$xx --test -h x -n.3 +8 -l 20 $srcdir/tFnFt > 9Ps.O 2> 9Ps.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Ps failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Ps.out $srcdir/n+8l20-FF
+  cmp 9Ps.O $srcdir/n+8l20-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Ps"; fi ;;
-    1) $echo "Test 9Ps failed: files t9Ps.out and $srcdir/n+8l20-FF differ" 1>&2;
+    1) $echo "Test 9Ps failed: files 9Ps.O and $srcdir/n+8l20-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Ps may have failed." 1>&2;
-       $echo The command "cmp t9Ps.out $srcdir/n+8l20-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Ps.O $srcdir/n+8l20-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Ps.err || rm -f t9Ps.err
-$xx --test -h x -n.3 +8 -l 20 $srcdir/tFFt > t9Pt.out 2> t9Pt.err
+test -s 9Ps.E || rm -f 9Ps.E
+$xx --test -h x -n.3 +8 -l 20 $srcdir/tFFt > 9Pt.O 2> 9Pt.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pt failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pt.out $srcdir/n+8l20-FF
+  cmp 9Pt.O $srcdir/n+8l20-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pt"; fi ;;
-    1) $echo "Test 9Pt failed: files t9Pt.out and $srcdir/n+8l20-FF differ" 1>&2;
+    1) $echo "Test 9Pt failed: files 9Pt.O and $srcdir/n+8l20-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pt may have failed." 1>&2;
-       $echo The command "cmp t9Pt.out $srcdir/n+8l20-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pt.O $srcdir/n+8l20-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pt.err || rm -f t9Pt.err
-$xx --test -h x -n.3 +5 -a -3 -l 6 -f $srcdir/0FFt > t9Paa.out 2> t9Paa.err
+test -s 9Pt.E || rm -f 9Pt.E
+$xx --test -h x -n.3 +5 -a -3 -l 6 -f $srcdir/0FFt > 9Paa.O 2> 9Paa.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Paa failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Paa.out $srcdir/n+5a3l6f-0FF
+  cmp 9Paa.O $srcdir/n+5a3l6f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Paa"; fi ;;
-    1) $echo "Test 9Paa failed: files t9Paa.out and $srcdir/n+5a3l6f-0FF differ" 1>&2;
+    1) $echo "Test 9Paa failed: files 9Paa.O and $srcdir/n+5a3l6f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Paa may have failed." 1>&2;
-       $echo The command "cmp t9Paa.out $srcdir/n+5a3l6f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 9Paa.O $srcdir/n+5a3l6f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Paa.err || rm -f t9Paa.err
-$xx --test -h x -n.3 +5 -a -3 -l 6 -f $srcdir/0FFnt > t9Pab.out 2> t9Pab.err
+test -s 9Paa.E || rm -f 9Paa.E
+$xx --test -h x -n.3 +5 -a -3 -l 6 -f $srcdir/0FFnt > 9Pab.O 2> 9Pab.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pab failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pab.out $srcdir/n+5a3l6f-0FF
+  cmp 9Pab.O $srcdir/n+5a3l6f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pab"; fi ;;
-    1) $echo "Test 9Pab failed: files t9Pab.out and $srcdir/n+5a3l6f-0FF differ" 1>&2;
+    1) $echo "Test 9Pab failed: files 9Pab.O and $srcdir/n+5a3l6f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pab may have failed." 1>&2;
-       $echo The command "cmp t9Pab.out $srcdir/n+5a3l6f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pab.O $srcdir/n+5a3l6f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pab.err || rm -f t9Pab.err
-$xx --test -h x -n.3 +5 -a -3 -l 6 -f $srcdir/0FnFt > t9Pac.out 2> t9Pac.err
+test -s 9Pab.E || rm -f 9Pab.E
+$xx --test -h x -n.3 +5 -a -3 -l 6 -f $srcdir/0FnFt > 9Pac.O 2> 9Pac.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pac failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pac.out $srcdir/n+5a3l6f-0FF
+  cmp 9Pac.O $srcdir/n+5a3l6f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pac"; fi ;;
-    1) $echo "Test 9Pac failed: files t9Pac.out and $srcdir/n+5a3l6f-0FF differ" 1>&2;
+    1) $echo "Test 9Pac failed: files 9Pac.O and $srcdir/n+5a3l6f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pac may have failed." 1>&2;
-       $echo The command "cmp t9Pac.out $srcdir/n+5a3l6f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pac.O $srcdir/n+5a3l6f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pac.err || rm -f t9Pac.err
-$xx --test -h x -n.3 +5 -a -3 -l 6 -f $srcdir/0FnFnt > t9Pad.out 2> t9Pad.err
+test -s 9Pac.E || rm -f 9Pac.E
+$xx --test -h x -n.3 +5 -a -3 -l 6 -f $srcdir/0FnFnt > 9Pad.O 2> 9Pad.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pad failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pad.out $srcdir/n+5a3l6f-0FF
+  cmp 9Pad.O $srcdir/n+5a3l6f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pad"; fi ;;
-    1) $echo "Test 9Pad failed: files t9Pad.out and $srcdir/n+5a3l6f-0FF differ" 1>&2;
+    1) $echo "Test 9Pad failed: files 9Pad.O and $srcdir/n+5a3l6f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pad may have failed." 1>&2;
-       $echo The command "cmp t9Pad.out $srcdir/n+5a3l6f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pad.O $srcdir/n+5a3l6f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pad.err || rm -f t9Pad.err
-$xx --test -h x -n.3 +6 -a -2 -l 17 $srcdir/FFn > t9Pae.out 2> t9Pae.err
+test -s 9Pad.E || rm -f 9Pad.E
+$xx --test -h x -n.3 +6 -a -2 -l 17 $srcdir/FFn > 9Pae.O 2> 9Pae.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pae failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pae.out $srcdir/n+6a2l17-FF
+  cmp 9Pae.O $srcdir/n+6a2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pae"; fi ;;
-    1) $echo "Test 9Pae failed: files t9Pae.out and $srcdir/n+6a2l17-FF differ" 1>&2;
+    1) $echo "Test 9Pae failed: files 9Pae.O and $srcdir/n+6a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pae may have failed." 1>&2;
-       $echo The command "cmp t9Pae.out $srcdir/n+6a2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pae.O $srcdir/n+6a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pae.err || rm -f t9Pae.err
-$xx --test -h x -n.3 +6 -a -2 -l 17 $srcdir/FFtn > t9Paf.out 2> t9Paf.err
+test -s 9Pae.E || rm -f 9Pae.E
+$xx --test -h x -n.3 +6 -a -2 -l 17 $srcdir/FFtn > 9Paf.O 2> 9Paf.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Paf failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Paf.out $srcdir/n+6a2l17-FF
+  cmp 9Paf.O $srcdir/n+6a2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Paf"; fi ;;
-    1) $echo "Test 9Paf failed: files t9Paf.out and $srcdir/n+6a2l17-FF differ" 1>&2;
+    1) $echo "Test 9Paf failed: files 9Paf.O and $srcdir/n+6a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Paf may have failed." 1>&2;
-       $echo The command "cmp t9Paf.out $srcdir/n+6a2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Paf.O $srcdir/n+6a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Paf.err || rm -f t9Paf.err
-$xx --test -h x -n.3 +6 -a -2 -l 17 $srcdir/FnFn > t9Pag.out 2> t9Pag.err
+test -s 9Paf.E || rm -f 9Paf.E
+$xx --test -h x -n.3 +6 -a -2 -l 17 $srcdir/FnFn > 9Pag.O 2> 9Pag.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pag failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pag.out $srcdir/n+6a2l17-FF
+  cmp 9Pag.O $srcdir/n+6a2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pag"; fi ;;
-    1) $echo "Test 9Pag failed: files t9Pag.out and $srcdir/n+6a2l17-FF differ" 1>&2;
+    1) $echo "Test 9Pag failed: files 9Pag.O and $srcdir/n+6a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pag may have failed." 1>&2;
-       $echo The command "cmp t9Pag.out $srcdir/n+6a2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pag.O $srcdir/n+6a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pag.err || rm -f t9Pag.err
-$xx --test -h x -n.3 +6 -a -2 -l 17 $srcdir/tFFn > t9Pah.out 2> t9Pah.err
+test -s 9Pag.E || rm -f 9Pag.E
+$xx --test -h x -n.3 +6 -a -2 -l 17 $srcdir/tFFn > 9Pah.O 2> 9Pah.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pah failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pah.out $srcdir/n+6a2l17-FF
+  cmp 9Pah.O $srcdir/n+6a2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pah"; fi ;;
-    1) $echo "Test 9Pah failed: files t9Pah.out and $srcdir/n+6a2l17-FF differ" 1>&2;
+    1) $echo "Test 9Pah failed: files 9Pah.O and $srcdir/n+6a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pah may have failed." 1>&2;
-       $echo The command "cmp t9Pah.out $srcdir/n+6a2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pah.O $srcdir/n+6a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pah.err || rm -f t9Pah.err
-$xx --test -h x -n.3 +6 -a -2 -l 17 $srcdir/tFnFt > t9Pai.out 2> t9Pai.err
+test -s 9Pah.E || rm -f 9Pah.E
+$xx --test -h x -n.3 +6 -a -2 -l 17 $srcdir/tFnFt > 9Pai.O 2> 9Pai.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pai failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pai.out $srcdir/n+6a2l17-FF
+  cmp 9Pai.O $srcdir/n+6a2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pai"; fi ;;
-    1) $echo "Test 9Pai failed: files t9Pai.out and $srcdir/n+6a2l17-FF differ" 1>&2;
+    1) $echo "Test 9Pai failed: files 9Pai.O and $srcdir/n+6a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pai may have failed." 1>&2;
-       $echo The command "cmp t9Pai.out $srcdir/n+6a2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pai.O $srcdir/n+6a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pai.err || rm -f t9Pai.err
-$xx --test -h x -n.3 +6 -a -2 -l 17 $srcdir/tFFt > t9Paj.out 2> t9Paj.err
+test -s 9Pai.E || rm -f 9Pai.E
+$xx --test -h x -n.3 +6 -a -2 -l 17 $srcdir/tFFt > 9Paj.O 2> 9Paj.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Paj failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Paj.out $srcdir/n+6a2l17-FF
+  cmp 9Paj.O $srcdir/n+6a2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Paj"; fi ;;
-    1) $echo "Test 9Paj failed: files t9Paj.out and $srcdir/n+6a2l17-FF differ" 1>&2;
+    1) $echo "Test 9Paj failed: files 9Paj.O and $srcdir/n+6a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Paj may have failed." 1>&2;
-       $echo The command "cmp t9Paj.out $srcdir/n+6a2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Paj.O $srcdir/n+6a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Paj.err || rm -f t9Paj.err
-$xx --test -h x -n.3 +4:8 -a -2 -l 17 $srcdir/tFFt > t9Pak.out 2> t9Pak.err
+test -s 9Paj.E || rm -f 9Paj.E
+$xx --test -h x -n.3 +4:8 -a -2 -l 17 $srcdir/tFFt > 9Pak.O 2> 9Pak.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pak failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pak.out $srcdir/n+4-8a2l17-FF
+  cmp 9Pak.O $srcdir/n+4-8a2l17-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pak"; fi ;;
-    1) $echo "Test 9Pak failed: files t9Pak.out and $srcdir/n+4-8a2l17-FF differ" 1>&2;
+    1) $echo "Test 9Pak failed: files 9Pak.O and $srcdir/n+4-8a2l17-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pak may have failed." 1>&2;
-       $echo The command "cmp t9Pak.out $srcdir/n+4-8a2l17-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pak.O $srcdir/n+4-8a2l17-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pak.err || rm -f t9Pak.err
-$xx --test -h x -n.3 +4 -b -2 -l 10 -f $srcdir/0FFt > t9Pba.out 2> t9Pba.err
+test -s 9Pak.E || rm -f 9Pak.E
+$xx --test -h x -n.3 +4 -b -2 -l 10 -f $srcdir/0FFt > 9Pba.O 2> 9Pba.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pba failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pba.out $srcdir/n+4b2l10f-0FF
+  cmp 9Pba.O $srcdir/n+4b2l10f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pba"; fi ;;
-    1) $echo "Test 9Pba failed: files t9Pba.out and $srcdir/n+4b2l10f-0FF differ" 1>&2;
+    1) $echo "Test 9Pba failed: files 9Pba.O and $srcdir/n+4b2l10f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pba may have failed." 1>&2;
-       $echo The command "cmp t9Pba.out $srcdir/n+4b2l10f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pba.O $srcdir/n+4b2l10f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pba.err || rm -f t9Pba.err
-$xx --test -h x -n.3 +4 -b -2 -l 10 -f $srcdir/0FFnt > t9Pbb.out 2> t9Pbb.err
+test -s 9Pba.E || rm -f 9Pba.E
+$xx --test -h x -n.3 +4 -b -2 -l 10 -f $srcdir/0FFnt > 9Pbb.O 2> 9Pbb.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pbb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pbb.out $srcdir/n+4b2l10f-0FF
+  cmp 9Pbb.O $srcdir/n+4b2l10f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pbb"; fi ;;
-    1) $echo "Test 9Pbb failed: files t9Pbb.out and $srcdir/n+4b2l10f-0FF differ" 1>&2;
+    1) $echo "Test 9Pbb failed: files 9Pbb.O and $srcdir/n+4b2l10f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pbb may have failed." 1>&2;
-       $echo The command "cmp t9Pbb.out $srcdir/n+4b2l10f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pbb.O $srcdir/n+4b2l10f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pbb.err || rm -f t9Pbb.err
-$xx --test -h x -n.3 +4 -b -2 -l 10 -f $srcdir/0FnFt > t9Pbc.out 2> t9Pbc.err
+test -s 9Pbb.E || rm -f 9Pbb.E
+$xx --test -h x -n.3 +4 -b -2 -l 10 -f $srcdir/0FnFt > 9Pbc.O 2> 9Pbc.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pbc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pbc.out $srcdir/n+4b2l10f-0FF
+  cmp 9Pbc.O $srcdir/n+4b2l10f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pbc"; fi ;;
-    1) $echo "Test 9Pbc failed: files t9Pbc.out and $srcdir/n+4b2l10f-0FF differ" 1>&2;
+    1) $echo "Test 9Pbc failed: files 9Pbc.O and $srcdir/n+4b2l10f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pbc may have failed." 1>&2;
-       $echo The command "cmp t9Pbc.out $srcdir/n+4b2l10f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pbc.O $srcdir/n+4b2l10f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pbc.err || rm -f t9Pbc.err
-$xx --test -h x -n.3 +4 -b -2 -l 10 -f $srcdir/0FnFnt > t9Pbd.out 2> t9Pbd.err
+test -s 9Pbc.E || rm -f 9Pbc.E
+$xx --test -h x -n.3 +4 -b -2 -l 10 -f $srcdir/0FnFnt > 9Pbd.O 2> 9Pbd.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pbd failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pbd.out $srcdir/n+4b2l10f-0FF
+  cmp 9Pbd.O $srcdir/n+4b2l10f-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pbd"; fi ;;
-    1) $echo "Test 9Pbd failed: files t9Pbd.out and $srcdir/n+4b2l10f-0FF differ" 1>&2;
+    1) $echo "Test 9Pbd failed: files 9Pbd.O and $srcdir/n+4b2l10f-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pbd may have failed." 1>&2;
-       $echo The command "cmp t9Pbd.out $srcdir/n+4b2l10f-0FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pbd.O $srcdir/n+4b2l10f-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pbd.err || rm -f t9Pbd.err
-$xx --test -h x -n.3 +6 -b -3 -l 6 -f $srcdir/FFn > t9Pbe.out 2> t9Pbe.err
+test -s 9Pbd.E || rm -f 9Pbd.E
+$xx --test -h x -n.3 +6 -b -3 -l 6 -f $srcdir/FFn > 9Pbe.O 2> 9Pbe.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pbe failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pbe.out $srcdir/n+6b3l6f-FF
+  cmp 9Pbe.O $srcdir/n+6b3l6f-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pbe"; fi ;;
-    1) $echo "Test 9Pbe failed: files t9Pbe.out and $srcdir/n+6b3l6f-FF differ" 1>&2;
+    1) $echo "Test 9Pbe failed: files 9Pbe.O and $srcdir/n+6b3l6f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pbe may have failed." 1>&2;
-       $echo The command "cmp t9Pbe.out $srcdir/n+6b3l6f-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pbe.O $srcdir/n+6b3l6f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pbe.err || rm -f t9Pbe.err
-$xx --test -h x -n.3 +6 -b -3 -l 6 -f $srcdir/FFtn > t9Pbf.out 2> t9Pbf.err
+test -s 9Pbe.E || rm -f 9Pbe.E
+$xx --test -h x -n.3 +6 -b -3 -l 6 -f $srcdir/FFtn > 9Pbf.O 2> 9Pbf.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pbf failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pbf.out $srcdir/n+6b3l6f-FF
+  cmp 9Pbf.O $srcdir/n+6b3l6f-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pbf"; fi ;;
-    1) $echo "Test 9Pbf failed: files t9Pbf.out and $srcdir/n+6b3l6f-FF differ" 1>&2;
+    1) $echo "Test 9Pbf failed: files 9Pbf.O and $srcdir/n+6b3l6f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pbf may have failed." 1>&2;
-       $echo The command "cmp t9Pbf.out $srcdir/n+6b3l6f-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pbf.O $srcdir/n+6b3l6f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pbf.err || rm -f t9Pbf.err
-$xx --test -h x -n.3 +6 -b -3 -l 6 -f $srcdir/FnFn > t9Pbg.out 2> t9Pbg.err
+test -s 9Pbf.E || rm -f 9Pbf.E
+$xx --test -h x -n.3 +6 -b -3 -l 6 -f $srcdir/FnFn > 9Pbg.O 2> 9Pbg.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pbg failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pbg.out $srcdir/n+6b3l6f-FF
+  cmp 9Pbg.O $srcdir/n+6b3l6f-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pbg"; fi ;;
-    1) $echo "Test 9Pbg failed: files t9Pbg.out and $srcdir/n+6b3l6f-FF differ" 1>&2;
+    1) $echo "Test 9Pbg failed: files 9Pbg.O and $srcdir/n+6b3l6f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pbg may have failed." 1>&2;
-       $echo The command "cmp t9Pbg.out $srcdir/n+6b3l6f-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pbg.O $srcdir/n+6b3l6f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pbg.err || rm -f t9Pbg.err
-$xx --test -h x -n.3 +6 -b -3 -l 6 -f $srcdir/tFFn > t9Pbh.out 2> t9Pbh.err
+test -s 9Pbg.E || rm -f 9Pbg.E
+$xx --test -h x -n.3 +6 -b -3 -l 6 -f $srcdir/tFFn > 9Pbh.O 2> 9Pbh.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pbh failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pbh.out $srcdir/n+6b3l6f-FF
+  cmp 9Pbh.O $srcdir/n+6b3l6f-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pbh"; fi ;;
-    1) $echo "Test 9Pbh failed: files t9Pbh.out and $srcdir/n+6b3l6f-FF differ" 1>&2;
+    1) $echo "Test 9Pbh failed: files 9Pbh.O and $srcdir/n+6b3l6f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pbh may have failed." 1>&2;
-       $echo The command "cmp t9Pbh.out $srcdir/n+6b3l6f-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pbh.O $srcdir/n+6b3l6f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pbh.err || rm -f t9Pbh.err
-$xx --test -h x -n.3 +6 -b -3 -l 6 -f $srcdir/tFnFt > t9Pbi.out 2> t9Pbi.err
+test -s 9Pbh.E || rm -f 9Pbh.E
+$xx --test -h x -n.3 +6 -b -3 -l 6 -f $srcdir/tFnFt > 9Pbi.O 2> 9Pbi.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pbi failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pbi.out $srcdir/n+6b3l6f-FF
+  cmp 9Pbi.O $srcdir/n+6b3l6f-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pbi"; fi ;;
-    1) $echo "Test 9Pbi failed: files t9Pbi.out and $srcdir/n+6b3l6f-FF differ" 1>&2;
+    1) $echo "Test 9Pbi failed: files 9Pbi.O and $srcdir/n+6b3l6f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pbi may have failed." 1>&2;
-       $echo The command "cmp t9Pbi.out $srcdir/n+6b3l6f-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pbi.O $srcdir/n+6b3l6f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pbi.err || rm -f t9Pbi.err
-$xx --test -h x -n.3 +6 -b -3 -l 6 -f $srcdir/tFFt > t9Pbj.out 2> t9Pbj.err
+test -s 9Pbi.E || rm -f 9Pbi.E
+$xx --test -h x -n.3 +6 -b -3 -l 6 -f $srcdir/tFFt > 9Pbj.O 2> 9Pbj.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pbj failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pbj.out $srcdir/n+6b3l6f-FF
+  cmp 9Pbj.O $srcdir/n+6b3l6f-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pbj"; fi ;;
-    1) $echo "Test 9Pbj failed: files t9Pbj.out and $srcdir/n+6b3l6f-FF differ" 1>&2;
+    1) $echo "Test 9Pbj failed: files 9Pbj.O and $srcdir/n+6b3l6f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pbj may have failed." 1>&2;
-       $echo The command "cmp t9Pbj.out $srcdir/n+6b3l6f-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pbj.O $srcdir/n+6b3l6f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pbj.err || rm -f t9Pbj.err
-$xx --test -h x -n.3 +5:8 -b -3 -l 10 -f $srcdir/FnFn > t9Pbk.out 2> t9Pbk.err
+test -s 9Pbj.E || rm -f 9Pbj.E
+$xx --test -h x -n.3 +5:8 -b -3 -l 10 -f $srcdir/FnFn > 9Pbk.O 2> 9Pbk.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pbk failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pbk.out $srcdir/n+5-8b3l10f-FF
+  cmp 9Pbk.O $srcdir/n+5-8b3l10f-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pbk"; fi ;;
-    1) $echo "Test 9Pbk failed: files t9Pbk.out and $srcdir/n+5-8b3l10f-FF differ" 1>&2;
+    1) $echo "Test 9Pbk failed: files 9Pbk.O and $srcdir/n+5-8b3l10f-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pbk may have failed." 1>&2;
-       $echo The command "cmp t9Pbk.out $srcdir/n+5-8b3l10f-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pbk.O $srcdir/n+5-8b3l10f-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pbk.err || rm -f t9Pbk.err
-$xx --test -h x -n.3 +3 -m -l 13 -f $srcdir/tFFt-bl $srcdir/FnFn > t9Pma.out 2> t9Pma.err
+test -s 9Pbk.E || rm -f 9Pbk.E
+$xx --test -h x -n.3 +3 -m -l 13 -f $srcdir/tFFt-bl $srcdir/FnFn > 9Pma.O 2> 9Pma.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pma failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pma.out $srcdir/n+3ml13f-bl-FF
+  cmp 9Pma.O $srcdir/n+3ml13f-bl-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pma"; fi ;;
-    1) $echo "Test 9Pma failed: files t9Pma.out and $srcdir/n+3ml13f-bl-FF differ" 1>&2;
+    1) $echo "Test 9Pma failed: files 9Pma.O and $srcdir/n+3ml13f-bl-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pma may have failed." 1>&2;
-       $echo The command "cmp t9Pma.out $srcdir/n+3ml13f-bl-FF" failed. 1>&2 ;
+       $echo The command "cmp 9Pma.O $srcdir/n+3ml13f-bl-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pma.err || rm -f t9Pma.err
-$xx --test -h x -n.3 +3 -m -l 17 -f $srcdir/tFFt-bl $srcdir/tn > t9Pmb.out 2> t9Pmb.err
+test -s 9Pma.E || rm -f 9Pma.E
+$xx --test -h x -n.3 +3 -m -l 17 -f $srcdir/tFFt-bl $srcdir/tn > 9Pmb.O 2> 9Pmb.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pmb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pmb.out $srcdir/n+3ml17f-bl-tn
+  cmp 9Pmb.O $srcdir/n+3ml17f-bl-tn
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pmb"; fi ;;
-    1) $echo "Test 9Pmb failed: files t9Pmb.out and $srcdir/n+3ml17f-bl-tn differ" 1>&2;
+    1) $echo "Test 9Pmb failed: files 9Pmb.O and $srcdir/n+3ml17f-bl-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pmb may have failed." 1>&2;
-       $echo The command "cmp t9Pmb.out $srcdir/n+3ml17f-bl-tn" failed. 1>&2 ;
+       $echo The command "cmp 9Pmb.O $srcdir/n+3ml17f-bl-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pmb.err || rm -f t9Pmb.err
-$xx --test -h x -n.3 +3 -m -l 17 -f $srcdir/tn $srcdir/tFFt-bl > t9Pmc.out 2> t9Pmc.err
+test -s 9Pmb.E || rm -f 9Pmb.E
+$xx --test -h x -n.3 +3 -m -l 17 -f $srcdir/tn $srcdir/tFFt-bl > 9Pmc.O 2> 9Pmc.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 9Pmc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9Pmc.out $srcdir/n+3ml17f-tn-bl
+  cmp 9Pmc.O $srcdir/n+3ml17f-tn-bl
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 9Pmc"; fi ;;
-    1) $echo "Test 9Pmc failed: files t9Pmc.out and $srcdir/n+3ml17f-tn-bl differ" 1>&2;
+    1) $echo "Test 9Pmc failed: files 9Pmc.O and $srcdir/n+3ml17f-tn-bl differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 9Pmc may have failed." 1>&2;
-       $echo The command "cmp t9Pmc.out $srcdir/n+3ml17f-tn-bl" failed. 1>&2 ;
+       $echo The command "cmp 9Pmc.O $srcdir/n+3ml17f-tn-bl" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9Pmc.err || rm -f t9Pmc.err
-$xx --test -h x -w 72 -j $srcdir/0FnFnt > t10a.out 2> t10a.err
+test -s 9Pmc.E || rm -f 9Pmc.E
+$xx --test -h x -w 72 -j $srcdir/0FnFnt > 10a.O 2> 10a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10a.out $srcdir/w72j-0FF
+  cmp 10a.O $srcdir/w72j-0FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10a"; fi ;;
-    1) $echo "Test 10a failed: files t10a.out and $srcdir/w72j-0FF differ" 1>&2;
+    1) $echo "Test 10a failed: files 10a.O and $srcdir/w72j-0FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10a may have failed." 1>&2;
-       $echo The command "cmp t10a.out $srcdir/w72j-0FF" failed. 1>&2 ;
+       $echo The command "cmp 10a.O $srcdir/w72j-0FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10a.err || rm -f t10a.err
-$xx --test -h x -w 48 -l17 -f $srcdir/tFFt-lm > t10b.out 2> t10b.err
+test -s 10a.E || rm -f 10a.E
+$xx --test -h x -w 48 -l17 -f $srcdir/tFFt-lm > 10b.O 2> 10b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10b.out $srcdir/w48l17f-lm
+  cmp 10b.O $srcdir/w48l17f-lm
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10b"; fi ;;
-    1) $echo "Test 10b failed: files t10b.out and $srcdir/w48l17f-lm differ" 1>&2;
+    1) $echo "Test 10b failed: files 10b.O and $srcdir/w48l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10b may have failed." 1>&2;
-       $echo The command "cmp t10b.out $srcdir/w48l17f-lm" failed. 1>&2 ;
+       $echo The command "cmp 10b.O $srcdir/w48l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10b.err || rm -f t10b.err
-$xx --test -h x -w 26 -l17 -f $srcdir/tFFt-lm > t10c.out 2> t10c.err
+test -s 10b.E || rm -f 10b.E
+$xx --test -h x -w 26 -l17 -f $srcdir/tFFt-lm > 10c.O 2> 10c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10c failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10c.out $srcdir/w26l17f-lm
+  cmp 10c.O $srcdir/w26l17f-lm
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10c"; fi ;;
-    1) $echo "Test 10c failed: files t10c.out and $srcdir/w26l17f-lm differ" 1>&2;
+    1) $echo "Test 10c failed: files 10c.O and $srcdir/w26l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10c may have failed." 1>&2;
-       $echo The command "cmp t10c.out $srcdir/w26l17f-lm" failed. 1>&2 ;
+       $echo The command "cmp 10c.O $srcdir/w26l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10c.err || rm -f t10c.err
-$xx --test -h x -w 25 -l17 -f $srcdir/tFFt-lm > t10d.out 2> t10d.err
+test -s 10c.E || rm -f 10c.E
+$xx --test -h x -w 25 -l17 -f $srcdir/tFFt-lm > 10d.O 2> 10d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10d failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10d.out $srcdir/w25l17f-lm
+  cmp 10d.O $srcdir/w25l17f-lm
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10d"; fi ;;
-    1) $echo "Test 10d failed: files t10d.out and $srcdir/w25l17f-lm differ" 1>&2;
+    1) $echo "Test 10d failed: files 10d.O and $srcdir/w25l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10d may have failed." 1>&2;
-       $echo The command "cmp t10d.out $srcdir/w25l17f-lm" failed. 1>&2 ;
+       $echo The command "cmp 10d.O $srcdir/w25l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10d.err || rm -f t10d.err
-$xx --test -h x -w 20 -l17 -f $srcdir/tFFt-lm > t10e.out 2> t10e.err
+test -s 10d.E || rm -f 10d.E
+$xx --test -h x -w 20 -l17 -f $srcdir/tFFt-lm > 10e.O 2> 10e.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10e failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10e.out $srcdir/w20l17f-lm
+  cmp 10e.O $srcdir/w20l17f-lm
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10e"; fi ;;
-    1) $echo "Test 10e failed: files t10e.out and $srcdir/w20l17f-lm differ" 1>&2;
+    1) $echo "Test 10e failed: files 10e.O and $srcdir/w20l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10e may have failed." 1>&2;
-       $echo The command "cmp t10e.out $srcdir/w20l17f-lm" failed. 1>&2 ;
+       $echo The command "cmp 10e.O $srcdir/w20l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10e.err || rm -f t10e.err
-$xx --test -h x -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli > t10ma.out 2> t10ma.err
+test -s 10e.E || rm -f 10e.E
+$xx --test -h x -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli > 10ma.O 2> 10ma.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10ma failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10ma.out $srcdir/ml17f-lm-lo
+  cmp 10ma.O $srcdir/ml17f-lm-lo
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10ma"; fi ;;
-    1) $echo "Test 10ma failed: files t10ma.out and $srcdir/ml17f-lm-lo differ" 1>&2;
+    1) $echo "Test 10ma failed: files 10ma.O and $srcdir/ml17f-lm-lo differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10ma may have failed." 1>&2;
-       $echo The command "cmp t10ma.out $srcdir/ml17f-lm-lo" failed. 1>&2 ;
+       $echo The command "cmp 10ma.O $srcdir/ml17f-lm-lo" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10ma.err || rm -f t10ma.err
-$xx --test -h x -w 35 -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli > t10mb.out 2> t10mb.err
+test -s 10ma.E || rm -f 10ma.E
+$xx --test -h x -w 35 -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli > 10mb.O 2> 10mb.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10mb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10mb.out $srcdir/w35ml17f-lm-lo
+  cmp 10mb.O $srcdir/w35ml17f-lm-lo
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10mb"; fi ;;
-    1) $echo "Test 10mb failed: files t10mb.out and $srcdir/w35ml17f-lm-lo differ" 1>&2;
+    1) $echo "Test 10mb failed: files 10mb.O and $srcdir/w35ml17f-lm-lo differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10mb may have failed." 1>&2;
-       $echo The command "cmp t10mb.out $srcdir/w35ml17f-lm-lo" failed. 1>&2 ;
+       $echo The command "cmp 10mb.O $srcdir/w35ml17f-lm-lo" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10mb.err || rm -f t10mb.err
-$xx --test -h x -j -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli > t10mc.out 2> t10mc.err
+test -s 10mb.E || rm -f 10mb.E
+$xx --test -h x -j -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli > 10mc.O 2> 10mc.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10mc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10mc.out $srcdir/jml17f-lm-lo
+  cmp 10mc.O $srcdir/jml17f-lm-lo
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10mc"; fi ;;
-    1) $echo "Test 10mc failed: files t10mc.out and $srcdir/jml17f-lm-lo differ" 1>&2;
+    1) $echo "Test 10mc failed: files 10mc.O and $srcdir/jml17f-lm-lo differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10mc may have failed." 1>&2;
-       $echo The command "cmp t10mc.out $srcdir/jml17f-lm-lo" failed. 1>&2 ;
+       $echo The command "cmp 10mc.O $srcdir/jml17f-lm-lo" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10mc.err || rm -f t10mc.err
-$xx --test -h x -w 35 -j -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli > t10md.out 2> t10md.err
+test -s 10mc.E || rm -f 10mc.E
+$xx --test -h x -w 35 -j -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli > 10md.O 2> 10md.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10md failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10md.out $srcdir/w35jml17f-lm-lo
+  cmp 10md.O $srcdir/w35jml17f-lm-lo
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10md"; fi ;;
-    1) $echo "Test 10md failed: files t10md.out and $srcdir/w35jml17f-lm-lo differ" 1>&2;
+    1) $echo "Test 10md failed: files 10md.O and $srcdir/w35jml17f-lm-lo differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10md may have failed." 1>&2;
-       $echo The command "cmp t10md.out $srcdir/w35jml17f-lm-lo" failed. 1>&2 ;
+       $echo The command "cmp 10md.O $srcdir/w35jml17f-lm-lo" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10md.err || rm -f t10md.err
-$xx --test -h x -n.3 -j -m -l 17 -f $srcdir/tFFt-lm $srcdir/tFFt-lm $srcdir/loli > t10me.out 2> t10me.err
+test -s 10md.E || rm -f 10md.E
+$xx --test -h x -n.3 -j -m -l 17 -f $srcdir/tFFt-lm $srcdir/tFFt-lm $srcdir/loli > 10me.O 2> 10me.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10me failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10me.out $srcdir/njml17f-lm-lm-lo
+  cmp 10me.O $srcdir/njml17f-lm-lm-lo
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10me"; fi ;;
-    1) $echo "Test 10me failed: files t10me.out and $srcdir/njml17f-lm-lm-lo differ" 1>&2;
+    1) $echo "Test 10me failed: files 10me.O and $srcdir/njml17f-lm-lm-lo differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10me may have failed." 1>&2;
-       $echo The command "cmp t10me.out $srcdir/njml17f-lm-lm-lo" failed. 1>&2 ;
+       $echo The command "cmp 10me.O $srcdir/njml17f-lm-lm-lo" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10me.err || rm -f t10me.err
-$xx --test -h x -n.3 -j -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli $srcdir/tFFt-lm > t10mf.out 2> t10mf.err
+test -s 10me.E || rm -f 10me.E
+$xx --test -h x -n.3 -j -m -l 17 -f $srcdir/tFFt-lm $srcdir/loli $srcdir/tFFt-lm > 10mf.O 2> 10mf.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10mf failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10mf.out $srcdir/njml17f-lm-lo-lm
+  cmp 10mf.O $srcdir/njml17f-lm-lo-lm
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10mf"; fi ;;
-    1) $echo "Test 10mf failed: files t10mf.out and $srcdir/njml17f-lm-lo-lm differ" 1>&2;
+    1) $echo "Test 10mf failed: files 10mf.O and $srcdir/njml17f-lm-lo-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10mf may have failed." 1>&2;
-       $echo The command "cmp t10mf.out $srcdir/njml17f-lm-lo-lm" failed. 1>&2 ;
+       $echo The command "cmp 10mf.O $srcdir/njml17f-lm-lo-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10mf.err || rm -f t10mf.err
-$xx --test -h x -a -3 -l 17 -f $srcdir/tFFt-lm > t10aa.out 2> t10aa.err
+test -s 10mf.E || rm -f 10mf.E
+$xx --test -h x -a -3 -l 17 -f $srcdir/tFFt-lm > 10aa.O 2> 10aa.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10aa failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10aa.out $srcdir/a3l17f-lm
+  cmp 10aa.O $srcdir/a3l17f-lm
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10aa"; fi ;;
-    1) $echo "Test 10aa failed: files t10aa.out and $srcdir/a3l17f-lm differ" 1>&2;
+    1) $echo "Test 10aa failed: files 10aa.O and $srcdir/a3l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10aa may have failed." 1>&2;
-       $echo The command "cmp t10aa.out $srcdir/a3l17f-lm" failed. 1>&2 ;
+       $echo The command "cmp 10aa.O $srcdir/a3l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10aa.err || rm -f t10aa.err
-$xx --test -h x -w 35 -a -3 -l 17 -f $srcdir/tFFt-lm > t10ab.out 2> t10ab.err
+test -s 10aa.E || rm -f 10aa.E
+$xx --test -h x -w 35 -a -3 -l 17 -f $srcdir/tFFt-lm > 10ab.O 2> 10ab.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10ab failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10ab.out $srcdir/w35a3l17f-lm
+  cmp 10ab.O $srcdir/w35a3l17f-lm
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10ab"; fi ;;
-    1) $echo "Test 10ab failed: files t10ab.out and $srcdir/w35a3l17f-lm differ" 1>&2;
+    1) $echo "Test 10ab failed: files 10ab.O and $srcdir/w35a3l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10ab may have failed." 1>&2;
-       $echo The command "cmp t10ab.out $srcdir/w35a3l17f-lm" failed. 1>&2 ;
+       $echo The command "cmp 10ab.O $srcdir/w35a3l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10ab.err || rm -f t10ab.err
-$xx --test -h x -j -a -3 -l 17 -f $srcdir/tFFt-lm > t10ac.out 2> t10ac.err
+test -s 10ab.E || rm -f 10ab.E
+$xx --test -h x -j -a -3 -l 17 -f $srcdir/tFFt-lm > 10ac.O 2> 10ac.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10ac failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10ac.out $srcdir/ja3l17f-lm
+  cmp 10ac.O $srcdir/ja3l17f-lm
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10ac"; fi ;;
-    1) $echo "Test 10ac failed: files t10ac.out and $srcdir/ja3l17f-lm differ" 1>&2;
+    1) $echo "Test 10ac failed: files 10ac.O and $srcdir/ja3l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10ac may have failed." 1>&2;
-       $echo The command "cmp t10ac.out $srcdir/ja3l17f-lm" failed. 1>&2 ;
+       $echo The command "cmp 10ac.O $srcdir/ja3l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10ac.err || rm -f t10ac.err
-$xx --test -h x -w 35 -j -a -3 -l 17 -f $srcdir/tFFt-lm > t10ad.out 2> t10ad.err
+test -s 10ac.E || rm -f 10ac.E
+$xx --test -h x -w 35 -j -a -3 -l 17 -f $srcdir/tFFt-lm > 10ad.O 2> 10ad.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10ad failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10ad.out $srcdir/w35ja3l17f-lm
+  cmp 10ad.O $srcdir/w35ja3l17f-lm
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10ad"; fi ;;
-    1) $echo "Test 10ad failed: files t10ad.out and $srcdir/w35ja3l17f-lm differ" 1>&2;
+    1) $echo "Test 10ad failed: files 10ad.O and $srcdir/w35ja3l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10ad may have failed." 1>&2;
-       $echo The command "cmp t10ad.out $srcdir/w35ja3l17f-lm" failed. 1>&2 ;
+       $echo The command "cmp 10ad.O $srcdir/w35ja3l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10ad.err || rm -f t10ad.err
-$xx --test -h x -b -3 -l 17 -f $srcdir/tFFt-lm > t10ba.out 2> t10ba.err
+test -s 10ad.E || rm -f 10ad.E
+$xx --test -h x -b -3 -l 17 -f $srcdir/tFFt-lm > 10ba.O 2> 10ba.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10ba failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10ba.out $srcdir/b3l17f-lm
+  cmp 10ba.O $srcdir/b3l17f-lm
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10ba"; fi ;;
-    1) $echo "Test 10ba failed: files t10ba.out and $srcdir/b3l17f-lm differ" 1>&2;
+    1) $echo "Test 10ba failed: files 10ba.O and $srcdir/b3l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10ba may have failed." 1>&2;
-       $echo The command "cmp t10ba.out $srcdir/b3l17f-lm" failed. 1>&2 ;
+       $echo The command "cmp 10ba.O $srcdir/b3l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10ba.err || rm -f t10ba.err
-$xx --test -h x -w 35 -b -3 -l 17 -f $srcdir/tFFt-lm > t10bb.out 2> t10bb.err
+test -s 10ba.E || rm -f 10ba.E
+$xx --test -h x -w 35 -b -3 -l 17 -f $srcdir/tFFt-lm > 10bb.O 2> 10bb.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10bb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10bb.out $srcdir/w35b3l17f-lm
+  cmp 10bb.O $srcdir/w35b3l17f-lm
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10bb"; fi ;;
-    1) $echo "Test 10bb failed: files t10bb.out and $srcdir/w35b3l17f-lm differ" 1>&2;
+    1) $echo "Test 10bb failed: files 10bb.O and $srcdir/w35b3l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10bb may have failed." 1>&2;
-       $echo The command "cmp t10bb.out $srcdir/w35b3l17f-lm" failed. 1>&2 ;
+       $echo The command "cmp 10bb.O $srcdir/w35b3l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10bb.err || rm -f t10bb.err
-$xx --test -h x -j -b -3 -l 17 -f $srcdir/tFFt-lm > t10bc.out 2> t10bc.err
+test -s 10bb.E || rm -f 10bb.E
+$xx --test -h x -j -b -3 -l 17 -f $srcdir/tFFt-lm > 10bc.O 2> 10bc.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10bc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10bc.out $srcdir/jb3l17f-lm
+  cmp 10bc.O $srcdir/jb3l17f-lm
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10bc"; fi ;;
-    1) $echo "Test 10bc failed: files t10bc.out and $srcdir/jb3l17f-lm differ" 1>&2;
+    1) $echo "Test 10bc failed: files 10bc.O and $srcdir/jb3l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10bc may have failed." 1>&2;
-       $echo The command "cmp t10bc.out $srcdir/jb3l17f-lm" failed. 1>&2 ;
+       $echo The command "cmp 10bc.O $srcdir/jb3l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10bc.err || rm -f t10bc.err
-$xx --test -h x -w 35 -j -b -3 -l 17 -f $srcdir/tFFt-lm > t10bd.out 2> t10bd.err
+test -s 10bc.E || rm -f 10bc.E
+$xx --test -h x -w 35 -j -b -3 -l 17 -f $srcdir/tFFt-lm > 10bd.O 2> 10bd.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10bd failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10bd.out $srcdir/w35jb3l17f-lm
+  cmp 10bd.O $srcdir/w35jb3l17f-lm
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10bd"; fi ;;
-    1) $echo "Test 10bd failed: files t10bd.out and $srcdir/w35jb3l17f-lm differ" 1>&2;
+    1) $echo "Test 10bd failed: files 10bd.O and $srcdir/w35jb3l17f-lm differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10bd may have failed." 1>&2;
-       $echo The command "cmp t10bd.out $srcdir/w35jb3l17f-lm" failed. 1>&2 ;
+       $echo The command "cmp 10bd.O $srcdir/w35jb3l17f-lm" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10bd.err || rm -f t10bd.err
-$xx --test -h x -n.3 -s:--: -m -l 13 -f $srcdir/tFFt-bl $srcdir/FnFn > t11a.out 2> t11a.err
+test -s 10bd.E || rm -f 10bd.E
+$xx --test -h x -n.3 -s:--: -m -l 13 -f $srcdir/tFFt-bl $srcdir/FnFn > 11a.O 2> 11a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 11a failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t11a.out $srcdir/nsml13-bl-FF
+  cmp 11a.O $srcdir/nsml13-bl-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 11a"; fi ;;
-    1) $echo "Test 11a failed: files t11a.out and $srcdir/nsml13-bl-FF differ" 1>&2;
+    1) $echo "Test 11a failed: files 11a.O and $srcdir/nsml13-bl-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 11a may have failed." 1>&2;
-       $echo The command "cmp t11a.out $srcdir/nsml13-bl-FF" failed. 1>&2 ;
+       $echo The command "cmp 11a.O $srcdir/nsml13-bl-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t11a.err || rm -f t11a.err
-$xx --test -h x -n.3 -s:--: -m -l 17 -f $srcdir/tFFt-bl $srcdir/FnFn > t11b.out 2> t11b.err
+test -s 11a.E || rm -f 11a.E
+$xx --test -h x -n.3 -s:--: -m -l 17 -f $srcdir/tFFt-bl $srcdir/FnFn > 11b.O 2> 11b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 11b failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t11b.out $srcdir/nsml17-bl-FF
+  cmp 11b.O $srcdir/nsml17-bl-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 11b"; fi ;;
-    1) $echo "Test 11b failed: files t11b.out and $srcdir/nsml17-bl-FF differ" 1>&2;
+    1) $echo "Test 11b failed: files 11b.O and $srcdir/nsml17-bl-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 11b may have failed." 1>&2;
-       $echo The command "cmp t11b.out $srcdir/nsml17-bl-FF" failed. 1>&2 ;
+       $echo The command "cmp 11b.O $srcdir/nsml17-bl-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t11b.err || rm -f t11b.err
-$xx --test -h x -n.3 -s:--: -m -l 13 -f $srcdir/tn $srcdir/tn $srcdir/FnFn > t11e.out 2> t11e.err
+test -s 11b.E || rm -f 11b.E
+$xx --test -h x -n.3 -s:--: -m -l 13 -f $srcdir/tn $srcdir/tn $srcdir/FnFn > 11e.O 2> 11e.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 11e failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t11e.out $srcdir/nsml13-t-t-FF
+  cmp 11e.O $srcdir/nsml13-t-t-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 11e"; fi ;;
-    1) $echo "Test 11e failed: files t11e.out and $srcdir/nsml13-t-t-FF differ" 1>&2;
+    1) $echo "Test 11e failed: files 11e.O and $srcdir/nsml13-t-t-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 11e may have failed." 1>&2;
-       $echo The command "cmp t11e.out $srcdir/nsml13-t-t-FF" failed. 1>&2 ;
+       $echo The command "cmp 11e.O $srcdir/nsml13-t-t-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t11e.err || rm -f t11e.err
-$xx --test -h x -n.3 -s:--: -m -l 17 -f $srcdir/tn $srcdir/tn $srcdir/FnFn > t11f.out 2> t11f.err
+test -s 11e.E || rm -f 11e.E
+$xx --test -h x -n.3 -s:--: -m -l 17 -f $srcdir/tn $srcdir/tn $srcdir/FnFn > 11f.O 2> 11f.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 11f failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t11f.out $srcdir/nsml17-t-t-FF
+  cmp 11f.O $srcdir/nsml17-t-t-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 11f"; fi ;;
-    1) $echo "Test 11f failed: files t11f.out and $srcdir/nsml17-t-t-FF differ" 1>&2;
+    1) $echo "Test 11f failed: files 11f.O and $srcdir/nsml17-t-t-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 11f may have failed." 1>&2;
-       $echo The command "cmp t11f.out $srcdir/nsml17-t-t-FF" failed. 1>&2 ;
+       $echo The command "cmp 11f.O $srcdir/nsml17-t-t-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t11f.err || rm -f t11f.err
-$xx --test -h x -n.3 -s:--: -m -l 13 -f $srcdir/tn $srcdir/tn $srcdir/FnFn $srcdir/FnFn > t11g.out 2> t11g.err
+test -s 11f.E || rm -f 11f.E
+$xx --test -h x -n.3 -s:--: -m -l 13 -f $srcdir/tn $srcdir/tn $srcdir/FnFn $srcdir/FnFn > 11g.O 2> 11g.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 11g failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t11g.out $srcdir/nsml13-t-t-FF-FF
+  cmp 11g.O $srcdir/nsml13-t-t-FF-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 11g"; fi ;;
-    1) $echo "Test 11g failed: files t11g.out and $srcdir/nsml13-t-t-FF-FF differ" 1>&2;
+    1) $echo "Test 11g failed: files 11g.O and $srcdir/nsml13-t-t-FF-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 11g may have failed." 1>&2;
-       $echo The command "cmp t11g.out $srcdir/nsml13-t-t-FF-FF" failed. 1>&2 ;
+       $echo The command "cmp 11g.O $srcdir/nsml13-t-t-FF-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t11g.err || rm -f t11g.err
-$xx --test -h x -n.3 -s:--: -m -l 17 -f $srcdir/tn $srcdir/tn $srcdir/FnFn $srcdir/FnFn > t11h.out 2> t11h.err
+test -s 11g.E || rm -f 11g.E
+$xx --test -h x -n.3 -s:--: -m -l 17 -f $srcdir/tn $srcdir/tn $srcdir/FnFn $srcdir/FnFn > 11h.O 2> 11h.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 11h failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t11h.out $srcdir/nsml17-t-t-FF-FF
+  cmp 11h.O $srcdir/nsml17-t-t-FF-FF
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 11h"; fi ;;
-    1) $echo "Test 11h failed: files t11h.out and $srcdir/nsml17-t-t-FF-FF differ" 1>&2;
+    1) $echo "Test 11h failed: files 11h.O and $srcdir/nsml17-t-t-FF-FF differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 11h may have failed." 1>&2;
-       $echo The command "cmp t11h.out $srcdir/nsml17-t-t-FF-FF" failed. 1>&2 ;
+       $echo The command "cmp 11h.O $srcdir/nsml17-t-t-FF-FF" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t11h.err || rm -f t11h.err
-$xx --test -h x -o3 -a -3 -l17 -f $srcdir/tn > t12aa.out 2> t12aa.err
+test -s 11h.E || rm -f 11h.E
+$xx --test -h x -o3 -a -3 -l17 -f $srcdir/tn > 12aa.O 2> 12aa.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 12aa failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t12aa.out $srcdir/o3a3l17f-tn
+  cmp 12aa.O $srcdir/o3a3l17f-tn
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 12aa"; fi ;;
-    1) $echo "Test 12aa failed: files t12aa.out and $srcdir/o3a3l17f-tn differ" 1>&2;
+    1) $echo "Test 12aa failed: files 12aa.O and $srcdir/o3a3l17f-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 12aa may have failed." 1>&2;
-       $echo The command "cmp t12aa.out $srcdir/o3a3l17f-tn" failed. 1>&2 ;
+       $echo The command "cmp 12aa.O $srcdir/o3a3l17f-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t12aa.err || rm -f t12aa.err
-$xx --test -h x -o3 -a -3 -s:--: -l17 -f $srcdir/tn > t12ab.out 2> t12ab.err
+test -s 12aa.E || rm -f 12aa.E
+$xx --test -h x -o3 -a -3 -s:--: -l17 -f $srcdir/tn > 12ab.O 2> 12ab.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 12ab failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t12ab.out $srcdir/o3a3sl17f-tn
+  cmp 12ab.O $srcdir/o3a3sl17f-tn
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 12ab"; fi ;;
-    1) $echo "Test 12ab failed: files t12ab.out and $srcdir/o3a3sl17f-tn differ" 1>&2;
+    1) $echo "Test 12ab failed: files 12ab.O and $srcdir/o3a3sl17f-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 12ab may have failed." 1>&2;
-       $echo The command "cmp t12ab.out $srcdir/o3a3sl17f-tn" failed. 1>&2 ;
+       $echo The command "cmp 12ab.O $srcdir/o3a3sl17f-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t12ab.err || rm -f t12ab.err
-$xx --test -h x -o3 -a -3 -s:--: -n. -l17 -f $srcdir/tn > t12ac.out 2> t12ac.err
+test -s 12ab.E || rm -f 12ab.E
+$xx --test -h x -o3 -a -3 -s:--: -n. -l17 -f $srcdir/tn > 12ac.O 2> 12ac.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 12ac failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t12ac.out $srcdir/o3a3snl17f-tn
+  cmp 12ac.O $srcdir/o3a3snl17f-tn
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 12ac"; fi ;;
-    1) $echo "Test 12ac failed: files t12ac.out and $srcdir/o3a3snl17f-tn differ" 1>&2;
+    1) $echo "Test 12ac failed: files 12ac.O and $srcdir/o3a3snl17f-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 12ac may have failed." 1>&2;
-       $echo The command "cmp t12ac.out $srcdir/o3a3snl17f-tn" failed. 1>&2 ;
+       $echo The command "cmp 12ac.O $srcdir/o3a3snl17f-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t12ac.err || rm -f t12ac.err
-$xx --test -h x -o3 -b -3 -l17 -f $srcdir/tn > t12ba.out 2> t12ba.err
+test -s 12ac.E || rm -f 12ac.E
+$xx --test -h x -o3 -b -3 -l17 -f $srcdir/tn > 12ba.O 2> 12ba.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 12ba failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t12ba.out $srcdir/o3b3l17f-tn
+  cmp 12ba.O $srcdir/o3b3l17f-tn
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 12ba"; fi ;;
-    1) $echo "Test 12ba failed: files t12ba.out and $srcdir/o3b3l17f-tn differ" 1>&2;
+    1) $echo "Test 12ba failed: files 12ba.O and $srcdir/o3b3l17f-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 12ba may have failed." 1>&2;
-       $echo The command "cmp t12ba.out $srcdir/o3b3l17f-tn" failed. 1>&2 ;
+       $echo The command "cmp 12ba.O $srcdir/o3b3l17f-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t12ba.err || rm -f t12ba.err
-$xx --test -h x -o3 -b -3 -s:--: -l17 -f $srcdir/tn > t12bb.out 2> t12bb.err
+test -s 12ba.E || rm -f 12ba.E
+$xx --test -h x -o3 -b -3 -s:--: -l17 -f $srcdir/tn > 12bb.O 2> 12bb.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 12bb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t12bb.out $srcdir/o3b3sl17f-tn
+  cmp 12bb.O $srcdir/o3b3sl17f-tn
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 12bb"; fi ;;
-    1) $echo "Test 12bb failed: files t12bb.out and $srcdir/o3b3sl17f-tn differ" 1>&2;
+    1) $echo "Test 12bb failed: files 12bb.O and $srcdir/o3b3sl17f-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 12bb may have failed." 1>&2;
-       $echo The command "cmp t12bb.out $srcdir/o3b3sl17f-tn" failed. 1>&2 ;
+       $echo The command "cmp 12bb.O $srcdir/o3b3sl17f-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t12bb.err || rm -f t12bb.err
-$xx --test -h x -o3 -b -3 -s:--: -n. -l17 -f $srcdir/tn > t12bc.out 2> t12bc.err
+test -s 12bb.E || rm -f 12bb.E
+$xx --test -h x -o3 -b -3 -s:--: -n. -l17 -f $srcdir/tn > 12bc.O 2> 12bc.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 12bc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t12bc.out $srcdir/o3b3snl17f-tn
+  cmp 12bc.O $srcdir/o3b3snl17f-tn
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 12bc"; fi ;;
-    1) $echo "Test 12bc failed: files t12bc.out and $srcdir/o3b3snl17f-tn differ" 1>&2;
+    1) $echo "Test 12bc failed: files 12bc.O and $srcdir/o3b3snl17f-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 12bc may have failed." 1>&2;
-       $echo The command "cmp t12bc.out $srcdir/o3b3snl17f-tn" failed. 1>&2 ;
+       $echo The command "cmp 12bc.O $srcdir/o3b3snl17f-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t12bc.err || rm -f t12bc.err
-$xx --test -h x -o3 -m -l17 -f $srcdir/tFFt-bl $srcdir/tn > t12ma.out 2> t12ma.err
+test -s 12bc.E || rm -f 12bc.E
+$xx --test -h x -o3 -m -l17 -f $srcdir/tFFt-bl $srcdir/tn > 12ma.O 2> 12ma.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 12ma failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t12ma.out $srcdir/o3ml17f-bl-tn
+  cmp 12ma.O $srcdir/o3ml17f-bl-tn
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 12ma"; fi ;;
-    1) $echo "Test 12ma failed: files t12ma.out and $srcdir/o3ml17f-bl-tn differ" 1>&2;
+    1) $echo "Test 12ma failed: files 12ma.O and $srcdir/o3ml17f-bl-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 12ma may have failed." 1>&2;
-       $echo The command "cmp t12ma.out $srcdir/o3ml17f-bl-tn" failed. 1>&2 ;
+       $echo The command "cmp 12ma.O $srcdir/o3ml17f-bl-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t12ma.err || rm -f t12ma.err
-$xx --test -h x -o3 -m -s:--: -l17 -f $srcdir/tFFt-bl $srcdir/tn > t12mb.out 2> t12mb.err
+test -s 12ma.E || rm -f 12ma.E
+$xx --test -h x -o3 -m -s:--: -l17 -f $srcdir/tFFt-bl $srcdir/tn > 12mb.O 2> 12mb.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 12mb failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t12mb.out $srcdir/o3msl17f-bl-tn
+  cmp 12mb.O $srcdir/o3msl17f-bl-tn
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 12mb"; fi ;;
-    1) $echo "Test 12mb failed: files t12mb.out and $srcdir/o3msl17f-bl-tn differ" 1>&2;
+    1) $echo "Test 12mb failed: files 12mb.O and $srcdir/o3msl17f-bl-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 12mb may have failed." 1>&2;
-       $echo The command "cmp t12mb.out $srcdir/o3msl17f-bl-tn" failed. 1>&2 ;
+       $echo The command "cmp 12mb.O $srcdir/o3msl17f-bl-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t12mb.err || rm -f t12mb.err
-$xx --test -h x -o3 -m -s:--: -n. -l17 -f $srcdir/tFFt-bl $srcdir/tn > t12mc.out 2> t12mc.err
+test -s 12mb.E || rm -f 12mb.E
+$xx --test -h x -o3 -m -s:--: -n. -l17 -f $srcdir/tFFt-bl $srcdir/tn > 12mc.O 2> 12mc.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 12mc failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t12mc.out $srcdir/o3msnl17f-bl-tn
+  cmp 12mc.O $srcdir/o3msnl17f-bl-tn
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 12mc"; fi ;;
-    1) $echo "Test 12mc failed: files t12mc.out and $srcdir/o3msnl17f-bl-tn differ" 1>&2;
+    1) $echo "Test 12mc failed: files 12mc.O and $srcdir/o3msnl17f-bl-tn differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 12mc may have failed." 1>&2;
-       $echo The command "cmp t12mc.out $srcdir/o3msnl17f-bl-tn" failed. 1>&2 ;
+       $echo The command "cmp 12mc.O $srcdir/o3msnl17f-bl-tn" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t12mc.err || rm -f t12mc.err
-$xx --test -h x -o3 -j -m -l17 -f $srcdir/tFFt-lm $srcdir/loli > t12md.out 2> t12md.err
+test -s 12mc.E || rm -f 12mc.E
+$xx --test -h x -o3 -j -m -l17 -f $srcdir/tFFt-lm $srcdir/loli > 12md.O 2> 12md.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 12md failed: ../../src/pr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t12md.out $srcdir/o3jml17f-lm-lo
+  cmp 12md.O $srcdir/o3jml17f-lm-lo
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 12md"; fi ;;
-    1) $echo "Test 12md failed: files t12md.out and $srcdir/o3jml17f-lm-lo differ" 1>&2;
+    1) $echo "Test 12md failed: files 12md.O and $srcdir/o3jml17f-lm-lo differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 12md may have failed." 1>&2;
-       $echo The command "cmp t12md.out $srcdir/o3jml17f-lm-lo" failed. 1>&2 ;
+       $echo The command "cmp 12md.O $srcdir/o3jml17f-lm-lo" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t12md.err || rm -f t12md.err
+test -s 12md.E || rm -f 12md.E
 if test $errors = 0 ; then
   $echo Passed all 216 tests. 1>&2
 else
diff --git a/tests/sort/.cvsignore b/tests/sort/.cvsignore
index 8f8f8b0bb..852508156 100644
--- a/tests/sort/.cvsignore
+++ b/tests/sort/.cvsignore
@@ -1,6 +1,8 @@
-t*.out
-t*.in
-t*.exp
-t*.err
+*.I
+*.E
+*.X
+*.O
+*-tests
+build-script
 Makefile
 mk-script
diff --git a/tests/sort/Makefile.am b/tests/sort/Makefile.am
index 9c25e34c6..829122b80 100644
--- a/tests/sort/Makefile.am
+++ b/tests/sort/Makefile.am
@@ -3,44 +3,32 @@
 ##test-files-begin
 x = sort
 explicit =
-maint_gen = t01a.in t01a.exp t02a.in t02a.exp t02b.in t02b.exp t02c.in \
-t02c.exp t02d.in t02d.exp t02e.in t02e.exp t02f.in t02f.exp t03a.in t03a.exp \
-t03b.in t03b.exp t03c.in t03c.exp t03d.in t03d.exp t03e.in t03e.exp t03f.in \
-t03f.exp t03g.in t03g.exp t03h.in t03h.exp t03i.in t03i.exp t04a.in t04a.exp \
-t04b.in t04b.exp t04c.in t04c.exp t04d.in t04d.exp t04e.in t04e.exp t05a.in \
-t05a.exp t05b.in t05b.exp t05c.in t05c.exp t05d.in t05d.exp t05e.in t05e.exp \
-t05f.in t05f.exp t06a.in t06a.exp t06b.in t06b.exp t06c.in t06c.exp t06d.in \
-t06d.exp t06e.in t06e.exp t06f.in t06f.exp t07a.in t07a.exp t07b.in t07b.exp \
-t07c.in t07c.exp t07d.in t07d.exp t08a.in t08a.exp t08b.in t08b.exp t09a.in \
-t09a.exp t09b.in t09b.exp t09c.in t09c.exp t09d.in t09d.exp t10a.in t10a.exp \
-t10b.in t10b.exp t10c.in t10c.exp t10d.in t10d.exp t10a0.in t10a0.exp \
-t10a1.in t10a1.exp t10a2.in t10a2.exp t10e.in t10e.exp t10f.in t10f.exp \
-t10g.in t10g.exp t11a.in t11a.exp t11b.in t11b.exp t11c.in t11c.exp t11d.in \
-t11d.exp t12a.in t12a.exp t12b.in t12b.exp t12c.in t12c.exp t12d.in t12d.exp \
-t13a.in t13a.exp t13b.in t13b.exp t14a.in t14a.exp t14b.in t14b.exp t15a.in \
-t15a.exp t15b.in t15b.exp t15c.in t15c.exp t15d.in t15d.exp t15e.in t15e.exp \
-t16a.in t16a.exp t17.in t17.exp t18a.in t18a.exp t18b.in t18b.exp t18c.in \
-t18c.exp t18d.in t18d.exp t18e.in t18e.exp
-run_gen = t01a.out t01a.err t02a.out t02a.err t02b.out t02b.err t02c.out \
-t02c.err t02d.out t02d.err t02e.out t02e.err t02f.out t02f.err t03a.out \
-t03a.err t03b.out t03b.err t03c.out t03c.err t03d.out t03d.err t03e.out \
-t03e.err t03f.out t03f.err t03g.out t03g.err t03h.out t03h.err t03i.out \
-t03i.err t04a.out t04a.err t04b.out t04b.err t04c.out t04c.err t04d.out \
-t04d.err t04e.out t04e.err t05a.out t05a.err t05b.out t05b.err t05c.out \
-t05c.err t05d.out t05d.err t05e.out t05e.err t05f.out t05f.err t06a.out \
-t06a.err t06b.out t06b.err t06c.out t06c.err t06d.out t06d.err t06e.out \
-t06e.err t06f.out t06f.err t07a.out t07a.err t07b.out t07b.err t07c.out \
-t07c.err t07d.out t07d.err t08a.out t08a.err t08b.out t08b.err t09a.out \
-t09a.err t09b.out t09b.err t09c.out t09c.err t09d.out t09d.err t10a.out \
-t10a.err t10b.out t10b.err t10c.out t10c.err t10d.out t10d.err t10a0.out \
-t10a0.err t10a1.out t10a1.err t10a2.out t10a2.err t10e.out t10e.err t10f.out \
-t10f.err t10g.out t10g.err t11a.out t11a.err t11b.out t11b.err t11c.out \
-t11c.err t11d.out t11d.err t12a.out t12a.err t12b.out t12b.err t12c.out \
-t12c.err t12d.out t12d.err t13a.out t13a.err t13b.out t13b.err t14a.out \
-t14a.err t14b.out t14b.err t15a.out t15a.err t15b.out t15b.err t15c.out \
-t15c.err t15d.out t15d.err t15e.out t15e.err t16a.out t16a.err t17.out \
-t17.err t18a.out t18a.err t18b.out t18b.err t18c.out t18c.err t18d.out \
-t18d.err t18e.out t18e.err
+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
+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
 ##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 9dfdc011c..a506e1038 100644
--- a/tests/sort/Makefile.in
+++ b/tests/sort/Makefile.in
@@ -44,44 +44,32 @@ CC = @CC@
 
 x = sort
 explicit =
-maint_gen = t01a.in t01a.exp t02a.in t02a.exp t02b.in t02b.exp t02c.in \
-t02c.exp t02d.in t02d.exp t02e.in t02e.exp t02f.in t02f.exp t03a.in t03a.exp \
-t03b.in t03b.exp t03c.in t03c.exp t03d.in t03d.exp t03e.in t03e.exp t03f.in \
-t03f.exp t03g.in t03g.exp t03h.in t03h.exp t03i.in t03i.exp t04a.in t04a.exp \
-t04b.in t04b.exp t04c.in t04c.exp t04d.in t04d.exp t04e.in t04e.exp t05a.in \
-t05a.exp t05b.in t05b.exp t05c.in t05c.exp t05d.in t05d.exp t05e.in t05e.exp \
-t05f.in t05f.exp t06a.in t06a.exp t06b.in t06b.exp t06c.in t06c.exp t06d.in \
-t06d.exp t06e.in t06e.exp t06f.in t06f.exp t07a.in t07a.exp t07b.in t07b.exp \
-t07c.in t07c.exp t07d.in t07d.exp t08a.in t08a.exp t08b.in t08b.exp t09a.in \
-t09a.exp t09b.in t09b.exp t09c.in t09c.exp t09d.in t09d.exp t10a.in t10a.exp \
-t10b.in t10b.exp t10c.in t10c.exp t10d.in t10d.exp t10a0.in t10a0.exp \
-t10a1.in t10a1.exp t10a2.in t10a2.exp t10e.in t10e.exp t10f.in t10f.exp \
-t10g.in t10g.exp t11a.in t11a.exp t11b.in t11b.exp t11c.in t11c.exp t11d.in \
-t11d.exp t12a.in t12a.exp t12b.in t12b.exp t12c.in t12c.exp t12d.in t12d.exp \
-t13a.in t13a.exp t13b.in t13b.exp t14a.in t14a.exp t14b.in t14b.exp t15a.in \
-t15a.exp t15b.in t15b.exp t15c.in t15c.exp t15d.in t15d.exp t15e.in t15e.exp \
-t16a.in t16a.exp t17.in t17.exp t18a.in t18a.exp t18b.in t18b.exp t18c.in \
-t18c.exp t18d.in t18d.exp t18e.in t18e.exp
-run_gen = t01a.out t01a.err t02a.out t02a.err t02b.out t02b.err t02c.out \
-t02c.err t02d.out t02d.err t02e.out t02e.err t02f.out t02f.err t03a.out \
-t03a.err t03b.out t03b.err t03c.out t03c.err t03d.out t03d.err t03e.out \
-t03e.err t03f.out t03f.err t03g.out t03g.err t03h.out t03h.err t03i.out \
-t03i.err t04a.out t04a.err t04b.out t04b.err t04c.out t04c.err t04d.out \
-t04d.err t04e.out t04e.err t05a.out t05a.err t05b.out t05b.err t05c.out \
-t05c.err t05d.out t05d.err t05e.out t05e.err t05f.out t05f.err t06a.out \
-t06a.err t06b.out t06b.err t06c.out t06c.err t06d.out t06d.err t06e.out \
-t06e.err t06f.out t06f.err t07a.out t07a.err t07b.out t07b.err t07c.out \
-t07c.err t07d.out t07d.err t08a.out t08a.err t08b.out t08b.err t09a.out \
-t09a.err t09b.out t09b.err t09c.out t09c.err t09d.out t09d.err t10a.out \
-t10a.err t10b.out t10b.err t10c.out t10c.err t10d.out t10d.err t10a0.out \
-t10a0.err t10a1.out t10a1.err t10a2.out t10a2.err t10e.out t10e.err t10f.out \
-t10f.err t10g.out t10g.err t11a.out t11a.err t11b.out t11b.err t11c.out \
-t11c.err t11d.out t11d.err t12a.out t12a.err t12b.out t12b.err t12c.out \
-t12c.err t12d.out t12d.err t13a.out t13a.err t13b.out t13b.err t14a.out \
-t14a.err t14b.out t14b.err t15a.out t15a.err t15b.out t15b.err t15c.out \
-t15c.err t15d.out t15d.err t15e.out t15e.err t16a.out t16a.err t17.out \
-t17.err t18a.out t18a.err t18b.out t18b.err t18c.out t18c.err t18d.out \
-t18d.err t18e.out t18e.err
+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
+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
 
 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 4a7427be6..6fb31b741 100755
--- a/tests/sort/sort-tests
+++ b/tests/sort/sort-tests
@@ -9,1315 +9,1315 @@ $echo testing program: $xx
 errors=0
 test "$srcdir" || srcdir=.
 test "$VERBOSE" && $xx --version 2> /dev/null
-$xx  $srcdir/t01a.in > t01a.out 2> t01a.err
+$xx  $srcdir/01a.I > 01a.O 2> 01a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 01a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t01a.out $srcdir/t01a.exp
+  cmp 01a.O $srcdir/01a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 01a"; fi ;;
-    1) $echo "Test 01a failed: files t01a.out and $srcdir/t01a.exp differ" 1>&2;
+    1) $echo "Test 01a failed: files 01a.O and $srcdir/01a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 01a may have failed." 1>&2;
-       $echo The command "cmp t01a.out $srcdir/t01a.exp" failed. 1>&2 ;
+       $echo The command "cmp 01a.O $srcdir/01a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t01a.err || rm -f t01a.err
-$xx -c $srcdir/t02a.in > t02a.out 2> t02a.err
+test -s 01a.E || rm -f 01a.E
+$xx -c $srcdir/02a.I > 02a.O 2> 02a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 02a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t02a.out $srcdir/t02a.exp
+  cmp 02a.O $srcdir/02a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 02a"; fi ;;
-    1) $echo "Test 02a failed: files t02a.out and $srcdir/t02a.exp differ" 1>&2;
+    1) $echo "Test 02a failed: files 02a.O and $srcdir/02a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 02a may have failed." 1>&2;
-       $echo The command "cmp t02a.out $srcdir/t02a.exp" failed. 1>&2 ;
+       $echo The command "cmp 02a.O $srcdir/02a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t02a.err || rm -f t02a.err
-$xx -c $srcdir/t02b.in > t02b.out 2> t02b.err
+test -s 02a.E || rm -f 02a.E
+$xx -c $srcdir/02b.I > 02b.O 2> 02b.E
 code=$?
 if test $code != 1 ; then
   $echo "Test 02b failed: ../../src/sort return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t02b.out $srcdir/t02b.exp
+  cmp 02b.O $srcdir/02b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 02b"; fi ;;
-    1) $echo "Test 02b failed: files t02b.out and $srcdir/t02b.exp differ" 1>&2;
+    1) $echo "Test 02b failed: files 02b.O and $srcdir/02b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 02b may have failed." 1>&2;
-       $echo The command "cmp t02b.out $srcdir/t02b.exp" failed. 1>&2 ;
+       $echo The command "cmp 02b.O $srcdir/02b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t02b.err || rm -f t02b.err
-$xx -cu $srcdir/t02c.in > t02c.out 2> t02c.err
+test -s 02b.E || rm -f 02b.E
+$xx -cu $srcdir/02c.I > 02c.O 2> 02c.E
 code=$?
 if test $code != 1 ; then
   $echo "Test 02c failed: ../../src/sort return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t02c.out $srcdir/t02c.exp
+  cmp 02c.O $srcdir/02c.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 02c"; fi ;;
-    1) $echo "Test 02c failed: files t02c.out and $srcdir/t02c.exp differ" 1>&2;
+    1) $echo "Test 02c failed: files 02c.O and $srcdir/02c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 02c may have failed." 1>&2;
-       $echo The command "cmp t02c.out $srcdir/t02c.exp" failed. 1>&2 ;
+       $echo The command "cmp 02c.O $srcdir/02c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t02c.err || rm -f t02c.err
-$xx -cu $srcdir/t02d.in > t02d.out 2> t02d.err
+test -s 02c.E || rm -f 02c.E
+$xx -cu $srcdir/02d.I > 02d.O 2> 02d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 02d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t02d.out $srcdir/t02d.exp
+  cmp 02d.O $srcdir/02d.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 02d"; fi ;;
-    1) $echo "Test 02d failed: files t02d.out and $srcdir/t02d.exp differ" 1>&2;
+    1) $echo "Test 02d failed: files 02d.O and $srcdir/02d.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 02d may have failed." 1>&2;
-       $echo The command "cmp t02d.out $srcdir/t02d.exp" failed. 1>&2 ;
+       $echo The command "cmp 02d.O $srcdir/02d.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t02d.err || rm -f t02d.err
-$xx -cu $srcdir/t02e.in > t02e.out 2> t02e.err
+test -s 02d.E || rm -f 02d.E
+$xx -cu $srcdir/02e.I > 02e.O 2> 02e.E
 code=$?
 if test $code != 1 ; then
   $echo "Test 02e failed: ../../src/sort return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t02e.out $srcdir/t02e.exp
+  cmp 02e.O $srcdir/02e.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 02e"; fi ;;
-    1) $echo "Test 02e failed: files t02e.out and $srcdir/t02e.exp differ" 1>&2;
+    1) $echo "Test 02e failed: files 02e.O and $srcdir/02e.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 02e may have failed." 1>&2;
-       $echo The command "cmp t02e.out $srcdir/t02e.exp" failed. 1>&2 ;
+       $echo The command "cmp 02e.O $srcdir/02e.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t02e.err || rm -f t02e.err
-$xx -cu $srcdir/t02f.in > t02f.out 2> t02f.err
+test -s 02e.E || rm -f 02e.E
+$xx -cu $srcdir/02f.I > 02f.O 2> 02f.E
 code=$?
 if test $code != 1 ; then
   $echo "Test 02f failed: ../../src/sort return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t02f.out $srcdir/t02f.exp
+  cmp 02f.O $srcdir/02f.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 02f"; fi ;;
-    1) $echo "Test 02f failed: files t02f.out and $srcdir/t02f.exp differ" 1>&2;
+    1) $echo "Test 02f failed: files 02f.O and $srcdir/02f.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 02f may have failed." 1>&2;
-       $echo The command "cmp t02f.out $srcdir/t02f.exp" failed. 1>&2 ;
+       $echo The command "cmp 02f.O $srcdir/02f.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t02f.err || rm -f t02f.err
-$xx -k1 $srcdir/t03a.in > t03a.out 2> t03a.err
+test -s 02f.E || rm -f 02f.E
+$xx -k1 $srcdir/03a.I > 03a.O 2> 03a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 03a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t03a.out $srcdir/t03a.exp
+  cmp 03a.O $srcdir/03a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 03a"; fi ;;
-    1) $echo "Test 03a failed: files t03a.out and $srcdir/t03a.exp differ" 1>&2;
+    1) $echo "Test 03a failed: files 03a.O and $srcdir/03a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 03a may have failed." 1>&2;
-       $echo The command "cmp t03a.out $srcdir/t03a.exp" failed. 1>&2 ;
+       $echo The command "cmp 03a.O $srcdir/03a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t03a.err || rm -f t03a.err
-$xx -k1,1 $srcdir/t03b.in > t03b.out 2> t03b.err
+test -s 03a.E || rm -f 03a.E
+$xx -k1,1 $srcdir/03b.I > 03b.O 2> 03b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 03b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t03b.out $srcdir/t03b.exp
+  cmp 03b.O $srcdir/03b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 03b"; fi ;;
-    1) $echo "Test 03b failed: files t03b.out and $srcdir/t03b.exp differ" 1>&2;
+    1) $echo "Test 03b failed: files 03b.O and $srcdir/03b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 03b may have failed." 1>&2;
-       $echo The command "cmp t03b.out $srcdir/t03b.exp" failed. 1>&2 ;
+       $echo The command "cmp 03b.O $srcdir/03b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t03b.err || rm -f t03b.err
-$xx -k1 -k2 $srcdir/t03c.in > t03c.out 2> t03c.err
+test -s 03b.E || rm -f 03b.E
+$xx -k1 -k2 $srcdir/03c.I > 03c.O 2> 03c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 03c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t03c.out $srcdir/t03c.exp
+  cmp 03c.O $srcdir/03c.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 03c"; fi ;;
-    1) $echo "Test 03c failed: files t03c.out and $srcdir/t03c.exp differ" 1>&2;
+    1) $echo "Test 03c failed: files 03c.O and $srcdir/03c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 03c may have failed." 1>&2;
-       $echo The command "cmp t03c.out $srcdir/t03c.exp" failed. 1>&2 ;
+       $echo The command "cmp 03c.O $srcdir/03c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t03c.err || rm -f t03c.err
-$xx -k0 $srcdir/t03d.in > t03d.out 2> t03d.err
+test -s 03c.E || rm -f 03c.E
+$xx -k0 $srcdir/03d.I > 03d.O 2> 03d.E
 code=$?
 if test $code != 2 ; then
   $echo "Test 03d failed: ../../src/sort return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t03d.out $srcdir/t03d.exp
+  cmp 03d.O $srcdir/03d.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 03d"; fi ;;
-    1) $echo "Test 03d failed: files t03d.out and $srcdir/t03d.exp differ" 1>&2;
+    1) $echo "Test 03d failed: files 03d.O and $srcdir/03d.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 03d may have failed." 1>&2;
-       $echo The command "cmp t03d.out $srcdir/t03d.exp" failed. 1>&2 ;
+       $echo The command "cmp 03d.O $srcdir/03d.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t03d.err || rm -f t03d.err
-$xx -k1.0 $srcdir/t03e.in > t03e.out 2> t03e.err
+test -s 03d.E || rm -f 03d.E
+$xx -k1.0 $srcdir/03e.I > 03e.O 2> 03e.E
 code=$?
 if test $code != 2 ; then
   $echo "Test 03e failed: ../../src/sort return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t03e.out $srcdir/t03e.exp
+  cmp 03e.O $srcdir/03e.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 03e"; fi ;;
-    1) $echo "Test 03e failed: files t03e.out and $srcdir/t03e.exp differ" 1>&2;
+    1) $echo "Test 03e failed: files 03e.O and $srcdir/03e.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 03e may have failed." 1>&2;
-       $echo The command "cmp t03e.out $srcdir/t03e.exp" failed. 1>&2 ;
+       $echo The command "cmp 03e.O $srcdir/03e.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t03e.err || rm -f t03e.err
-$xx -k1.1,-k0 $srcdir/t03f.in > t03f.out 2> t03f.err
+test -s 03e.E || rm -f 03e.E
+$xx -k1.1,-k0 $srcdir/03f.I > 03f.O 2> 03f.E
 code=$?
 if test $code != 2 ; then
   $echo "Test 03f failed: ../../src/sort return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t03f.out $srcdir/t03f.exp
+  cmp 03f.O $srcdir/03f.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 03f"; fi ;;
-    1) $echo "Test 03f failed: files t03f.out and $srcdir/t03f.exp differ" 1>&2;
+    1) $echo "Test 03f failed: files 03f.O and $srcdir/03f.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 03f may have failed." 1>&2;
-       $echo The command "cmp t03f.out $srcdir/t03f.exp" failed. 1>&2 ;
+       $echo The command "cmp 03f.O $srcdir/03f.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t03f.err || rm -f t03f.err
-$xx -k1.1,1.0 $srcdir/t03g.in > t03g.out 2> t03g.err
+test -s 03f.E || rm -f 03f.E
+$xx -k1.1,1.0 $srcdir/03g.I > 03g.O 2> 03g.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 03g failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t03g.out $srcdir/t03g.exp
+  cmp 03g.O $srcdir/03g.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 03g"; fi ;;
-    1) $echo "Test 03g failed: files t03g.out and $srcdir/t03g.exp differ" 1>&2;
+    1) $echo "Test 03g failed: files 03g.O and $srcdir/03g.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 03g may have failed." 1>&2;
-       $echo The command "cmp t03g.out $srcdir/t03g.exp" failed. 1>&2 ;
+       $echo The command "cmp 03g.O $srcdir/03g.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t03g.err || rm -f t03g.err
-$xx -k1.1,1 $srcdir/t03h.in > t03h.out 2> t03h.err
+test -s 03g.E || rm -f 03g.E
+$xx -k1.1,1 $srcdir/03h.I > 03h.O 2> 03h.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 03h failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t03h.out $srcdir/t03h.exp
+  cmp 03h.O $srcdir/03h.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 03h"; fi ;;
-    1) $echo "Test 03h failed: files t03h.out and $srcdir/t03h.exp differ" 1>&2;
+    1) $echo "Test 03h failed: files 03h.O and $srcdir/03h.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 03h may have failed." 1>&2;
-       $echo The command "cmp t03h.out $srcdir/t03h.exp" failed. 1>&2 ;
+       $echo The command "cmp 03h.O $srcdir/03h.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t03h.err || rm -f t03h.err
-$xx -k1,1 $srcdir/t03i.in > t03i.out 2> t03i.err
+test -s 03h.E || rm -f 03h.E
+$xx -k1,1 $srcdir/03i.I > 03i.O 2> 03i.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 03i failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t03i.out $srcdir/t03i.exp
+  cmp 03i.O $srcdir/03i.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 03i"; fi ;;
-    1) $echo "Test 03i failed: files t03i.out and $srcdir/t03i.exp differ" 1>&2;
+    1) $echo "Test 03i failed: files 03i.O and $srcdir/03i.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 03i may have failed." 1>&2;
-       $echo The command "cmp t03i.out $srcdir/t03i.exp" failed. 1>&2 ;
+       $echo The command "cmp 03i.O $srcdir/03i.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t03i.err || rm -f t03i.err
-$xx -nc $srcdir/t04a.in > t04a.out 2> t04a.err
+test -s 03i.E || rm -f 03i.E
+$xx -nc $srcdir/04a.I > 04a.O 2> 04a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 04a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t04a.out $srcdir/t04a.exp
+  cmp 04a.O $srcdir/04a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 04a"; fi ;;
-    1) $echo "Test 04a failed: files t04a.out and $srcdir/t04a.exp differ" 1>&2;
+    1) $echo "Test 04a failed: files 04a.O and $srcdir/04a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 04a may have failed." 1>&2;
-       $echo The command "cmp t04a.out $srcdir/t04a.exp" failed. 1>&2 ;
+       $echo The command "cmp 04a.O $srcdir/04a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t04a.err || rm -f t04a.err
-$xx -n $srcdir/t04b.in > t04b.out 2> t04b.err
+test -s 04a.E || rm -f 04a.E
+$xx -n $srcdir/04b.I > 04b.O 2> 04b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 04b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t04b.out $srcdir/t04b.exp
+  cmp 04b.O $srcdir/04b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 04b"; fi ;;
-    1) $echo "Test 04b failed: files t04b.out and $srcdir/t04b.exp differ" 1>&2;
+    1) $echo "Test 04b failed: files 04b.O and $srcdir/04b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 04b may have failed." 1>&2;
-       $echo The command "cmp t04b.out $srcdir/t04b.exp" failed. 1>&2 ;
+       $echo The command "cmp 04b.O $srcdir/04b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t04b.err || rm -f t04b.err
-$xx -k1n $srcdir/t04c.in > t04c.out 2> t04c.err
+test -s 04b.E || rm -f 04b.E
+$xx -k1n $srcdir/04c.I > 04c.O 2> 04c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 04c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t04c.out $srcdir/t04c.exp
+  cmp 04c.O $srcdir/04c.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 04c"; fi ;;
-    1) $echo "Test 04c failed: files t04c.out and $srcdir/t04c.exp differ" 1>&2;
+    1) $echo "Test 04c failed: files 04c.O and $srcdir/04c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 04c may have failed." 1>&2;
-       $echo The command "cmp t04c.out $srcdir/t04c.exp" failed. 1>&2 ;
+       $echo The command "cmp 04c.O $srcdir/04c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t04c.err || rm -f t04c.err
-$xx -k1 $srcdir/t04d.in > t04d.out 2> t04d.err
+test -s 04c.E || rm -f 04c.E
+$xx -k1 $srcdir/04d.I > 04d.O 2> 04d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 04d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t04d.out $srcdir/t04d.exp
+  cmp 04d.O $srcdir/04d.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 04d"; fi ;;
-    1) $echo "Test 04d failed: files t04d.out and $srcdir/t04d.exp differ" 1>&2;
+    1) $echo "Test 04d failed: files 04d.O and $srcdir/04d.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 04d may have failed." 1>&2;
-       $echo The command "cmp t04d.out $srcdir/t04d.exp" failed. 1>&2 ;
+       $echo The command "cmp 04d.O $srcdir/04d.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t04d.err || rm -f t04d.err
-$xx -k2 $srcdir/t04e.in > t04e.out 2> t04e.err
+test -s 04d.E || rm -f 04d.E
+$xx -k2 $srcdir/04e.I > 04e.O 2> 04e.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 04e failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t04e.out $srcdir/t04e.exp
+  cmp 04e.O $srcdir/04e.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 04e"; fi ;;
-    1) $echo "Test 04e failed: files t04e.out and $srcdir/t04e.exp differ" 1>&2;
+    1) $echo "Test 04e failed: files 04e.O and $srcdir/04e.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 04e may have failed." 1>&2;
-       $echo The command "cmp t04e.out $srcdir/t04e.exp" failed. 1>&2 ;
+       $echo The command "cmp 04e.O $srcdir/04e.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t04e.err || rm -f t04e.err
-$xx -k1,2 $srcdir/t05a.in > t05a.out 2> t05a.err
+test -s 04e.E || rm -f 04e.E
+$xx -k1,2 $srcdir/05a.I > 05a.O 2> 05a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 05a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t05a.out $srcdir/t05a.exp
+  cmp 05a.O $srcdir/05a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 05a"; fi ;;
-    1) $echo "Test 05a failed: files t05a.out and $srcdir/t05a.exp differ" 1>&2;
+    1) $echo "Test 05a failed: files 05a.O and $srcdir/05a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 05a may have failed." 1>&2;
-       $echo The command "cmp t05a.out $srcdir/t05a.exp" failed. 1>&2 ;
+       $echo The command "cmp 05a.O $srcdir/05a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t05a.err || rm -f t05a.err
-$xx -k1,2 $srcdir/t05b.in > t05b.out 2> t05b.err
+test -s 05a.E || rm -f 05a.E
+$xx -k1,2 $srcdir/05b.I > 05b.O 2> 05b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 05b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t05b.out $srcdir/t05b.exp
+  cmp 05b.O $srcdir/05b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 05b"; fi ;;
-    1) $echo "Test 05b failed: files t05b.out and $srcdir/t05b.exp differ" 1>&2;
+    1) $echo "Test 05b failed: files 05b.O and $srcdir/05b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 05b may have failed." 1>&2;
-       $echo The command "cmp t05b.out $srcdir/t05b.exp" failed. 1>&2 ;
+       $echo The command "cmp 05b.O $srcdir/05b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t05b.err || rm -f t05b.err
-$xx -k1 -k2 $srcdir/t05c.in > t05c.out 2> t05c.err
+test -s 05b.E || rm -f 05b.E
+$xx -k1 -k2 $srcdir/05c.I > 05c.O 2> 05c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 05c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t05c.out $srcdir/t05c.exp
+  cmp 05c.O $srcdir/05c.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 05c"; fi ;;
-    1) $echo "Test 05c failed: files t05c.out and $srcdir/t05c.exp differ" 1>&2;
+    1) $echo "Test 05c failed: files 05c.O and $srcdir/05c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 05c may have failed." 1>&2;
-       $echo The command "cmp t05c.out $srcdir/t05c.exp" failed. 1>&2 ;
+       $echo The command "cmp 05c.O $srcdir/05c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t05c.err || rm -f t05c.err
-$xx -k2,2 $srcdir/t05d.in > t05d.out 2> t05d.err
+test -s 05c.E || rm -f 05c.E
+$xx -k2,2 $srcdir/05d.I > 05d.O 2> 05d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 05d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t05d.out $srcdir/t05d.exp
+  cmp 05d.O $srcdir/05d.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 05d"; fi ;;
-    1) $echo "Test 05d failed: files t05d.out and $srcdir/t05d.exp differ" 1>&2;
+    1) $echo "Test 05d failed: files 05d.O and $srcdir/05d.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 05d may have failed." 1>&2;
-       $echo The command "cmp t05d.out $srcdir/t05d.exp" failed. 1>&2 ;
+       $echo The command "cmp 05d.O $srcdir/05d.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t05d.err || rm -f t05d.err
-$xx -k2,2 $srcdir/t05e.in > t05e.out 2> t05e.err
+test -s 05d.E || rm -f 05d.E
+$xx -k2,2 $srcdir/05e.I > 05e.O 2> 05e.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 05e failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t05e.out $srcdir/t05e.exp
+  cmp 05e.O $srcdir/05e.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 05e"; fi ;;
-    1) $echo "Test 05e failed: files t05e.out and $srcdir/t05e.exp differ" 1>&2;
+    1) $echo "Test 05e failed: files 05e.O and $srcdir/05e.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 05e may have failed." 1>&2;
-       $echo The command "cmp t05e.out $srcdir/t05e.exp" failed. 1>&2 ;
+       $echo The command "cmp 05e.O $srcdir/05e.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t05e.err || rm -f t05e.err
-$xx -k2,2 $srcdir/t05f.in > t05f.out 2> t05f.err
+test -s 05e.E || rm -f 05e.E
+$xx -k2,2 $srcdir/05f.I > 05f.O 2> 05f.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 05f failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t05f.out $srcdir/t05f.exp
+  cmp 05f.O $srcdir/05f.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 05f"; fi ;;
-    1) $echo "Test 05f failed: files t05f.out and $srcdir/t05f.exp differ" 1>&2;
+    1) $echo "Test 05f failed: files 05f.O and $srcdir/05f.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 05f may have failed." 1>&2;
-       $echo The command "cmp t05f.out $srcdir/t05f.exp" failed. 1>&2 ;
+       $echo The command "cmp 05f.O $srcdir/05f.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t05f.err || rm -f t05f.err
-$xx -k 1,2 $srcdir/t06a.in > t06a.out 2> t06a.err
+test -s 05f.E || rm -f 05f.E
+$xx -k 1,2 $srcdir/06a.I > 06a.O 2> 06a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 06a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t06a.out $srcdir/t06a.exp
+  cmp 06a.O $srcdir/06a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 06a"; fi ;;
-    1) $echo "Test 06a failed: files t06a.out and $srcdir/t06a.exp differ" 1>&2;
+    1) $echo "Test 06a failed: files 06a.O and $srcdir/06a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 06a may have failed." 1>&2;
-       $echo The command "cmp t06a.out $srcdir/t06a.exp" failed. 1>&2 ;
+       $echo The command "cmp 06a.O $srcdir/06a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t06a.err || rm -f t06a.err
-$xx -k 1,2 $srcdir/t06b.in > t06b.out 2> t06b.err
+test -s 06a.E || rm -f 06a.E
+$xx -k 1,2 $srcdir/06b.I > 06b.O 2> 06b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 06b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t06b.out $srcdir/t06b.exp
+  cmp 06b.O $srcdir/06b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 06b"; fi ;;
-    1) $echo "Test 06b failed: files t06b.out and $srcdir/t06b.exp differ" 1>&2;
+    1) $echo "Test 06b failed: files 06b.O and $srcdir/06b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 06b may have failed." 1>&2;
-       $echo The command "cmp t06b.out $srcdir/t06b.exp" failed. 1>&2 ;
+       $echo The command "cmp 06b.O $srcdir/06b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t06b.err || rm -f t06b.err
-$xx -k 1 -k 2 $srcdir/t06c.in > t06c.out 2> t06c.err
+test -s 06b.E || rm -f 06b.E
+$xx -k 1 -k 2 $srcdir/06c.I > 06c.O 2> 06c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 06c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t06c.out $srcdir/t06c.exp
+  cmp 06c.O $srcdir/06c.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 06c"; fi ;;
-    1) $echo "Test 06c failed: files t06c.out and $srcdir/t06c.exp differ" 1>&2;
+    1) $echo "Test 06c failed: files 06c.O and $srcdir/06c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 06c may have failed." 1>&2;
-       $echo The command "cmp t06c.out $srcdir/t06c.exp" failed. 1>&2 ;
+       $echo The command "cmp 06c.O $srcdir/06c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t06c.err || rm -f t06c.err
-$xx -k 2,2 $srcdir/t06d.in > t06d.out 2> t06d.err
+test -s 06c.E || rm -f 06c.E
+$xx -k 2,2 $srcdir/06d.I > 06d.O 2> 06d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 06d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t06d.out $srcdir/t06d.exp
+  cmp 06d.O $srcdir/06d.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 06d"; fi ;;
-    1) $echo "Test 06d failed: files t06d.out and $srcdir/t06d.exp differ" 1>&2;
+    1) $echo "Test 06d failed: files 06d.O and $srcdir/06d.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 06d may have failed." 1>&2;
-       $echo The command "cmp t06d.out $srcdir/t06d.exp" failed. 1>&2 ;
+       $echo The command "cmp 06d.O $srcdir/06d.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t06d.err || rm -f t06d.err
-$xx -k 2,2 $srcdir/t06e.in > t06e.out 2> t06e.err
+test -s 06d.E || rm -f 06d.E
+$xx -k 2,2 $srcdir/06e.I > 06e.O 2> 06e.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 06e failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t06e.out $srcdir/t06e.exp
+  cmp 06e.O $srcdir/06e.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 06e"; fi ;;
-    1) $echo "Test 06e failed: files t06e.out and $srcdir/t06e.exp differ" 1>&2;
+    1) $echo "Test 06e failed: files 06e.O and $srcdir/06e.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 06e may have failed." 1>&2;
-       $echo The command "cmp t06e.out $srcdir/t06e.exp" failed. 1>&2 ;
+       $echo The command "cmp 06e.O $srcdir/06e.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t06e.err || rm -f t06e.err
-$xx -k 2,2 $srcdir/t06f.in > t06f.out 2> t06f.err
+test -s 06e.E || rm -f 06e.E
+$xx -k 2,2 $srcdir/06f.I > 06f.O 2> 06f.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 06f failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t06f.out $srcdir/t06f.exp
+  cmp 06f.O $srcdir/06f.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 06f"; fi ;;
-    1) $echo "Test 06f failed: files t06f.out and $srcdir/t06f.exp differ" 1>&2;
+    1) $echo "Test 06f failed: files 06f.O and $srcdir/06f.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 06f may have failed." 1>&2;
-       $echo The command "cmp t06f.out $srcdir/t06f.exp" failed. 1>&2 ;
+       $echo The command "cmp 06f.O $srcdir/06f.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t06f.err || rm -f t06f.err
-$xx -k 2,3 $srcdir/t07a.in > t07a.out 2> t07a.err
+test -s 06f.E || rm -f 06f.E
+$xx -k 2,3 $srcdir/07a.I > 07a.O 2> 07a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 07a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t07a.out $srcdir/t07a.exp
+  cmp 07a.O $srcdir/07a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 07a"; fi ;;
-    1) $echo "Test 07a failed: files t07a.out and $srcdir/t07a.exp differ" 1>&2;
+    1) $echo "Test 07a failed: files 07a.O and $srcdir/07a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 07a may have failed." 1>&2;
-       $echo The command "cmp t07a.out $srcdir/t07a.exp" failed. 1>&2 ;
+       $echo The command "cmp 07a.O $srcdir/07a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t07a.err || rm -f t07a.err
-$xx -k 2,3 $srcdir/t07b.in > t07b.out 2> t07b.err
+test -s 07a.E || rm -f 07a.E
+$xx -k 2,3 $srcdir/07b.I > 07b.O 2> 07b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 07b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t07b.out $srcdir/t07b.exp
+  cmp 07b.O $srcdir/07b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 07b"; fi ;;
-    1) $echo "Test 07b failed: files t07b.out and $srcdir/t07b.exp differ" 1>&2;
+    1) $echo "Test 07b failed: files 07b.O and $srcdir/07b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 07b may have failed." 1>&2;
-       $echo The command "cmp t07b.out $srcdir/t07b.exp" failed. 1>&2 ;
+       $echo The command "cmp 07b.O $srcdir/07b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t07b.err || rm -f t07b.err
-$xx -k 2,3 $srcdir/t07c.in > t07c.out 2> t07c.err
+test -s 07b.E || rm -f 07b.E
+$xx -k 2,3 $srcdir/07c.I > 07c.O 2> 07c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 07c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t07c.out $srcdir/t07c.exp
+  cmp 07c.O $srcdir/07c.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 07c"; fi ;;
-    1) $echo "Test 07c failed: files t07c.out and $srcdir/t07c.exp differ" 1>&2;
+    1) $echo "Test 07c failed: files 07c.O and $srcdir/07c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 07c may have failed." 1>&2;
-       $echo The command "cmp t07c.out $srcdir/t07c.exp" failed. 1>&2 ;
+       $echo The command "cmp 07c.O $srcdir/07c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t07c.err || rm -f t07c.err
-$xx +1 -3 $srcdir/t07d.in > t07d.out 2> t07d.err
+test -s 07c.E || rm -f 07c.E
+$xx +1 -3 $srcdir/07d.I > 07d.O 2> 07d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 07d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t07d.out $srcdir/t07d.exp
+  cmp 07d.O $srcdir/07d.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 07d"; fi ;;
-    1) $echo "Test 07d failed: files t07d.out and $srcdir/t07d.exp differ" 1>&2;
+    1) $echo "Test 07d failed: files 07d.O and $srcdir/07d.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 07d may have failed." 1>&2;
-       $echo The command "cmp t07d.out $srcdir/t07d.exp" failed. 1>&2 ;
+       $echo The command "cmp 07d.O $srcdir/07d.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t07d.err || rm -f t07d.err
-$xx -k 2.,3 $srcdir/t08a.in > t08a.out 2> t08a.err
+test -s 07d.E || rm -f 07d.E
+$xx -k 2.,3 $srcdir/08a.I > 08a.O 2> 08a.E
 code=$?
 if test $code != 2 ; then
   $echo "Test 08a failed: ../../src/sort return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t08a.out $srcdir/t08a.exp
+  cmp 08a.O $srcdir/08a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 08a"; fi ;;
-    1) $echo "Test 08a failed: files t08a.out and $srcdir/t08a.exp differ" 1>&2;
+    1) $echo "Test 08a failed: files 08a.O and $srcdir/08a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 08a may have failed." 1>&2;
-       $echo The command "cmp t08a.out $srcdir/t08a.exp" failed. 1>&2 ;
+       $echo The command "cmp 08a.O $srcdir/08a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t08a.err || rm -f t08a.err
-$xx -k 2, $srcdir/t08b.in > t08b.out 2> t08b.err
+test -s 08a.E || rm -f 08a.E
+$xx -k 2, $srcdir/08b.I > 08b.O 2> 08b.E
 code=$?
 if test $code != 2 ; then
   $echo "Test 08b failed: ../../src/sort return code $code differs from expected value 2" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t08b.out $srcdir/t08b.exp
+  cmp 08b.O $srcdir/08b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 08b"; fi ;;
-    1) $echo "Test 08b failed: files t08b.out and $srcdir/t08b.exp differ" 1>&2;
+    1) $echo "Test 08b failed: files 08b.O and $srcdir/08b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 08b may have failed." 1>&2;
-       $echo The command "cmp t08b.out $srcdir/t08b.exp" failed. 1>&2 ;
+       $echo The command "cmp 08b.O $srcdir/08b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t08b.err || rm -f t08b.err
-$xx -g $srcdir/t09a.in > t09a.out 2> t09a.err
+test -s 08b.E || rm -f 08b.E
+$xx -g $srcdir/09a.I > 09a.O 2> 09a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 09a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t09a.out $srcdir/t09a.exp
+  cmp 09a.O $srcdir/09a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 09a"; fi ;;
-    1) $echo "Test 09a failed: files t09a.out and $srcdir/t09a.exp differ" 1>&2;
+    1) $echo "Test 09a failed: files 09a.O and $srcdir/09a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 09a may have failed." 1>&2;
-       $echo The command "cmp t09a.out $srcdir/t09a.exp" failed. 1>&2 ;
+       $echo The command "cmp 09a.O $srcdir/09a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t09a.err || rm -f t09a.err
-$xx -n $srcdir/t09b.in > t09b.out 2> t09b.err
+test -s 09a.E || rm -f 09a.E
+$xx -n $srcdir/09b.I > 09b.O 2> 09b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 09b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t09b.out $srcdir/t09b.exp
+  cmp 09b.O $srcdir/09b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 09b"; fi ;;
-    1) $echo "Test 09b failed: files t09b.out and $srcdir/t09b.exp differ" 1>&2;
+    1) $echo "Test 09b failed: files 09b.O and $srcdir/09b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 09b may have failed." 1>&2;
-       $echo The command "cmp t09b.out $srcdir/t09b.exp" failed. 1>&2 ;
+       $echo The command "cmp 09b.O $srcdir/09b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t09b.err || rm -f t09b.err
-$xx -n $srcdir/t09c.in > t09c.out 2> t09c.err
+test -s 09b.E || rm -f 09b.E
+$xx -n $srcdir/09c.I > 09c.O 2> 09c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 09c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t09c.out $srcdir/t09c.exp
+  cmp 09c.O $srcdir/09c.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 09c"; fi ;;
-    1) $echo "Test 09c failed: files t09c.out and $srcdir/t09c.exp differ" 1>&2;
+    1) $echo "Test 09c failed: files 09c.O and $srcdir/09c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 09c may have failed." 1>&2;
-       $echo The command "cmp t09c.out $srcdir/t09c.exp" failed. 1>&2 ;
+       $echo The command "cmp 09c.O $srcdir/09c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t09c.err || rm -f t09c.err
-$xx -k2g $srcdir/t09d.in > t09d.out 2> t09d.err
+test -s 09c.E || rm -f 09c.E
+$xx -k2g $srcdir/09d.I > 09d.O 2> 09d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 09d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t09d.out $srcdir/t09d.exp
+  cmp 09d.O $srcdir/09d.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 09d"; fi ;;
-    1) $echo "Test 09d failed: files t09d.out and $srcdir/t09d.exp differ" 1>&2;
+    1) $echo "Test 09d failed: files 09d.O and $srcdir/09d.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 09d may have failed." 1>&2;
-       $echo The command "cmp t09d.out $srcdir/t09d.exp" failed. 1>&2 ;
+       $echo The command "cmp 09d.O $srcdir/09d.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t09d.err || rm -f t09d.err
-$xx -t : -k 2.2,2.2 $srcdir/t10a.in > t10a.out 2> t10a.err
+test -s 09d.E || rm -f 09d.E
+$xx -t : -k 2.2,2.2 $srcdir/10a.I > 10a.O 2> 10a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10a.out $srcdir/t10a.exp
+  cmp 10a.O $srcdir/10a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10a"; fi ;;
-    1) $echo "Test 10a failed: files t10a.out and $srcdir/t10a.exp differ" 1>&2;
+    1) $echo "Test 10a failed: files 10a.O and $srcdir/10a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10a may have failed." 1>&2;
-       $echo The command "cmp t10a.out $srcdir/t10a.exp" failed. 1>&2 ;
+       $echo The command "cmp 10a.O $srcdir/10a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10a.err || rm -f t10a.err
-$xx -t : +1.1 -1.2 $srcdir/t10b.in > t10b.out 2> t10b.err
+test -s 10a.E || rm -f 10a.E
+$xx -t : +1.1 -1.2 $srcdir/10b.I > 10b.O 2> 10b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10b.out $srcdir/t10b.exp
+  cmp 10b.O $srcdir/10b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10b"; fi ;;
-    1) $echo "Test 10b failed: files t10b.out and $srcdir/t10b.exp differ" 1>&2;
+    1) $echo "Test 10b failed: files 10b.O and $srcdir/10b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10b may have failed." 1>&2;
-       $echo The command "cmp t10b.out $srcdir/t10b.exp" failed. 1>&2 ;
+       $echo The command "cmp 10b.O $srcdir/10b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10b.err || rm -f t10b.err
-$xx -t : -k 2.2,2.2 $srcdir/t10c.in > t10c.out 2> t10c.err
+test -s 10b.E || rm -f 10b.E
+$xx -t : -k 2.2,2.2 $srcdir/10c.I > 10c.O 2> 10c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10c.out $srcdir/t10c.exp
+  cmp 10c.O $srcdir/10c.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10c"; fi ;;
-    1) $echo "Test 10c failed: files t10c.out and $srcdir/t10c.exp differ" 1>&2;
+    1) $echo "Test 10c failed: files 10c.O and $srcdir/10c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10c may have failed." 1>&2;
-       $echo The command "cmp t10c.out $srcdir/t10c.exp" failed. 1>&2 ;
+       $echo The command "cmp 10c.O $srcdir/10c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10c.err || rm -f t10c.err
-$xx -t : +1.1 -1.2 $srcdir/t10d.in > t10d.out 2> t10d.err
+test -s 10c.E || rm -f 10c.E
+$xx -t : +1.1 -1.2 $srcdir/10d.I > 10d.O 2> 10d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10d.out $srcdir/t10d.exp
+  cmp 10d.O $srcdir/10d.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10d"; fi ;;
-    1) $echo "Test 10d failed: files t10d.out and $srcdir/t10d.exp differ" 1>&2;
+    1) $echo "Test 10d failed: files 10d.O and $srcdir/10d.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10d may have failed." 1>&2;
-       $echo The command "cmp t10d.out $srcdir/t10d.exp" failed. 1>&2 ;
+       $echo The command "cmp 10d.O $srcdir/10d.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10d.err || rm -f t10d.err
-$xx -k 2.3,2.3 $srcdir/t10a0.in > t10a0.out 2> t10a0.err
+test -s 10d.E || rm -f 10d.E
+$xx -k 2.3,2.3 $srcdir/10a0.I > 10a0.O 2> 10a0.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10a0 failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10a0.out $srcdir/t10a0.exp
+  cmp 10a0.O $srcdir/10a0.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10a0"; fi ;;
-    1) $echo "Test 10a0 failed: files t10a0.out and $srcdir/t10a0.exp differ" 1>&2;
+    1) $echo "Test 10a0 failed: files 10a0.O and $srcdir/10a0.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10a0 may have failed." 1>&2;
-       $echo The command "cmp t10a0.out $srcdir/t10a0.exp" failed. 1>&2 ;
+       $echo The command "cmp 10a0.O $srcdir/10a0.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10a0.err || rm -f t10a0.err
-$xx -k 1.2,1.2 $srcdir/t10a1.in > t10a1.out 2> t10a1.err
+test -s 10a0.E || rm -f 10a0.E
+$xx -k 1.2,1.2 $srcdir/10a1.I > 10a1.O 2> 10a1.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10a1 failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10a1.out $srcdir/t10a1.exp
+  cmp 10a1.O $srcdir/10a1.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10a1"; fi ;;
-    1) $echo "Test 10a1 failed: files t10a1.out and $srcdir/t10a1.exp differ" 1>&2;
+    1) $echo "Test 10a1 failed: files 10a1.O and $srcdir/10a1.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10a1 may have failed." 1>&2;
-       $echo The command "cmp t10a1.out $srcdir/t10a1.exp" failed. 1>&2 ;
+       $echo The command "cmp 10a1.O $srcdir/10a1.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10a1.err || rm -f t10a1.err
-$xx -b -k 2.2,2.2 $srcdir/t10a2.in > t10a2.out 2> t10a2.err
+test -s 10a1.E || rm -f 10a1.E
+$xx -b -k 2.2,2.2 $srcdir/10a2.I > 10a2.O 2> 10a2.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10a2 failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10a2.out $srcdir/t10a2.exp
+  cmp 10a2.O $srcdir/10a2.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10a2"; fi ;;
-    1) $echo "Test 10a2 failed: files t10a2.out and $srcdir/t10a2.exp differ" 1>&2;
+    1) $echo "Test 10a2 failed: files 10a2.O and $srcdir/10a2.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10a2 may have failed." 1>&2;
-       $echo The command "cmp t10a2.out $srcdir/t10a2.exp" failed. 1>&2 ;
+       $echo The command "cmp 10a2.O $srcdir/10a2.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10a2.err || rm -f t10a2.err
-$xx -k 1.2,1.2 $srcdir/t10e.in > t10e.out 2> t10e.err
+test -s 10a2.E || rm -f 10a2.E
+$xx -k 1.2,1.2 $srcdir/10e.I > 10e.O 2> 10e.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10e failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10e.out $srcdir/t10e.exp
+  cmp 10e.O $srcdir/10e.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10e"; fi ;;
-    1) $echo "Test 10e failed: files t10e.out and $srcdir/t10e.exp differ" 1>&2;
+    1) $echo "Test 10e failed: files 10e.O and $srcdir/10e.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10e may have failed." 1>&2;
-       $echo The command "cmp t10e.out $srcdir/t10e.exp" failed. 1>&2 ;
+       $echo The command "cmp 10e.O $srcdir/10e.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10e.err || rm -f t10e.err
-$xx -t : -k 1.3,1.3 $srcdir/t10f.in > t10f.out 2> t10f.err
+test -s 10e.E || rm -f 10e.E
+$xx -t : -k 1.3,1.3 $srcdir/10f.I > 10f.O 2> 10f.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10f failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10f.out $srcdir/t10f.exp
+  cmp 10f.O $srcdir/10f.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10f"; fi ;;
-    1) $echo "Test 10f failed: files t10f.out and $srcdir/t10f.exp differ" 1>&2;
+    1) $echo "Test 10f failed: files 10f.O and $srcdir/10f.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10f may have failed." 1>&2;
-       $echo The command "cmp t10f.out $srcdir/t10f.exp" failed. 1>&2 ;
+       $echo The command "cmp 10f.O $srcdir/10f.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10f.err || rm -f t10f.err
-$xx -k 1.4,1.4 $srcdir/t10g.in > t10g.out 2> t10g.err
+test -s 10f.E || rm -f 10f.E
+$xx -k 1.4,1.4 $srcdir/10g.I > 10g.O 2> 10g.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 10g failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t10g.out $srcdir/t10g.exp
+  cmp 10g.O $srcdir/10g.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 10g"; fi ;;
-    1) $echo "Test 10g failed: files t10g.out and $srcdir/t10g.exp differ" 1>&2;
+    1) $echo "Test 10g failed: files 10g.O and $srcdir/10g.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 10g may have failed." 1>&2;
-       $echo The command "cmp t10g.out $srcdir/t10g.exp" failed. 1>&2 ;
+       $echo The command "cmp 10g.O $srcdir/10g.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t10g.err || rm -f t10g.err
-$xx -t: -k1,1b -k2,2 $srcdir/t11a.in > t11a.out 2> t11a.err
+test -s 10g.E || rm -f 10g.E
+$xx -t: -k1,1b -k2,2 $srcdir/11a.I > 11a.O 2> 11a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 11a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t11a.out $srcdir/t11a.exp
+  cmp 11a.O $srcdir/11a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 11a"; fi ;;
-    1) $echo "Test 11a failed: files t11a.out and $srcdir/t11a.exp differ" 1>&2;
+    1) $echo "Test 11a failed: files 11a.O and $srcdir/11a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 11a may have failed." 1>&2;
-       $echo The command "cmp t11a.out $srcdir/t11a.exp" failed. 1>&2 ;
+       $echo The command "cmp 11a.O $srcdir/11a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t11a.err || rm -f t11a.err
-$xx -t: -k1,1b -k2,2 $srcdir/t11b.in > t11b.out 2> t11b.err
+test -s 11a.E || rm -f 11a.E
+$xx -t: -k1,1b -k2,2 $srcdir/11b.I > 11b.O 2> 11b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 11b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t11b.out $srcdir/t11b.exp
+  cmp 11b.O $srcdir/11b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 11b"; fi ;;
-    1) $echo "Test 11b failed: files t11b.out and $srcdir/t11b.exp differ" 1>&2;
+    1) $echo "Test 11b failed: files 11b.O and $srcdir/11b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 11b may have failed." 1>&2;
-       $echo The command "cmp t11b.out $srcdir/t11b.exp" failed. 1>&2 ;
+       $echo The command "cmp 11b.O $srcdir/11b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t11b.err || rm -f t11b.err
-$xx -t: -k2,2b -k3,3 $srcdir/t11c.in > t11c.out 2> t11c.err
+test -s 11b.E || rm -f 11b.E
+$xx -t: -k2,2b -k3,3 $srcdir/11c.I > 11c.O 2> 11c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 11c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t11c.out $srcdir/t11c.exp
+  cmp 11c.O $srcdir/11c.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 11c"; fi ;;
-    1) $echo "Test 11c failed: files t11c.out and $srcdir/t11c.exp differ" 1>&2;
+    1) $echo "Test 11c failed: files 11c.O and $srcdir/11c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 11c may have failed." 1>&2;
-       $echo The command "cmp t11c.out $srcdir/t11c.exp" failed. 1>&2 ;
+       $echo The command "cmp 11c.O $srcdir/11c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t11c.err || rm -f t11c.err
-$xx -t: -k2,2b -k3,3 $srcdir/t11d.in > t11d.out 2> t11d.err
+test -s 11c.E || rm -f 11c.E
+$xx -t: -k2,2b -k3,3 $srcdir/11d.I > 11d.O 2> 11d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 11d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t11d.out $srcdir/t11d.exp
+  cmp 11d.O $srcdir/11d.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 11d"; fi ;;
-    1) $echo "Test 11d failed: files t11d.out and $srcdir/t11d.exp differ" 1>&2;
+    1) $echo "Test 11d failed: files 11d.O and $srcdir/11d.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 11d may have failed." 1>&2;
-       $echo The command "cmp t11d.out $srcdir/t11d.exp" failed. 1>&2 ;
+       $echo The command "cmp 11d.O $srcdir/11d.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t11d.err || rm -f t11d.err
-$xx -n -t: +1 $srcdir/t12a.in > t12a.out 2> t12a.err
+test -s 11d.E || rm -f 11d.E
+$xx -n -t: +1 $srcdir/12a.I > 12a.O 2> 12a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 12a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t12a.out $srcdir/t12a.exp
+  cmp 12a.O $srcdir/12a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 12a"; fi ;;
-    1) $echo "Test 12a failed: files t12a.out and $srcdir/t12a.exp differ" 1>&2;
+    1) $echo "Test 12a failed: files 12a.O and $srcdir/12a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 12a may have failed." 1>&2;
-       $echo The command "cmp t12a.out $srcdir/t12a.exp" failed. 1>&2 ;
+       $echo The command "cmp 12a.O $srcdir/12a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t12a.err || rm -f t12a.err
-$xx -n -t: +1 $srcdir/t12b.in > t12b.out 2> t12b.err
+test -s 12a.E || rm -f 12a.E
+$xx -n -t: +1 $srcdir/12b.I > 12b.O 2> 12b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 12b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t12b.out $srcdir/t12b.exp
+  cmp 12b.O $srcdir/12b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 12b"; fi ;;
-    1) $echo "Test 12b failed: files t12b.out and $srcdir/t12b.exp differ" 1>&2;
+    1) $echo "Test 12b failed: files 12b.O and $srcdir/12b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 12b may have failed." 1>&2;
-       $echo The command "cmp t12b.out $srcdir/t12b.exp" failed. 1>&2 ;
+       $echo The command "cmp 12b.O $srcdir/12b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t12b.err || rm -f t12b.err
-$xx -n -t: +1 $srcdir/t12c.in > t12c.out 2> t12c.err
+test -s 12b.E || rm -f 12b.E
+$xx -n -t: +1 $srcdir/12c.I > 12c.O 2> 12c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 12c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t12c.out $srcdir/t12c.exp
+  cmp 12c.O $srcdir/12c.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 12c"; fi ;;
-    1) $echo "Test 12c failed: files t12c.out and $srcdir/t12c.exp differ" 1>&2;
+    1) $echo "Test 12c failed: files 12c.O and $srcdir/12c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 12c may have failed." 1>&2;
-       $echo The command "cmp t12c.out $srcdir/t12c.exp" failed. 1>&2 ;
+       $echo The command "cmp 12c.O $srcdir/12c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t12c.err || rm -f t12c.err
-$xx -n -t: +1 $srcdir/t12d.in > t12d.out 2> t12d.err
+test -s 12c.E || rm -f 12c.E
+$xx -n -t: +1 $srcdir/12d.I > 12d.O 2> 12d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 12d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t12d.out $srcdir/t12d.exp
+  cmp 12d.O $srcdir/12d.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 12d"; fi ;;
-    1) $echo "Test 12d failed: files t12d.out and $srcdir/t12d.exp differ" 1>&2;
+    1) $echo "Test 12d failed: files 12d.O and $srcdir/12d.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 12d may have failed." 1>&2;
-       $echo The command "cmp t12d.out $srcdir/t12d.exp" failed. 1>&2 ;
+       $echo The command "cmp 12d.O $srcdir/12d.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t12d.err || rm -f t12d.err
-$xx +0.1n $srcdir/t13a.in > t13a.out 2> t13a.err
+test -s 12d.E || rm -f 12d.E
+$xx +0.1n $srcdir/13a.I > 13a.O 2> 13a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 13a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t13a.out $srcdir/t13a.exp
+  cmp 13a.O $srcdir/13a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 13a"; fi ;;
-    1) $echo "Test 13a failed: files t13a.out and $srcdir/t13a.exp differ" 1>&2;
+    1) $echo "Test 13a failed: files 13a.O and $srcdir/13a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 13a may have failed." 1>&2;
-       $echo The command "cmp t13a.out $srcdir/t13a.exp" failed. 1>&2 ;
+       $echo The command "cmp 13a.O $srcdir/13a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t13a.err || rm -f t13a.err
-$xx +0.1n $srcdir/t13b.in > t13b.out 2> t13b.err
+test -s 13a.E || rm -f 13a.E
+$xx +0.1n $srcdir/13b.I > 13b.O 2> 13b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 13b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t13b.out $srcdir/t13b.exp
+  cmp 13b.O $srcdir/13b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 13b"; fi ;;
-    1) $echo "Test 13b failed: files t13b.out and $srcdir/t13b.exp differ" 1>&2;
+    1) $echo "Test 13b failed: files 13b.O and $srcdir/13b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 13b may have failed." 1>&2;
-       $echo The command "cmp t13b.out $srcdir/t13b.exp" failed. 1>&2 ;
+       $echo The command "cmp 13b.O $srcdir/13b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t13b.err || rm -f t13b.err
-$xx -d -u $srcdir/t14a.in > t14a.out 2> t14a.err
+test -s 13b.E || rm -f 13b.E
+$xx -d -u $srcdir/14a.I > 14a.O 2> 14a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 14a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t14a.out $srcdir/t14a.exp
+  cmp 14a.O $srcdir/14a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 14a"; fi ;;
-    1) $echo "Test 14a failed: files t14a.out and $srcdir/t14a.exp differ" 1>&2;
+    1) $echo "Test 14a failed: files 14a.O and $srcdir/14a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 14a may have failed." 1>&2;
-       $echo The command "cmp t14a.out $srcdir/t14a.exp" failed. 1>&2 ;
+       $echo The command "cmp 14a.O $srcdir/14a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t14a.err || rm -f t14a.err
-$xx -f -d -u $srcdir/t14b.in > t14b.out 2> t14b.err
+test -s 14a.E || rm -f 14a.E
+$xx -f -d -u $srcdir/14b.I > 14b.O 2> 14b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 14b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t14b.out $srcdir/t14b.exp
+  cmp 14b.O $srcdir/14b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 14b"; fi ;;
-    1) $echo "Test 14b failed: files t14b.out and $srcdir/t14b.exp differ" 1>&2;
+    1) $echo "Test 14b failed: files 14b.O and $srcdir/14b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 14b may have failed." 1>&2;
-       $echo The command "cmp t14b.out $srcdir/t14b.exp" failed. 1>&2 ;
+       $echo The command "cmp 14b.O $srcdir/14b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t14b.err || rm -f t14b.err
-$xx -i -u $srcdir/t15a.in > t15a.out 2> t15a.err
+test -s 14b.E || rm -f 14b.E
+$xx -i -u $srcdir/15a.I > 15a.O 2> 15a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 15a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t15a.out $srcdir/t15a.exp
+  cmp 15a.O $srcdir/15a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 15a"; fi ;;
-    1) $echo "Test 15a failed: files t15a.out and $srcdir/t15a.exp differ" 1>&2;
+    1) $echo "Test 15a failed: files 15a.O and $srcdir/15a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 15a may have failed." 1>&2;
-       $echo The command "cmp t15a.out $srcdir/t15a.exp" failed. 1>&2 ;
+       $echo The command "cmp 15a.O $srcdir/15a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t15a.err || rm -f t15a.err
-$xx -i -u $srcdir/t15b.in > t15b.out 2> t15b.err
+test -s 15a.E || rm -f 15a.E
+$xx -i -u $srcdir/15b.I > 15b.O 2> 15b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 15b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t15b.out $srcdir/t15b.exp
+  cmp 15b.O $srcdir/15b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 15b"; fi ;;
-    1) $echo "Test 15b failed: files t15b.out and $srcdir/t15b.exp differ" 1>&2;
+    1) $echo "Test 15b failed: files 15b.O and $srcdir/15b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 15b may have failed." 1>&2;
-       $echo The command "cmp t15b.out $srcdir/t15b.exp" failed. 1>&2 ;
+       $echo The command "cmp 15b.O $srcdir/15b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t15b.err || rm -f t15b.err
-$xx -i -u $srcdir/t15c.in > t15c.out 2> t15c.err
+test -s 15b.E || rm -f 15b.E
+$xx -i -u $srcdir/15c.I > 15c.O 2> 15c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 15c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t15c.out $srcdir/t15c.exp
+  cmp 15c.O $srcdir/15c.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 15c"; fi ;;
-    1) $echo "Test 15c failed: files t15c.out and $srcdir/t15c.exp differ" 1>&2;
+    1) $echo "Test 15c failed: files 15c.O and $srcdir/15c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 15c may have failed." 1>&2;
-       $echo The command "cmp t15c.out $srcdir/t15c.exp" failed. 1>&2 ;
+       $echo The command "cmp 15c.O $srcdir/15c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t15c.err || rm -f t15c.err
-$xx -i -u $srcdir/t15d.in > t15d.out 2> t15d.err
+test -s 15c.E || rm -f 15c.E
+$xx -i -u $srcdir/15d.I > 15d.O 2> 15d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 15d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t15d.out $srcdir/t15d.exp
+  cmp 15d.O $srcdir/15d.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 15d"; fi ;;
-    1) $echo "Test 15d failed: files t15d.out and $srcdir/t15d.exp differ" 1>&2;
+    1) $echo "Test 15d failed: files 15d.O and $srcdir/15d.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 15d may have failed." 1>&2;
-       $echo The command "cmp t15d.out $srcdir/t15d.exp" failed. 1>&2 ;
+       $echo The command "cmp 15d.O $srcdir/15d.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t15d.err || rm -f t15d.err
-$xx -i -u $srcdir/t15e.in > t15e.out 2> t15e.err
+test -s 15d.E || rm -f 15d.E
+$xx -i -u $srcdir/15e.I > 15e.O 2> 15e.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 15e failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t15e.out $srcdir/t15e.exp
+  cmp 15e.O $srcdir/15e.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 15e"; fi ;;
-    1) $echo "Test 15e failed: files t15e.out and $srcdir/t15e.exp differ" 1>&2;
+    1) $echo "Test 15e failed: files 15e.O and $srcdir/15e.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 15e may have failed." 1>&2;
-       $echo The command "cmp t15e.out $srcdir/t15e.exp" failed. 1>&2 ;
+       $echo The command "cmp 15e.O $srcdir/15e.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t15e.err || rm -f t15e.err
-$xx -f $srcdir/t16a.in > t16a.out 2> t16a.err
+test -s 15e.E || rm -f 15e.E
+$xx -f $srcdir/16a.I > 16a.O 2> 16a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 16a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t16a.out $srcdir/t16a.exp
+  cmp 16a.O $srcdir/16a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 16a"; fi ;;
-    1) $echo "Test 16a failed: files t16a.out and $srcdir/t16a.exp differ" 1>&2;
+    1) $echo "Test 16a failed: files 16a.O and $srcdir/16a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 16a may have failed." 1>&2;
-       $echo The command "cmp t16a.out $srcdir/t16a.exp" failed. 1>&2 ;
+       $echo The command "cmp 16a.O $srcdir/16a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t16a.err || rm -f t16a.err
-$xx -c $srcdir/t17.in > t17.out 2> t17.err
+test -s 16a.E || rm -f 16a.E
+$xx -c $srcdir/17.I > 17.O 2> 17.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 17 failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t17.out $srcdir/t17.exp
+  cmp 17.O $srcdir/17.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 17"; fi ;;
-    1) $echo "Test 17 failed: files t17.out and $srcdir/t17.exp differ" 1>&2;
+    1) $echo "Test 17 failed: files 17.O and $srcdir/17.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 17 may have failed." 1>&2;
-       $echo The command "cmp t17.out $srcdir/t17.exp" failed. 1>&2 ;
+       $echo The command "cmp 17.O $srcdir/17.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t17.err || rm -f t17.err
-$xx -k1.1,1.2n $srcdir/t18a.in > t18a.out 2> t18a.err
+test -s 17.E || rm -f 17.E
+$xx -k1.1,1.2n $srcdir/18a.I > 18a.O 2> 18a.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 18a failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t18a.out $srcdir/t18a.exp
+  cmp 18a.O $srcdir/18a.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 18a"; fi ;;
-    1) $echo "Test 18a failed: files t18a.out and $srcdir/t18a.exp differ" 1>&2;
+    1) $echo "Test 18a failed: files 18a.O and $srcdir/18a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 18a may have failed." 1>&2;
-       $echo The command "cmp t18a.out $srcdir/t18a.exp" failed. 1>&2 ;
+       $echo The command "cmp 18a.O $srcdir/18a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t18a.err || rm -f t18a.err
-$xx -b -k1.1,1.2n $srcdir/t18b.in > t18b.out 2> t18b.err
+test -s 18a.E || rm -f 18a.E
+$xx -b -k1.1,1.2n $srcdir/18b.I > 18b.O 2> 18b.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 18b failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t18b.out $srcdir/t18b.exp
+  cmp 18b.O $srcdir/18b.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 18b"; fi ;;
-    1) $echo "Test 18b failed: files t18b.out and $srcdir/t18b.exp differ" 1>&2;
+    1) $echo "Test 18b failed: files 18b.O and $srcdir/18b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 18b may have failed." 1>&2;
-       $echo The command "cmp t18b.out $srcdir/t18b.exp" failed. 1>&2 ;
+       $echo The command "cmp 18b.O $srcdir/18b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t18b.err || rm -f t18b.err
-$xx -k1.1,1.2nb $srcdir/t18c.in > t18c.out 2> t18c.err
+test -s 18b.E || rm -f 18b.E
+$xx -k1.1,1.2nb $srcdir/18c.I > 18c.O 2> 18c.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 18c failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t18c.out $srcdir/t18c.exp
+  cmp 18c.O $srcdir/18c.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 18c"; fi ;;
-    1) $echo "Test 18c failed: files t18c.out and $srcdir/t18c.exp differ" 1>&2;
+    1) $echo "Test 18c failed: files 18c.O and $srcdir/18c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 18c may have failed." 1>&2;
-       $echo The command "cmp t18c.out $srcdir/t18c.exp" failed. 1>&2 ;
+       $echo The command "cmp 18c.O $srcdir/18c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t18c.err || rm -f t18c.err
-$xx -k1.1b,1.2n $srcdir/t18d.in > t18d.out 2> t18d.err
+test -s 18c.E || rm -f 18c.E
+$xx -k1.1b,1.2n $srcdir/18d.I > 18d.O 2> 18d.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 18d failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t18d.out $srcdir/t18d.exp
+  cmp 18d.O $srcdir/18d.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 18d"; fi ;;
-    1) $echo "Test 18d failed: files t18d.out and $srcdir/t18d.exp differ" 1>&2;
+    1) $echo "Test 18d failed: files 18d.O and $srcdir/18d.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 18d may have failed." 1>&2;
-       $echo The command "cmp t18d.out $srcdir/t18d.exp" failed. 1>&2 ;
+       $echo The command "cmp 18d.O $srcdir/18d.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t18d.err || rm -f t18d.err
-$xx -nb -k1.1,1.2 $srcdir/t18e.in > t18e.out 2> t18e.err
+test -s 18d.E || rm -f 18d.E
+$xx -nb -k1.1,1.2 $srcdir/18e.I > 18e.O 2> 18e.E
 code=$?
 if test $code != 0 ; then
   $echo "Test 18e failed: ../../src/sort return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t18e.out $srcdir/t18e.exp
+  cmp 18e.O $srcdir/18e.X
   case $? in
     0) if test "$VERBOSE" ; then $echo "passed 18e"; fi ;;
-    1) $echo "Test 18e failed: files t18e.out and $srcdir/t18e.exp differ" 1>&2;
+    1) $echo "Test 18e failed: files 18e.O and $srcdir/18e.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
     2) $echo "Test 18e may have failed." 1>&2;
-       $echo The command "cmp t18e.out $srcdir/t18e.exp" failed. 1>&2 ;
+       $echo The command "cmp 18e.O $srcdir/18e.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t18e.err || rm -f t18e.err
+test -s 18e.E || rm -f 18e.E
 if test $errors = 0 ; then
   $echo Passed all 77 tests. 1>&2
 else
diff --git a/tests/tail/.cvsignore b/tests/tail/.cvsignore
index 818aa437d..852508156 100644
--- a/tests/tail/.cvsignore
+++ b/tests/tail/.cvsignore
@@ -1,5 +1,8 @@
-t*.out
-t*.in
-t*.exp
+*.I
+*.E
+*.X
+*.O
+*-tests
+build-script
 Makefile
 mk-script
diff --git a/tests/tail/Makefile.am b/tests/tail/Makefile.am
index ab82c1a13..def636394 100644
--- a/tests/tail/Makefile.am
+++ b/tests/tail/Makefile.am
@@ -3,28 +3,22 @@
 ##test-files-begin
 x = tail
 explicit =
-maint_gen = tobs-c1.in tobs-c1.exp tobs-c2.in tobs-c2.exp tobs-c3.in \
-tobs-c3.exp tobs-c4.in tobs-c4.exp tobs-c5.in tobs-c5.exp tobs-l1.in \
-tobs-l1.exp tobs-l2.in tobs-l2.exp tobs-l3.in tobs-l3.exp tobs-l4.in \
-tobs-l4.exp tobs-l5.in tobs-l5.exp tobs-1.in tobs-1.exp tobs-2.in tobs-2.exp \
-tobs-3.in tobs-3.exp tobs-4.in tobs-4.exp tobs-5.in tobs-5.exp tobsx-1.in \
-tobsx-1.exp tobsx-2.in tobsx-2.exp tobs-l.in tobs-l.exp terr-1.in terr-1.exp \
-terr-2.in terr-2.exp terr-3.in terr-3.exp terr-4.in terr-4.exp terr-5.in \
-terr-5.exp terr-6.in terr-6.exp tminus-1.in tminus-1.exp tminus-2.in \
-tminus-2.exp tn-1.in tn-1.exp tn-2.in tn-2.exp tn-3.in tn-3.exp tn-4.in \
-tn-4.exp tn-4a.in tn-4a.exp tn-5.in tn-5.exp tn-5a.in tn-5a.exp tn-5b.in \
-tn-5b.exp
-run_gen = tobs-c1.out tobs-c1.err tobs-c2.out tobs-c2.err tobs-c3.out \
-tobs-c3.err tobs-c4.out tobs-c4.err tobs-c5.out tobs-c5.err tobs-l1.out \
-tobs-l1.err tobs-l2.out tobs-l2.err tobs-l3.out tobs-l3.err tobs-l4.out \
-tobs-l4.err tobs-l5.out tobs-l5.err tobs-1.out tobs-1.err tobs-2.out \
-tobs-2.err tobs-3.out tobs-3.err tobs-4.out tobs-4.err tobs-5.out tobs-5.err \
-tobsx-1.out tobsx-1.err tobsx-2.out tobsx-2.err tobs-l.out tobs-l.err \
-terr-1.out terr-1.err terr-2.out terr-2.err terr-3.out terr-3.err terr-4.out \
-terr-4.err terr-5.out terr-5.err terr-6.out terr-6.err tminus-1.out \
-tminus-1.err tminus-2.out tminus-2.err tn-1.out tn-1.err tn-2.out tn-2.err \
-tn-3.out tn-3.err tn-4.out tn-4.err tn-4a.out tn-4a.err tn-5.out tn-5.err \
-tn-5a.out tn-5a.err tn-5b.out tn-5b.err
+maint_gen = obs-c1.I obs-c1.X obs-c2.I obs-c2.X obs-c3.I obs-c3.X obs-c4.I \
+obs-c4.X obs-c5.I obs-c5.X obs-l1.I obs-l1.X obs-l2.I obs-l2.X obs-l3.I \
+obs-l3.X obs-l4.I obs-l4.X obs-l5.I obs-l5.X obs-1.I obs-1.X obs-2.I obs-2.X \
+obs-3.I obs-3.X obs-4.I obs-4.X obs-5.I obs-5.X obsx-1.I obsx-1.X obsx-2.I \
+obsx-2.X obs-l.I obs-l.X err-1.I err-1.X err-2.I err-2.X err-3.I err-3.X \
+err-4.I err-4.X err-5.I err-5.X err-6.I err-6.X minus-1.I minus-1.X minus-2.I \
+minus-2.X n-1.I n-1.X n-2.I n-2.X n-3.I n-3.X n-4.I n-4.X n-4a.I n-4a.X n-5.I \
+n-5.X n-5a.I n-5a.X n-5b.I n-5b.X
+run_gen = obs-c1.O obs-c1.E obs-c2.O obs-c2.E obs-c3.O obs-c3.E obs-c4.O \
+obs-c4.E obs-c5.O obs-c5.E obs-l1.O obs-l1.E obs-l2.O obs-l2.E obs-l3.O \
+obs-l3.E obs-l4.O obs-l4.E obs-l5.O obs-l5.E obs-1.O obs-1.E obs-2.O obs-2.E \
+obs-3.O obs-3.E obs-4.O obs-4.E obs-5.O obs-5.E obsx-1.O obsx-1.E obsx-2.O \
+obsx-2.E obs-l.O obs-l.E err-1.O err-1.E err-2.O err-2.E err-3.O err-3.E \
+err-4.O err-4.E err-5.O err-5.E err-6.O err-6.E minus-1.O minus-1.E minus-2.O \
+minus-2.E n-1.O n-1.E n-2.O n-2.E n-3.O n-3.E n-4.O n-4.E n-4a.O n-4a.E n-5.O \
+n-5.E n-5a.O n-5a.E n-5b.O n-5b.E
 ##test-files-end
 
 EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
diff --git a/tests/tail/Makefile.in b/tests/tail/Makefile.in
index 123a8f8cd..64260760d 100644
--- a/tests/tail/Makefile.in
+++ b/tests/tail/Makefile.in
@@ -44,28 +44,22 @@ CC = @CC@
 
 x = tail
 explicit =
-maint_gen = tobs-c1.in tobs-c1.exp tobs-c2.in tobs-c2.exp tobs-c3.in \
-tobs-c3.exp tobs-c4.in tobs-c4.exp tobs-c5.in tobs-c5.exp tobs-l1.in \
-tobs-l1.exp tobs-l2.in tobs-l2.exp tobs-l3.in tobs-l3.exp tobs-l4.in \
-tobs-l4.exp tobs-l5.in tobs-l5.exp tobs-1.in tobs-1.exp tobs-2.in tobs-2.exp \
-tobs-3.in tobs-3.exp tobs-4.in tobs-4.exp tobs-5.in tobs-5.exp tobsx-1.in \
-tobsx-1.exp tobsx-2.in tobsx-2.exp tobs-l.in tobs-l.exp terr-1.in terr-1.exp \
-terr-2.in terr-2.exp terr-3.in terr-3.exp terr-4.in terr-4.exp terr-5.in \
-terr-5.exp terr-6.in terr-6.exp tminus-1.in tminus-1.exp tminus-2.in \
-tminus-2.exp tn-1.in tn-1.exp tn-2.in tn-2.exp tn-3.in tn-3.exp tn-4.in \
-tn-4.exp tn-4a.in tn-4a.exp tn-5.in tn-5.exp tn-5a.in tn-5a.exp tn-5b.in \
-tn-5b.exp
-run_gen = tobs-c1.out tobs-c1.err tobs-c2.out tobs-c2.err tobs-c3.out \
-tobs-c3.err tobs-c4.out tobs-c4.err tobs-c5.out tobs-c5.err tobs-l1.out \
-tobs-l1.err tobs-l2.out tobs-l2.err tobs-l3.out tobs-l3.err tobs-l4.out \
-tobs-l4.err tobs-l5.out tobs-l5.err tobs-1.out tobs-1.err tobs-2.out \
-tobs-2.err tobs-3.out tobs-3.err tobs-4.out tobs-4.err tobs-5.out tobs-5.err \
-tobsx-1.out tobsx-1.err tobsx-2.out tobsx-2.err tobs-l.out tobs-l.err \
-terr-1.out terr-1.err terr-2.out terr-2.err terr-3.out terr-3.err terr-4.out \
-terr-4.err terr-5.out terr-5.err terr-6.out terr-6.err tminus-1.out \
-tminus-1.err tminus-2.out tminus-2.err tn-1.out tn-1.err tn-2.out tn-2.err \
-tn-3.out tn-3.err tn-4.out tn-4.err tn-4a.out tn-4a.err tn-5.out tn-5.err \
-tn-5a.out tn-5a.err tn-5b.out tn-5b.err
+maint_gen = obs-c1.I obs-c1.X obs-c2.I obs-c2.X obs-c3.I obs-c3.X obs-c4.I \
+obs-c4.X obs-c5.I obs-c5.X obs-l1.I obs-l1.X obs-l2.I obs-l2.X obs-l3.I \
+obs-l3.X obs-l4.I obs-l4.X obs-l5.I obs-l5.X obs-1.I obs-1.X obs-2.I obs-2.X \
+obs-3.I obs-3.X obs-4.I obs-4.X obs-5.I obs-5.X obsx-1.I obsx-1.X obsx-2.I \
+obsx-2.X obs-l.I obs-l.X err-1.I err-1.X err-2.I err-2.X err-3.I err-3.X \
+err-4.I err-4.X err-5.I err-5.X err-6.I err-6.X minus-1.I minus-1.X minus-2.I \
+minus-2.X n-1.I n-1.X n-2.I n-2.X n-3.I n-3.X n-4.I n-4.X n-4a.I n-4a.X n-5.I \
+n-5.X n-5a.I n-5a.X n-5b.I n-5b.X
+run_gen = obs-c1.O obs-c1.E obs-c2.O obs-c2.E obs-c3.O obs-c3.E obs-c4.O \
+obs-c4.E obs-c5.O obs-c5.E obs-l1.O obs-l1.E obs-l2.O obs-l2.E obs-l3.O \
+obs-l3.E obs-l4.O obs-l4.E obs-l5.O obs-l5.E obs-1.O obs-1.E obs-2.O obs-2.E \
+obs-3.O obs-3.E obs-4.O obs-4.E obs-5.O obs-5.E obsx-1.O obsx-1.E obsx-2.O \
+obsx-2.E obs-l.O obs-l.E err-1.O err-1.E err-2.O err-2.E err-3.O err-3.E \
+err-4.O err-4.E err-5.O err-5.E err-6.O err-6.E minus-1.O minus-1.E minus-2.O \
+minus-2.E n-1.O n-1.E n-2.O n-2.E n-3.O n-3.E n-4.O n-4.E n-4a.O n-4a.E n-5.O \
+n-5.E n-5a.O n-5a.E n-5b.O n-5b.E
 
 EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
diff --git a/tests/tail/tail-tests b/tests/tail/tail-tests
index a4a16368d..d54bbc52d 100755
--- a/tests/tail/tail-tests
+++ b/tests/tail/tail-tests
@@ -9,584 +9,1162 @@ $echo testing program: $xx
 errors=0
 test "$srcdir" || srcdir=.
 test "$VERBOSE" && $xx --version 2> /dev/null
-$xx +2c < $srcdir/tobs-c1.in > tobs-c1.out 2> tobs-c1.err
+$xx +2c $srcdir/obs-c1.I > obs-c1.O 2> obs-c1.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test obs-c1 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c1(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tobs-c1.out $srcdir/tobs-c1.exp
+  cmp obs-c1.O $srcdir/obs-c1.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed obs-c1"; fi ;;
-    1) $echo "Test obs-c1 failed: files tobs-c1.out and $srcdir/tobs-c1.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed obs-c1(F)"; fi ;;
+    1) $echo "Test obs-c1(F) failed: files obs-c1.O and $srcdir/obs-c1.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test obs-c1 may have failed." 1>&2;
-       $echo The command "cmp tobs-c1.out $srcdir/tobs-c1.exp" failed. 1>&2 ;
+    2) $echo "Test obs-c1(F) may have failed." 1>&2;
+       $echo The command "cmp obs-c1.O $srcdir/obs-c1.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tobs-c1.err || rm -f tobs-c1.err
-$xx +8c < $srcdir/tobs-c2.in > tobs-c2.out 2> tobs-c2.err
+test -s obs-c1.E || rm -f obs-c1.E
+$xx +2c < $srcdir/obs-c1.I > obs-c1.O 2> obs-c1.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test obs-c2 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c1(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tobs-c2.out $srcdir/tobs-c2.exp
+  cmp obs-c1.O $srcdir/obs-c1.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed obs-c2"; fi ;;
-    1) $echo "Test obs-c2 failed: files tobs-c2.out and $srcdir/tobs-c2.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed obs-c1(<)"; fi ;;
+    1) $echo "Test obs-c1(<) failed: files obs-c1.O and $srcdir/obs-c1.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test obs-c2 may have failed." 1>&2;
-       $echo The command "cmp tobs-c2.out $srcdir/tobs-c2.exp" failed. 1>&2 ;
+    2) $echo "Test obs-c1(<) may have failed." 1>&2;
+       $echo The command "cmp obs-c1.O $srcdir/obs-c1.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tobs-c2.err || rm -f tobs-c2.err
-$xx -1c < $srcdir/tobs-c3.in > tobs-c3.out 2> tobs-c3.err
+test -s obs-c1.E || rm -f obs-c1.E
+$xx +8c $srcdir/obs-c2.I > obs-c2.O 2> obs-c2.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test obs-c3 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c2(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tobs-c3.out $srcdir/tobs-c3.exp
+  cmp obs-c2.O $srcdir/obs-c2.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed obs-c3"; fi ;;
-    1) $echo "Test obs-c3 failed: files tobs-c3.out and $srcdir/tobs-c3.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed obs-c2(F)"; fi ;;
+    1) $echo "Test obs-c2(F) failed: files obs-c2.O and $srcdir/obs-c2.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test obs-c3 may have failed." 1>&2;
-       $echo The command "cmp tobs-c3.out $srcdir/tobs-c3.exp" failed. 1>&2 ;
+    2) $echo "Test obs-c2(F) may have failed." 1>&2;
+       $echo The command "cmp obs-c2.O $srcdir/obs-c2.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tobs-c3.err || rm -f tobs-c3.err
-$xx -9c < $srcdir/tobs-c4.in > tobs-c4.out 2> tobs-c4.err
+test -s obs-c2.E || rm -f obs-c2.E
+$xx +8c < $srcdir/obs-c2.I > obs-c2.O 2> obs-c2.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test obs-c4 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c2(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tobs-c4.out $srcdir/tobs-c4.exp
+  cmp obs-c2.O $srcdir/obs-c2.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed obs-c4"; fi ;;
-    1) $echo "Test obs-c4 failed: files tobs-c4.out and $srcdir/tobs-c4.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed obs-c2(<)"; fi ;;
+    1) $echo "Test obs-c2(<) failed: files obs-c2.O and $srcdir/obs-c2.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test obs-c4 may have failed." 1>&2;
-       $echo The command "cmp tobs-c4.out $srcdir/tobs-c4.exp" failed. 1>&2 ;
+    2) $echo "Test obs-c2(<) may have failed." 1>&2;
+       $echo The command "cmp obs-c2.O $srcdir/obs-c2.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tobs-c4.err || rm -f tobs-c4.err
-$xx -12c < $srcdir/tobs-c5.in > tobs-c5.out 2> tobs-c5.err
+test -s obs-c2.E || rm -f obs-c2.E
+$xx -1c $srcdir/obs-c3.I > obs-c3.O 2> obs-c3.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test obs-c5 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c3(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tobs-c5.out $srcdir/tobs-c5.exp
+  cmp obs-c3.O $srcdir/obs-c3.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed obs-c5"; fi ;;
-    1) $echo "Test obs-c5 failed: files tobs-c5.out and $srcdir/tobs-c5.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed obs-c3(F)"; fi ;;
+    1) $echo "Test obs-c3(F) failed: files obs-c3.O and $srcdir/obs-c3.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test obs-c5 may have failed." 1>&2;
-       $echo The command "cmp tobs-c5.out $srcdir/tobs-c5.exp" failed. 1>&2 ;
+    2) $echo "Test obs-c3(F) may have failed." 1>&2;
+       $echo The command "cmp obs-c3.O $srcdir/obs-c3.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tobs-c5.err || rm -f tobs-c5.err
-$xx -1l < $srcdir/tobs-l1.in > tobs-l1.out 2> tobs-l1.err
+test -s obs-c3.E || rm -f obs-c3.E
+$xx -1c < $srcdir/obs-c3.I > obs-c3.O 2> obs-c3.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test obs-l1 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c3(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tobs-l1.out $srcdir/tobs-l1.exp
+  cmp obs-c3.O $srcdir/obs-c3.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed obs-l1"; fi ;;
-    1) $echo "Test obs-l1 failed: files tobs-l1.out and $srcdir/tobs-l1.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed obs-c3(<)"; fi ;;
+    1) $echo "Test obs-c3(<) failed: files obs-c3.O and $srcdir/obs-c3.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test obs-l1 may have failed." 1>&2;
-       $echo The command "cmp tobs-l1.out $srcdir/tobs-l1.exp" failed. 1>&2 ;
+    2) $echo "Test obs-c3(<) may have failed." 1>&2;
+       $echo The command "cmp obs-c3.O $srcdir/obs-c3.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tobs-l1.err || rm -f tobs-l1.err
-$xx -1l < $srcdir/tobs-l2.in > tobs-l2.out 2> tobs-l2.err
+test -s obs-c3.E || rm -f obs-c3.E
+$xx -9c $srcdir/obs-c4.I > obs-c4.O 2> obs-c4.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test obs-l2 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c4(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tobs-l2.out $srcdir/tobs-l2.exp
+  cmp obs-c4.O $srcdir/obs-c4.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed obs-l2"; fi ;;
-    1) $echo "Test obs-l2 failed: files tobs-l2.out and $srcdir/tobs-l2.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed obs-c4(F)"; fi ;;
+    1) $echo "Test obs-c4(F) failed: files obs-c4.O and $srcdir/obs-c4.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test obs-l2 may have failed." 1>&2;
-       $echo The command "cmp tobs-l2.out $srcdir/tobs-l2.exp" failed. 1>&2 ;
+    2) $echo "Test obs-c4(F) may have failed." 1>&2;
+       $echo The command "cmp obs-c4.O $srcdir/obs-c4.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tobs-l2.err || rm -f tobs-l2.err
-$xx -1l < $srcdir/tobs-l3.in > tobs-l3.out 2> tobs-l3.err
+test -s obs-c4.E || rm -f obs-c4.E
+$xx -9c < $srcdir/obs-c4.I > obs-c4.O 2> obs-c4.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test obs-l3 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c4(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tobs-l3.out $srcdir/tobs-l3.exp
+  cmp obs-c4.O $srcdir/obs-c4.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed obs-l3"; fi ;;
-    1) $echo "Test obs-l3 failed: files tobs-l3.out and $srcdir/tobs-l3.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed obs-c4(<)"; fi ;;
+    1) $echo "Test obs-c4(<) failed: files obs-c4.O and $srcdir/obs-c4.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test obs-l3 may have failed." 1>&2;
-       $echo The command "cmp tobs-l3.out $srcdir/tobs-l3.exp" failed. 1>&2 ;
+    2) $echo "Test obs-c4(<) may have failed." 1>&2;
+       $echo The command "cmp obs-c4.O $srcdir/obs-c4.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tobs-l3.err || rm -f tobs-l3.err
-$xx +1l < $srcdir/tobs-l4.in > tobs-l4.out 2> tobs-l4.err
+test -s obs-c4.E || rm -f obs-c4.E
+$xx -12c $srcdir/obs-c5.I > obs-c5.O 2> obs-c5.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test obs-l4 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c5(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tobs-l4.out $srcdir/tobs-l4.exp
+  cmp obs-c5.O $srcdir/obs-c5.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed obs-l4"; fi ;;
-    1) $echo "Test obs-l4 failed: files tobs-l4.out and $srcdir/tobs-l4.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed obs-c5(F)"; fi ;;
+    1) $echo "Test obs-c5(F) failed: files obs-c5.O and $srcdir/obs-c5.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test obs-l4 may have failed." 1>&2;
-       $echo The command "cmp tobs-l4.out $srcdir/tobs-l4.exp" failed. 1>&2 ;
+    2) $echo "Test obs-c5(F) may have failed." 1>&2;
+       $echo The command "cmp obs-c5.O $srcdir/obs-c5.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tobs-l4.err || rm -f tobs-l4.err
-$xx +2l < $srcdir/tobs-l5.in > tobs-l5.out 2> tobs-l5.err
+test -s obs-c5.E || rm -f obs-c5.E
+$xx -12c < $srcdir/obs-c5.I > obs-c5.O 2> obs-c5.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test obs-l5 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-c5(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tobs-l5.out $srcdir/tobs-l5.exp
+  cmp obs-c5.O $srcdir/obs-c5.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed obs-l5"; fi ;;
-    1) $echo "Test obs-l5 failed: files tobs-l5.out and $srcdir/tobs-l5.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed obs-c5(<)"; fi ;;
+    1) $echo "Test obs-c5(<) failed: files obs-c5.O and $srcdir/obs-c5.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test obs-l5 may have failed." 1>&2;
-       $echo The command "cmp tobs-l5.out $srcdir/tobs-l5.exp" failed. 1>&2 ;
+    2) $echo "Test obs-c5(<) may have failed." 1>&2;
+       $echo The command "cmp obs-c5.O $srcdir/obs-c5.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tobs-l5.err || rm -f tobs-l5.err
-$xx -1 < $srcdir/tobs-1.in > tobs-1.out 2> tobs-1.err
+test -s obs-c5.E || rm -f obs-c5.E
+$xx -1l $srcdir/obs-l1.I > obs-l1.O 2> obs-l1.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test obs-1 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l1(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tobs-1.out $srcdir/tobs-1.exp
+  cmp obs-l1.O $srcdir/obs-l1.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed obs-1"; fi ;;
-    1) $echo "Test obs-1 failed: files tobs-1.out and $srcdir/tobs-1.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed obs-l1(F)"; fi ;;
+    1) $echo "Test obs-l1(F) failed: files obs-l1.O and $srcdir/obs-l1.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test obs-1 may have failed." 1>&2;
-       $echo The command "cmp tobs-1.out $srcdir/tobs-1.exp" failed. 1>&2 ;
+    2) $echo "Test obs-l1(F) may have failed." 1>&2;
+       $echo The command "cmp obs-l1.O $srcdir/obs-l1.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tobs-1.err || rm -f tobs-1.err
-$xx -1 < $srcdir/tobs-2.in > tobs-2.out 2> tobs-2.err
+test -s obs-l1.E || rm -f obs-l1.E
+$xx -1l < $srcdir/obs-l1.I > obs-l1.O 2> obs-l1.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test obs-2 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l1(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tobs-2.out $srcdir/tobs-2.exp
+  cmp obs-l1.O $srcdir/obs-l1.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed obs-2"; fi ;;
-    1) $echo "Test obs-2 failed: files tobs-2.out and $srcdir/tobs-2.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed obs-l1(<)"; fi ;;
+    1) $echo "Test obs-l1(<) failed: files obs-l1.O and $srcdir/obs-l1.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test obs-2 may have failed." 1>&2;
-       $echo The command "cmp tobs-2.out $srcdir/tobs-2.exp" failed. 1>&2 ;
+    2) $echo "Test obs-l1(<) may have failed." 1>&2;
+       $echo The command "cmp obs-l1.O $srcdir/obs-l1.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tobs-2.err || rm -f tobs-2.err
-$xx -1 < $srcdir/tobs-3.in > tobs-3.out 2> tobs-3.err
+test -s obs-l1.E || rm -f obs-l1.E
+$xx -1l $srcdir/obs-l2.I > obs-l2.O 2> obs-l2.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test obs-3 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l2(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tobs-3.out $srcdir/tobs-3.exp
+  cmp obs-l2.O $srcdir/obs-l2.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed obs-3"; fi ;;
-    1) $echo "Test obs-3 failed: files tobs-3.out and $srcdir/tobs-3.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed obs-l2(F)"; fi ;;
+    1) $echo "Test obs-l2(F) failed: files obs-l2.O and $srcdir/obs-l2.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test obs-3 may have failed." 1>&2;
-       $echo The command "cmp tobs-3.out $srcdir/tobs-3.exp" failed. 1>&2 ;
+    2) $echo "Test obs-l2(F) may have failed." 1>&2;
+       $echo The command "cmp obs-l2.O $srcdir/obs-l2.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tobs-3.err || rm -f tobs-3.err
-$xx +1 < $srcdir/tobs-4.in > tobs-4.out 2> tobs-4.err
+test -s obs-l2.E || rm -f obs-l2.E
+$xx -1l < $srcdir/obs-l2.I > obs-l2.O 2> obs-l2.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test obs-4 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l2(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tobs-4.out $srcdir/tobs-4.exp
+  cmp obs-l2.O $srcdir/obs-l2.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed obs-4"; fi ;;
-    1) $echo "Test obs-4 failed: files tobs-4.out and $srcdir/tobs-4.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed obs-l2(<)"; fi ;;
+    1) $echo "Test obs-l2(<) failed: files obs-l2.O and $srcdir/obs-l2.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test obs-4 may have failed." 1>&2;
-       $echo The command "cmp tobs-4.out $srcdir/tobs-4.exp" failed. 1>&2 ;
+    2) $echo "Test obs-l2(<) may have failed." 1>&2;
+       $echo The command "cmp obs-l2.O $srcdir/obs-l2.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tobs-4.err || rm -f tobs-4.err
-$xx +2 < $srcdir/tobs-5.in > tobs-5.out 2> tobs-5.err
+test -s obs-l2.E || rm -f obs-l2.E
+$xx -1l $srcdir/obs-l3.I > obs-l3.O 2> obs-l3.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test obs-5 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l3(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tobs-5.out $srcdir/tobs-5.exp
+  cmp obs-l3.O $srcdir/obs-l3.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed obs-5"; fi ;;
-    1) $echo "Test obs-5 failed: files tobs-5.out and $srcdir/tobs-5.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed obs-l3(F)"; fi ;;
+    1) $echo "Test obs-l3(F) failed: files obs-l3.O and $srcdir/obs-l3.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test obs-5 may have failed." 1>&2;
-       $echo The command "cmp tobs-5.out $srcdir/tobs-5.exp" failed. 1>&2 ;
+    2) $echo "Test obs-l3(F) may have failed." 1>&2;
+       $echo The command "cmp obs-l3.O $srcdir/obs-l3.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tobs-5.err || rm -f tobs-5.err
-$xx +c < $srcdir/tobsx-1.in > tobsx-1.out 2> tobsx-1.err
+test -s obs-l3.E || rm -f obs-l3.E
+$xx -1l < $srcdir/obs-l3.I > obs-l3.O 2> obs-l3.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test obsx-1 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l3(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tobsx-1.out $srcdir/tobsx-1.exp
+  cmp obs-l3.O $srcdir/obs-l3.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed obsx-1"; fi ;;
-    1) $echo "Test obsx-1 failed: files tobsx-1.out and $srcdir/tobsx-1.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed obs-l3(<)"; fi ;;
+    1) $echo "Test obs-l3(<) failed: files obs-l3.O and $srcdir/obs-l3.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test obsx-1 may have failed." 1>&2;
-       $echo The command "cmp tobsx-1.out $srcdir/tobsx-1.exp" failed. 1>&2 ;
+    2) $echo "Test obs-l3(<) may have failed." 1>&2;
+       $echo The command "cmp obs-l3.O $srcdir/obs-l3.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tobsx-1.err || rm -f tobsx-1.err
-$xx +l < $srcdir/tobsx-2.in > tobsx-2.out 2> tobsx-2.err
+test -s obs-l3.E || rm -f obs-l3.E
+$xx +1l $srcdir/obs-l4.I > obs-l4.O 2> obs-l4.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test obsx-2 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l4(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tobsx-2.out $srcdir/tobsx-2.exp
+  cmp obs-l4.O $srcdir/obs-l4.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed obsx-2"; fi ;;
-    1) $echo "Test obsx-2 failed: files tobsx-2.out and $srcdir/tobsx-2.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed obs-l4(F)"; fi ;;
+    1) $echo "Test obs-l4(F) failed: files obs-l4.O and $srcdir/obs-l4.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test obsx-2 may have failed." 1>&2;
-       $echo The command "cmp tobsx-2.out $srcdir/tobsx-2.exp" failed. 1>&2 ;
+    2) $echo "Test obs-l4(F) may have failed." 1>&2;
+       $echo The command "cmp obs-l4.O $srcdir/obs-l4.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tobsx-2.err || rm -f tobsx-2.err
-$xx -l < $srcdir/tobs-l.in > tobs-l.out 2> tobs-l.err
+test -s obs-l4.E || rm -f obs-l4.E
+$xx +1l < $srcdir/obs-l4.I > obs-l4.O 2> obs-l4.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test obs-l failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test obs-l4(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tobs-l.out $srcdir/tobs-l.exp
+  cmp obs-l4.O $srcdir/obs-l4.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed obs-l"; fi ;;
-    1) $echo "Test obs-l failed: files tobs-l.out and $srcdir/tobs-l.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed obs-l4(<)"; fi ;;
+    1) $echo "Test obs-l4(<) failed: files obs-l4.O and $srcdir/obs-l4.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test obs-l may have failed." 1>&2;
-       $echo The command "cmp tobs-l.out $srcdir/tobs-l.exp" failed. 1>&2 ;
+    2) $echo "Test obs-l4(<) may have failed." 1>&2;
+       $echo The command "cmp obs-l4.O $srcdir/obs-l4.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tobs-l.err || rm -f tobs-l.err
-$xx +cl < $srcdir/terr-1.in > terr-1.out 2> terr-1.err
+test -s obs-l4.E || rm -f obs-l4.E
+$xx +2l $srcdir/obs-l5.I > obs-l5.O 2> obs-l5.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test obs-l5(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp obs-l5.O $srcdir/obs-l5.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed obs-l5(F)"; fi ;;
+    1) $echo "Test obs-l5(F) failed: files obs-l5.O and $srcdir/obs-l5.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test obs-l5(F) may have failed." 1>&2;
+       $echo The command "cmp obs-l5.O $srcdir/obs-l5.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s obs-l5.E || rm -f obs-l5.E
+$xx +2l < $srcdir/obs-l5.I > obs-l5.O 2> obs-l5.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test obs-l5(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp obs-l5.O $srcdir/obs-l5.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed obs-l5(<)"; fi ;;
+    1) $echo "Test obs-l5(<) failed: files obs-l5.O and $srcdir/obs-l5.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test obs-l5(<) may have failed." 1>&2;
+       $echo The command "cmp obs-l5.O $srcdir/obs-l5.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s obs-l5.E || rm -f obs-l5.E
+$xx -1 $srcdir/obs-1.I > obs-1.O 2> obs-1.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test obs-1(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp obs-1.O $srcdir/obs-1.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed obs-1(F)"; fi ;;
+    1) $echo "Test obs-1(F) failed: files obs-1.O and $srcdir/obs-1.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test obs-1(F) may have failed." 1>&2;
+       $echo The command "cmp obs-1.O $srcdir/obs-1.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s obs-1.E || rm -f obs-1.E
+$xx -1 < $srcdir/obs-1.I > obs-1.O 2> obs-1.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test obs-1(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp obs-1.O $srcdir/obs-1.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed obs-1(<)"; fi ;;
+    1) $echo "Test obs-1(<) failed: files obs-1.O and $srcdir/obs-1.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test obs-1(<) may have failed." 1>&2;
+       $echo The command "cmp obs-1.O $srcdir/obs-1.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s obs-1.E || rm -f obs-1.E
+$xx -1 $srcdir/obs-2.I > obs-2.O 2> obs-2.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test obs-2(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp obs-2.O $srcdir/obs-2.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed obs-2(F)"; fi ;;
+    1) $echo "Test obs-2(F) failed: files obs-2.O and $srcdir/obs-2.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test obs-2(F) may have failed." 1>&2;
+       $echo The command "cmp obs-2.O $srcdir/obs-2.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s obs-2.E || rm -f obs-2.E
+$xx -1 < $srcdir/obs-2.I > obs-2.O 2> obs-2.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test obs-2(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp obs-2.O $srcdir/obs-2.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed obs-2(<)"; fi ;;
+    1) $echo "Test obs-2(<) failed: files obs-2.O and $srcdir/obs-2.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test obs-2(<) may have failed." 1>&2;
+       $echo The command "cmp obs-2.O $srcdir/obs-2.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s obs-2.E || rm -f obs-2.E
+$xx -1 $srcdir/obs-3.I > obs-3.O 2> obs-3.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test obs-3(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp obs-3.O $srcdir/obs-3.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed obs-3(F)"; fi ;;
+    1) $echo "Test obs-3(F) failed: files obs-3.O and $srcdir/obs-3.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test obs-3(F) may have failed." 1>&2;
+       $echo The command "cmp obs-3.O $srcdir/obs-3.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s obs-3.E || rm -f obs-3.E
+$xx -1 < $srcdir/obs-3.I > obs-3.O 2> obs-3.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test obs-3(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp obs-3.O $srcdir/obs-3.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed obs-3(<)"; fi ;;
+    1) $echo "Test obs-3(<) failed: files obs-3.O and $srcdir/obs-3.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test obs-3(<) may have failed." 1>&2;
+       $echo The command "cmp obs-3.O $srcdir/obs-3.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s obs-3.E || rm -f obs-3.E
+$xx +1 $srcdir/obs-4.I > obs-4.O 2> obs-4.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test obs-4(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp obs-4.O $srcdir/obs-4.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed obs-4(F)"; fi ;;
+    1) $echo "Test obs-4(F) failed: files obs-4.O and $srcdir/obs-4.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test obs-4(F) may have failed." 1>&2;
+       $echo The command "cmp obs-4.O $srcdir/obs-4.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s obs-4.E || rm -f obs-4.E
+$xx +1 < $srcdir/obs-4.I > obs-4.O 2> obs-4.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test obs-4(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp obs-4.O $srcdir/obs-4.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed obs-4(<)"; fi ;;
+    1) $echo "Test obs-4(<) failed: files obs-4.O and $srcdir/obs-4.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test obs-4(<) may have failed." 1>&2;
+       $echo The command "cmp obs-4.O $srcdir/obs-4.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s obs-4.E || rm -f obs-4.E
+$xx +2 $srcdir/obs-5.I > obs-5.O 2> obs-5.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test obs-5(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp obs-5.O $srcdir/obs-5.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed obs-5(F)"; fi ;;
+    1) $echo "Test obs-5(F) failed: files obs-5.O and $srcdir/obs-5.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test obs-5(F) may have failed." 1>&2;
+       $echo The command "cmp obs-5.O $srcdir/obs-5.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s obs-5.E || rm -f obs-5.E
+$xx +2 < $srcdir/obs-5.I > obs-5.O 2> obs-5.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test obs-5(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp obs-5.O $srcdir/obs-5.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed obs-5(<)"; fi ;;
+    1) $echo "Test obs-5(<) failed: files obs-5.O and $srcdir/obs-5.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test obs-5(<) may have failed." 1>&2;
+       $echo The command "cmp obs-5.O $srcdir/obs-5.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s obs-5.E || rm -f obs-5.E
+$xx +c $srcdir/obsx-1.I > obsx-1.O 2> obsx-1.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test obsx-1(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp obsx-1.O $srcdir/obsx-1.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed obsx-1(F)"; fi ;;
+    1) $echo "Test obsx-1(F) failed: files obsx-1.O and $srcdir/obsx-1.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test obsx-1(F) may have failed." 1>&2;
+       $echo The command "cmp obsx-1.O $srcdir/obsx-1.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s obsx-1.E || rm -f obsx-1.E
+$xx +c < $srcdir/obsx-1.I > obsx-1.O 2> obsx-1.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test obsx-1(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp obsx-1.O $srcdir/obsx-1.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed obsx-1(<)"; fi ;;
+    1) $echo "Test obsx-1(<) failed: files obsx-1.O and $srcdir/obsx-1.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test obsx-1(<) may have failed." 1>&2;
+       $echo The command "cmp obsx-1.O $srcdir/obsx-1.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s obsx-1.E || rm -f obsx-1.E
+$xx +l $srcdir/obsx-2.I > obsx-2.O 2> obsx-2.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test obsx-2(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp obsx-2.O $srcdir/obsx-2.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed obsx-2(F)"; fi ;;
+    1) $echo "Test obsx-2(F) failed: files obsx-2.O and $srcdir/obsx-2.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test obsx-2(F) may have failed." 1>&2;
+       $echo The command "cmp obsx-2.O $srcdir/obsx-2.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s obsx-2.E || rm -f obsx-2.E
+$xx +l < $srcdir/obsx-2.I > obsx-2.O 2> obsx-2.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test obsx-2(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp obsx-2.O $srcdir/obsx-2.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed obsx-2(<)"; fi ;;
+    1) $echo "Test obsx-2(<) failed: files obsx-2.O and $srcdir/obsx-2.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test obsx-2(<) may have failed." 1>&2;
+       $echo The command "cmp obsx-2.O $srcdir/obsx-2.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s obsx-2.E || rm -f obsx-2.E
+$xx -l $srcdir/obs-l.I > obs-l.O 2> obs-l.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test obs-l(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp obs-l.O $srcdir/obs-l.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed obs-l(F)"; fi ;;
+    1) $echo "Test obs-l(F) failed: files obs-l.O and $srcdir/obs-l.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test obs-l(F) may have failed." 1>&2;
+       $echo The command "cmp obs-l.O $srcdir/obs-l.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s obs-l.E || rm -f obs-l.E
+$xx -l < $srcdir/obs-l.I > obs-l.O 2> obs-l.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test obs-l(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp obs-l.O $srcdir/obs-l.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed obs-l(<)"; fi ;;
+    1) $echo "Test obs-l(<) failed: files obs-l.O and $srcdir/obs-l.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test obs-l(<) may have failed." 1>&2;
+       $echo The command "cmp obs-l.O $srcdir/obs-l.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s obs-l.E || rm -f obs-l.E
+$xx +cl $srcdir/err-1.I > err-1.O 2> err-1.E
+code=$?
+if test $code != 1 ; then
+  $echo "Test err-1(F) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp err-1.O $srcdir/err-1.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed err-1(F)"; fi ;;
+    1) $echo "Test err-1(F) failed: files err-1.O and $srcdir/err-1.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test err-1(F) may have failed." 1>&2;
+       $echo The command "cmp err-1.O $srcdir/err-1.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s err-1.E || rm -f err-1.E
+$xx +cl < $srcdir/err-1.I > err-1.O 2> err-1.E
 code=$?
 if test $code != 1 ; then
-  $echo "Test err-1 failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  $echo "Test err-1(<) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp terr-1.out $srcdir/terr-1.exp
+  cmp err-1.O $srcdir/err-1.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed err-1"; fi ;;
-    1) $echo "Test err-1 failed: files terr-1.out and $srcdir/terr-1.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed err-1(<)"; fi ;;
+    1) $echo "Test err-1(<) failed: files err-1.O and $srcdir/err-1.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test err-1 may have failed." 1>&2;
-       $echo The command "cmp terr-1.out $srcdir/terr-1.exp" failed. 1>&2 ;
+    2) $echo "Test err-1(<) may have failed." 1>&2;
+       $echo The command "cmp err-1.O $srcdir/err-1.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s terr-1.err || rm -f terr-1.err
-$xx -cl < $srcdir/terr-2.in > terr-2.out 2> terr-2.err
+test -s err-1.E || rm -f err-1.E
+$xx -cl $srcdir/err-2.I > err-2.O 2> err-2.E
 code=$?
 if test $code != 1 ; then
-  $echo "Test err-2 failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  $echo "Test err-2(F) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp terr-2.out $srcdir/terr-2.exp
+  cmp err-2.O $srcdir/err-2.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed err-2"; fi ;;
-    1) $echo "Test err-2 failed: files terr-2.out and $srcdir/terr-2.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed err-2(F)"; fi ;;
+    1) $echo "Test err-2(F) failed: files err-2.O and $srcdir/err-2.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test err-2 may have failed." 1>&2;
-       $echo The command "cmp terr-2.out $srcdir/terr-2.exp" failed. 1>&2 ;
+    2) $echo "Test err-2(F) may have failed." 1>&2;
+       $echo The command "cmp err-2.O $srcdir/err-2.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s terr-2.err || rm -f terr-2.err
-$xx +2cz < $srcdir/terr-3.in > terr-3.out 2> terr-3.err
+test -s err-2.E || rm -f err-2.E
+$xx -cl < $srcdir/err-2.I > err-2.O 2> err-2.E
 code=$?
 if test $code != 1 ; then
-  $echo "Test err-3 failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  $echo "Test err-2(<) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp terr-3.out $srcdir/terr-3.exp
+  cmp err-2.O $srcdir/err-2.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed err-3"; fi ;;
-    1) $echo "Test err-3 failed: files terr-3.out and $srcdir/terr-3.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed err-2(<)"; fi ;;
+    1) $echo "Test err-2(<) failed: files err-2.O and $srcdir/err-2.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test err-3 may have failed." 1>&2;
-       $echo The command "cmp terr-3.out $srcdir/terr-3.exp" failed. 1>&2 ;
+    2) $echo "Test err-2(<) may have failed." 1>&2;
+       $echo The command "cmp err-2.O $srcdir/err-2.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s terr-3.err || rm -f terr-3.err
-$xx -2cX < $srcdir/terr-4.in > terr-4.out 2> terr-4.err
+test -s err-2.E || rm -f err-2.E
+$xx +2cz $srcdir/err-3.I > err-3.O 2> err-3.E
 code=$?
 if test $code != 1 ; then
-  $echo "Test err-4 failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  $echo "Test err-3(F) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp terr-4.out $srcdir/terr-4.exp
+  cmp err-3.O $srcdir/err-3.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed err-4"; fi ;;
-    1) $echo "Test err-4 failed: files terr-4.out and $srcdir/terr-4.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed err-3(F)"; fi ;;
+    1) $echo "Test err-3(F) failed: files err-3.O and $srcdir/err-3.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test err-4 may have failed." 1>&2;
-       $echo The command "cmp terr-4.out $srcdir/terr-4.exp" failed. 1>&2 ;
+    2) $echo "Test err-3(F) may have failed." 1>&2;
+       $echo The command "cmp err-3.O $srcdir/err-3.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s terr-4.err || rm -f terr-4.err
-$xx -c99999999999999999999 < $srcdir/terr-5.in > terr-5.out 2> terr-5.err
+test -s err-3.E || rm -f err-3.E
+$xx +2cz < $srcdir/err-3.I > err-3.O 2> err-3.E
 code=$?
 if test $code != 1 ; then
-  $echo "Test err-5 failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  $echo "Test err-3(<) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp terr-5.out $srcdir/terr-5.exp
+  cmp err-3.O $srcdir/err-3.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed err-5"; fi ;;
-    1) $echo "Test err-5 failed: files terr-5.out and $srcdir/terr-5.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed err-3(<)"; fi ;;
+    1) $echo "Test err-3(<) failed: files err-3.O and $srcdir/err-3.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test err-5 may have failed." 1>&2;
-       $echo The command "cmp terr-5.out $srcdir/terr-5.exp" failed. 1>&2 ;
+    2) $echo "Test err-3(<) may have failed." 1>&2;
+       $echo The command "cmp err-3.O $srcdir/err-3.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s terr-5.err || rm -f terr-5.err
-$xx -c < $srcdir/terr-6.in > terr-6.out 2> terr-6.err
+test -s err-3.E || rm -f err-3.E
+$xx -2cX $srcdir/err-4.I > err-4.O 2> err-4.E
 code=$?
 if test $code != 1 ; then
-  $echo "Test err-6 failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  $echo "Test err-4(F) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp err-4.O $srcdir/err-4.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed err-4(F)"; fi ;;
+    1) $echo "Test err-4(F) failed: files err-4.O and $srcdir/err-4.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test err-4(F) may have failed." 1>&2;
+       $echo The command "cmp err-4.O $srcdir/err-4.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s err-4.E || rm -f err-4.E
+$xx -2cX < $srcdir/err-4.I > err-4.O 2> err-4.E
+code=$?
+if test $code != 1 ; then
+  $echo "Test err-4(<) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp err-4.O $srcdir/err-4.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed err-4(<)"; fi ;;
+    1) $echo "Test err-4(<) failed: files err-4.O and $srcdir/err-4.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test err-4(<) may have failed." 1>&2;
+       $echo The command "cmp err-4.O $srcdir/err-4.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s err-4.E || rm -f err-4.E
+$xx -c99999999999999999999 $srcdir/err-5.I > err-5.O 2> err-5.E
+code=$?
+if test $code != 1 ; then
+  $echo "Test err-5(F) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp err-5.O $srcdir/err-5.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed err-5(F)"; fi ;;
+    1) $echo "Test err-5(F) failed: files err-5.O and $srcdir/err-5.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test err-5(F) may have failed." 1>&2;
+       $echo The command "cmp err-5.O $srcdir/err-5.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s err-5.E || rm -f err-5.E
+$xx -c99999999999999999999 < $srcdir/err-5.I > err-5.O 2> err-5.E
+code=$?
+if test $code != 1 ; then
+  $echo "Test err-5(<) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp err-5.O $srcdir/err-5.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed err-5(<)"; fi ;;
+    1) $echo "Test err-5(<) failed: files err-5.O and $srcdir/err-5.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test err-5(<) may have failed." 1>&2;
+       $echo The command "cmp err-5.O $srcdir/err-5.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s err-5.E || rm -f err-5.E
+$xx -c $srcdir/err-6.I > err-6.O 2> err-6.E
+code=$?
+if test $code != 1 ; then
+  $echo "Test err-6(F) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp err-6.O $srcdir/err-6.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed err-6(F)"; fi ;;
+    1) $echo "Test err-6(F) failed: files err-6.O and $srcdir/err-6.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test err-6(F) may have failed." 1>&2;
+       $echo The command "cmp err-6.O $srcdir/err-6.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s err-6.E || rm -f err-6.E
+$xx -c < $srcdir/err-6.I > err-6.O 2> err-6.E
+code=$?
+if test $code != 1 ; then
+  $echo "Test err-6(<) failed: ../../src/tail return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp err-6.O $srcdir/err-6.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed err-6(<)"; fi ;;
+    1) $echo "Test err-6(<) failed: files err-6.O and $srcdir/err-6.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test err-6(<) may have failed." 1>&2;
+       $echo The command "cmp err-6.O $srcdir/err-6.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s err-6.E || rm -f err-6.E
+cat $srcdir/minus-1.I | $xx - > minus-1.O 2> minus-1.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test minus-1(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp minus-1.O $srcdir/minus-1.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed minus-1(|)"; fi ;;
+    1) $echo "Test minus-1(|) failed: files minus-1.O and $srcdir/minus-1.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test minus-1(|) may have failed." 1>&2;
+       $echo The command "cmp minus-1.O $srcdir/minus-1.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s minus-1.E || rm -f minus-1.E
+$xx - < $srcdir/minus-1.I > minus-1.O 2> minus-1.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test minus-1(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp minus-1.O $srcdir/minus-1.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed minus-1(<)"; fi ;;
+    1) $echo "Test minus-1(<) failed: files minus-1.O and $srcdir/minus-1.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test minus-1(<) may have failed." 1>&2;
+       $echo The command "cmp minus-1.O $srcdir/minus-1.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s minus-1.E || rm -f minus-1.E
+cat $srcdir/minus-2.I | $xx - > minus-2.O 2> minus-2.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test minus-2(|) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp minus-2.O $srcdir/minus-2.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed minus-2(|)"; fi ;;
+    1) $echo "Test minus-2(|) failed: files minus-2.O and $srcdir/minus-2.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test minus-2(|) may have failed." 1>&2;
+       $echo The command "cmp minus-2.O $srcdir/minus-2.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s minus-2.E || rm -f minus-2.E
+$xx - < $srcdir/minus-2.I > minus-2.O 2> minus-2.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test minus-2(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp minus-2.O $srcdir/minus-2.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed minus-2(<)"; fi ;;
+    1) $echo "Test minus-2(<) failed: files minus-2.O and $srcdir/minus-2.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test minus-2(<) may have failed." 1>&2;
+       $echo The command "cmp minus-2.O $srcdir/minus-2.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s minus-2.E || rm -f minus-2.E
+$xx -n 10 $srcdir/n-1.I > n-1.O 2> n-1.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n-1(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp n-1.O $srcdir/n-1.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n-1(F)"; fi ;;
+    1) $echo "Test n-1(F) failed: files n-1.O and $srcdir/n-1.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n-1(F) may have failed." 1>&2;
+       $echo The command "cmp n-1.O $srcdir/n-1.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n-1.E || rm -f n-1.E
+$xx -n 10 < $srcdir/n-1.I > n-1.O 2> n-1.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n-1(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp n-1.O $srcdir/n-1.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n-1(<)"; fi ;;
+    1) $echo "Test n-1(<) failed: files n-1.O and $srcdir/n-1.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n-1(<) may have failed." 1>&2;
+       $echo The command "cmp n-1.O $srcdir/n-1.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n-1.E || rm -f n-1.E
+$xx -n -10 $srcdir/n-2.I > n-2.O 2> n-2.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n-2(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp n-2.O $srcdir/n-2.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n-2(F)"; fi ;;
+    1) $echo "Test n-2(F) failed: files n-2.O and $srcdir/n-2.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n-2(F) may have failed." 1>&2;
+       $echo The command "cmp n-2.O $srcdir/n-2.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n-2.E || rm -f n-2.E
+$xx -n -10 < $srcdir/n-2.I > n-2.O 2> n-2.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n-2(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp n-2.O $srcdir/n-2.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n-2(<)"; fi ;;
+    1) $echo "Test n-2(<) failed: files n-2.O and $srcdir/n-2.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n-2(<) may have failed." 1>&2;
+       $echo The command "cmp n-2.O $srcdir/n-2.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n-2.E || rm -f n-2.E
+$xx -n +10 $srcdir/n-3.I > n-3.O 2> n-3.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n-3(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp n-3.O $srcdir/n-3.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n-3(F)"; fi ;;
+    1) $echo "Test n-3(F) failed: files n-3.O and $srcdir/n-3.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n-3(F) may have failed." 1>&2;
+       $echo The command "cmp n-3.O $srcdir/n-3.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s n-3.E || rm -f n-3.E
+$xx -n +10 < $srcdir/n-3.I > n-3.O 2> n-3.E
+code=$?
+if test $code != 0 ; then
+  $echo "Test n-3(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp terr-6.out $srcdir/terr-6.exp
+  cmp n-3.O $srcdir/n-3.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed err-6"; fi ;;
-    1) $echo "Test err-6 failed: files terr-6.out and $srcdir/terr-6.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed n-3(<)"; fi ;;
+    1) $echo "Test n-3(<) failed: files n-3.O and $srcdir/n-3.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test err-6 may have failed." 1>&2;
-       $echo The command "cmp terr-6.out $srcdir/terr-6.exp" failed. 1>&2 ;
+    2) $echo "Test n-3(<) may have failed." 1>&2;
+       $echo The command "cmp n-3.O $srcdir/n-3.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s terr-6.err || rm -f terr-6.err
-$xx - < $srcdir/tminus-1.in > tminus-1.out 2> tminus-1.err
+test -s n-3.E || rm -f n-3.E
+$xx -n +0 $srcdir/n-4.I > n-4.O 2> n-4.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test minus-1 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test n-4(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tminus-1.out $srcdir/tminus-1.exp
+  cmp n-4.O $srcdir/n-4.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed minus-1"; fi ;;
-    1) $echo "Test minus-1 failed: files tminus-1.out and $srcdir/tminus-1.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed n-4(F)"; fi ;;
+    1) $echo "Test n-4(F) failed: files n-4.O and $srcdir/n-4.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test minus-1 may have failed." 1>&2;
-       $echo The command "cmp tminus-1.out $srcdir/tminus-1.exp" failed. 1>&2 ;
+    2) $echo "Test n-4(F) may have failed." 1>&2;
+       $echo The command "cmp n-4.O $srcdir/n-4.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tminus-1.err || rm -f tminus-1.err
-$xx - < $srcdir/tminus-2.in > tminus-2.out 2> tminus-2.err
+test -s n-4.E || rm -f n-4.E
+$xx -n +0 < $srcdir/n-4.I > n-4.O 2> n-4.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test minus-2 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test n-4(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tminus-2.out $srcdir/tminus-2.exp
+  cmp n-4.O $srcdir/n-4.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed minus-2"; fi ;;
-    1) $echo "Test minus-2 failed: files tminus-2.out and $srcdir/tminus-2.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed n-4(<)"; fi ;;
+    1) $echo "Test n-4(<) failed: files n-4.O and $srcdir/n-4.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test minus-2 may have failed." 1>&2;
-       $echo The command "cmp tminus-2.out $srcdir/tminus-2.exp" failed. 1>&2 ;
+    2) $echo "Test n-4(<) may have failed." 1>&2;
+       $echo The command "cmp n-4.O $srcdir/n-4.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tminus-2.err || rm -f tminus-2.err
-$xx -n 10 < $srcdir/tn-1.in > tn-1.out 2> tn-1.err
+test -s n-4.E || rm -f n-4.E
+$xx -n +1 $srcdir/n-4a.I > n-4a.O 2> n-4a.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test n-1 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test n-4a(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tn-1.out $srcdir/tn-1.exp
+  cmp n-4a.O $srcdir/n-4a.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed n-1"; fi ;;
-    1) $echo "Test n-1 failed: files tn-1.out and $srcdir/tn-1.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed n-4a(F)"; fi ;;
+    1) $echo "Test n-4a(F) failed: files n-4a.O and $srcdir/n-4a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test n-1 may have failed." 1>&2;
-       $echo The command "cmp tn-1.out $srcdir/tn-1.exp" failed. 1>&2 ;
+    2) $echo "Test n-4a(F) may have failed." 1>&2;
+       $echo The command "cmp n-4a.O $srcdir/n-4a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tn-1.err || rm -f tn-1.err
-$xx -n -10 < $srcdir/tn-2.in > tn-2.out 2> tn-2.err
+test -s n-4a.E || rm -f n-4a.E
+$xx -n +1 < $srcdir/n-4a.I > n-4a.O 2> n-4a.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test n-2 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test n-4a(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tn-2.out $srcdir/tn-2.exp
+  cmp n-4a.O $srcdir/n-4a.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed n-2"; fi ;;
-    1) $echo "Test n-2 failed: files tn-2.out and $srcdir/tn-2.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed n-4a(<)"; fi ;;
+    1) $echo "Test n-4a(<) failed: files n-4a.O and $srcdir/n-4a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test n-2 may have failed." 1>&2;
-       $echo The command "cmp tn-2.out $srcdir/tn-2.exp" failed. 1>&2 ;
+    2) $echo "Test n-4a(<) may have failed." 1>&2;
+       $echo The command "cmp n-4a.O $srcdir/n-4a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tn-2.err || rm -f tn-2.err
-$xx -n +10 < $srcdir/tn-3.in > tn-3.out 2> tn-3.err
+test -s n-4a.E || rm -f n-4a.E
+$xx -n -0 $srcdir/n-5.I > n-5.O 2> n-5.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test n-3 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test n-5(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tn-3.out $srcdir/tn-3.exp
+  cmp n-5.O $srcdir/n-5.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed n-3"; fi ;;
-    1) $echo "Test n-3 failed: files tn-3.out and $srcdir/tn-3.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed n-5(F)"; fi ;;
+    1) $echo "Test n-5(F) failed: files n-5.O and $srcdir/n-5.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test n-3 may have failed." 1>&2;
-       $echo The command "cmp tn-3.out $srcdir/tn-3.exp" failed. 1>&2 ;
+    2) $echo "Test n-5(F) may have failed." 1>&2;
+       $echo The command "cmp n-5.O $srcdir/n-5.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tn-3.err || rm -f tn-3.err
-$xx -n +0 < $srcdir/tn-4.in > tn-4.out 2> tn-4.err
+test -s n-5.E || rm -f n-5.E
+$xx -n -0 < $srcdir/n-5.I > n-5.O 2> n-5.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test n-4 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test n-5(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tn-4.out $srcdir/tn-4.exp
+  cmp n-5.O $srcdir/n-5.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed n-4"; fi ;;
-    1) $echo "Test n-4 failed: files tn-4.out and $srcdir/tn-4.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed n-5(<)"; fi ;;
+    1) $echo "Test n-5(<) failed: files n-5.O and $srcdir/n-5.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test n-4 may have failed." 1>&2;
-       $echo The command "cmp tn-4.out $srcdir/tn-4.exp" failed. 1>&2 ;
+    2) $echo "Test n-5(<) may have failed." 1>&2;
+       $echo The command "cmp n-5.O $srcdir/n-5.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tn-4.err || rm -f tn-4.err
-$xx -n +1 < $srcdir/tn-4a.in > tn-4a.out 2> tn-4a.err
+test -s n-5.E || rm -f n-5.E
+$xx -n -1 $srcdir/n-5a.I > n-5a.O 2> n-5a.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test n-4a failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test n-5a(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tn-4a.out $srcdir/tn-4a.exp
+  cmp n-5a.O $srcdir/n-5a.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed n-4a"; fi ;;
-    1) $echo "Test n-4a failed: files tn-4a.out and $srcdir/tn-4a.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed n-5a(F)"; fi ;;
+    1) $echo "Test n-5a(F) failed: files n-5a.O and $srcdir/n-5a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test n-4a may have failed." 1>&2;
-       $echo The command "cmp tn-4a.out $srcdir/tn-4a.exp" failed. 1>&2 ;
+    2) $echo "Test n-5a(F) may have failed." 1>&2;
+       $echo The command "cmp n-5a.O $srcdir/n-5a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tn-4a.err || rm -f tn-4a.err
-$xx -n -0 < $srcdir/tn-5.in > tn-5.out 2> tn-5.err
+test -s n-5a.E || rm -f n-5a.E
+$xx -n -1 < $srcdir/n-5a.I > n-5a.O 2> n-5a.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test n-5 failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test n-5a(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tn-5.out $srcdir/tn-5.exp
+  cmp n-5a.O $srcdir/n-5a.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed n-5"; fi ;;
-    1) $echo "Test n-5 failed: files tn-5.out and $srcdir/tn-5.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed n-5a(<)"; fi ;;
+    1) $echo "Test n-5a(<) failed: files n-5a.O and $srcdir/n-5a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test n-5 may have failed." 1>&2;
-       $echo The command "cmp tn-5.out $srcdir/tn-5.exp" failed. 1>&2 ;
+    2) $echo "Test n-5a(<) may have failed." 1>&2;
+       $echo The command "cmp n-5a.O $srcdir/n-5a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tn-5.err || rm -f tn-5.err
-$xx -n -1 < $srcdir/tn-5a.in > tn-5a.out 2> tn-5a.err
+test -s n-5a.E || rm -f n-5a.E
+$xx -n  0 $srcdir/n-5b.I > n-5b.O 2> n-5b.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test n-5a failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test n-5b(F) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tn-5a.out $srcdir/tn-5a.exp
+  cmp n-5b.O $srcdir/n-5b.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed n-5a"; fi ;;
-    1) $echo "Test n-5a failed: files tn-5a.out and $srcdir/tn-5a.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed n-5b(F)"; fi ;;
+    1) $echo "Test n-5b(F) failed: files n-5b.O and $srcdir/n-5b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test n-5a may have failed." 1>&2;
-       $echo The command "cmp tn-5a.out $srcdir/tn-5a.exp" failed. 1>&2 ;
+    2) $echo "Test n-5b(F) may have failed." 1>&2;
+       $echo The command "cmp n-5b.O $srcdir/n-5b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tn-5a.err || rm -f tn-5a.err
-$xx -n  0 < $srcdir/tn-5b.in > tn-5b.out 2> tn-5b.err
+test -s n-5b.E || rm -f n-5b.E
+$xx -n  0 < $srcdir/n-5b.I > n-5b.O 2> n-5b.E
 code=$?
 if test $code != 0 ; then
-  $echo "Test n-5b failed: ../../src/tail return code $code differs from expected value 0" 1>&2
+  $echo "Test n-5b(<) failed: ../../src/tail return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tn-5b.out $srcdir/tn-5b.exp
+  cmp n-5b.O $srcdir/n-5b.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed n-5b"; fi ;;
-    1) $echo "Test n-5b failed: files tn-5b.out and $srcdir/tn-5b.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed n-5b(<)"; fi ;;
+    1) $echo "Test n-5b(<) failed: files n-5b.O and $srcdir/n-5b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test n-5b may have failed." 1>&2;
-       $echo The command "cmp tn-5b.out $srcdir/tn-5b.exp" failed. 1>&2 ;
+    2) $echo "Test n-5b(<) may have failed." 1>&2;
+       $echo The command "cmp n-5b.O $srcdir/n-5b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tn-5b.err || rm -f tn-5b.err
+test -s n-5b.E || rm -f n-5b.E
 if test $errors = 0 ; then
   $echo Passed all 34 tests. 1>&2
 else
diff --git a/tests/tr/.cvsignore b/tests/tr/.cvsignore
index c5c16f242..852508156 100644
--- a/tests/tr/.cvsignore
+++ b/tests/tr/.cvsignore
@@ -1,9 +1,8 @@
-t*.out
-t*.in
-t*.exp
-tB.err
-tR0.0.err
-tR0.1.err
+*.I
+*.E
+*.X
+*.O
+*-tests
 build-script
 Makefile
 mk-script
diff --git a/tests/tr/Makefile.am b/tests/tr/Makefile.am
index bc88b2824..d083f5fb6 100644
--- a/tests/tr/Makefile.am
+++ b/tests/tr/Makefile.am
@@ -3,31 +3,24 @@
 ##test-files-begin
 x = tr
 explicit =
-maint_gen = t1.in t1.exp t2.in t2.exp t3.in t3.exp t4.in t4.exp t5.in t5.exp \
-t6.in t6.exp t7.in t7.exp t8.in t8.exp t9.in t9.exp ta.in ta.exp tb.in tb.exp \
-tc.in tc.exp td.in td.exp te.in te.exp tf.in tf.exp tg.in tg.exp th.in th.exp \
-ti.in ti.exp tj.in tj.exp tk.in tk.exp tl.in tl.exp tm.in tm.exp tn.in tn.exp \
-to.in to.exp tp.in tp.exp tq.in tq.exp tr.in tr.exp ts.in ts.exp tt.in tt.exp \
-tu.in tu.exp tv.in tv.exp tw.in tw.exp tx.in tx.exp ty.in ty.exp tz.in tz.exp \
-trange-a-a.in trange-a-a.exp tnull.in tnull.exp tupcase.in tupcase.exp \
-tdncase.in tdncase.exp trep-cclass.in trep-cclass.exp trep-1.in trep-1.exp \
-trep-2.in trep-2.exp trep-3.in trep-3.exp tesc.in tesc.exp tross-0a.in \
-tross-0a.exp tross-0b.in tross-0b.exp tross-1a.in tross-1a.exp tross-1b.in \
-tross-1b.exp tross-2.in tross-2.exp tross-3.in tross-3.exp tross-4.in \
-tross-4.exp tross-5.in tross-5.exp tross-6.in tross-6.exp
-run_gen = t1.out t1.err t2.out t2.err t3.out t3.err t4.out t4.err t5.out \
-t5.err t6.out t6.err t7.out t7.err t8.out t8.err t9.out t9.err ta.out ta.err \
-tb.out tb.err tc.out tc.err td.out td.err te.out te.err tf.out tf.err tg.out \
-tg.err th.out th.err ti.out ti.err tj.out tj.err tk.out tk.err tl.out tl.err \
-tm.out tm.err tn.out tn.err to.out to.err tp.out tp.err tq.out tq.err tr.out \
-tr.err ts.out ts.err tt.out tt.err tu.out tu.err tv.out tv.err tw.out tw.err \
-tx.out tx.err ty.out ty.err tz.out tz.err trange-a-a.out trange-a-a.err \
-tnull.out tnull.err tupcase.out tupcase.err tdncase.out tdncase.err \
-trep-cclass.out trep-cclass.err trep-1.out trep-1.err trep-2.out trep-2.err \
-trep-3.out trep-3.err tesc.out tesc.err tross-0a.out tross-0a.err \
-tross-0b.out tross-0b.err tross-1a.out tross-1a.err tross-1b.out tross-1b.err \
-tross-2.out tross-2.err tross-3.out tross-3.err tross-4.out tross-4.err \
-tross-5.out tross-5.err tross-6.out tross-6.err
+maint_gen = 1.I 1.X 2.I 2.X 3.I 3.X 4.I 4.X 5.I 5.X 6.I 6.X 7.I 7.X 8.I 8.X \
+9.I 9.X a.I a.X b.I b.X c.I c.X d.I d.X e.I e.X f.I f.X g.I g.X h.I h.X i.I \
+i.X j.I j.X k.I k.X l.I l.X m.I m.X n.I n.X o.I o.X p.I p.X q.I q.X r.I r.X \
+s.I s.X t.I t.X u.I u.X v.I v.X w.I w.X x.I x.X y.I y.X z.I z.X range-a-a.I \
+range-a-a.X null.I null.X upcase.I upcase.X dncase.I dncase.X rep-cclass.I \
+rep-cclass.X rep-1.I rep-1.X rep-2.I rep-2.X rep-3.I rep-3.X esc.I esc.X \
+ross-0a.I ross-0a.X ross-0b.I ross-0b.X ross-1a.I ross-1a.X ross-1b.I \
+ross-1b.X ross-2.I ross-2.X ross-3.I ross-3.X ross-4.I ross-4.X ross-5.I \
+ross-5.X ross-6.I ross-6.X
+run_gen = 1.O 1.E 2.O 2.E 3.O 3.E 4.O 4.E 5.O 5.E 6.O 6.E 7.O 7.E 8.O 8.E 9.O \
+9.E a.O a.E b.O b.E c.O c.E d.O d.E e.O e.E f.O f.E g.O g.E h.O h.E i.O i.E \
+j.O j.E k.O k.E l.O l.E m.O m.E n.O n.E o.O o.E p.O p.E q.O q.E r.O r.E s.O \
+s.E t.O t.E u.O u.E v.O v.E w.O w.E x.O x.E y.O y.E z.O z.E range-a-a.O \
+range-a-a.E null.O null.E upcase.O upcase.E dncase.O dncase.E rep-cclass.O \
+rep-cclass.E rep-1.O rep-1.E rep-2.O rep-2.E rep-3.O rep-3.E esc.O esc.E \
+ross-0a.O ross-0a.E ross-0b.O ross-0b.E ross-1a.O ross-1a.E ross-1b.O \
+ross-1b.E ross-2.O ross-2.E ross-3.O ross-3.E ross-4.O ross-4.E ross-5.O \
+ross-5.E ross-6.O ross-6.E
 ##test-files-end
 
 EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
diff --git a/tests/tr/Makefile.in b/tests/tr/Makefile.in
index 23f33f31e..ef4e5e222 100644
--- a/tests/tr/Makefile.in
+++ b/tests/tr/Makefile.in
@@ -44,31 +44,24 @@ CC = @CC@
 
 x = tr
 explicit =
-maint_gen = t1.in t1.exp t2.in t2.exp t3.in t3.exp t4.in t4.exp t5.in t5.exp \
-t6.in t6.exp t7.in t7.exp t8.in t8.exp t9.in t9.exp ta.in ta.exp tb.in tb.exp \
-tc.in tc.exp td.in td.exp te.in te.exp tf.in tf.exp tg.in tg.exp th.in th.exp \
-ti.in ti.exp tj.in tj.exp tk.in tk.exp tl.in tl.exp tm.in tm.exp tn.in tn.exp \
-to.in to.exp tp.in tp.exp tq.in tq.exp tr.in tr.exp ts.in ts.exp tt.in tt.exp \
-tu.in tu.exp tv.in tv.exp tw.in tw.exp tx.in tx.exp ty.in ty.exp tz.in tz.exp \
-trange-a-a.in trange-a-a.exp tnull.in tnull.exp tupcase.in tupcase.exp \
-tdncase.in tdncase.exp trep-cclass.in trep-cclass.exp trep-1.in trep-1.exp \
-trep-2.in trep-2.exp trep-3.in trep-3.exp tesc.in tesc.exp tross-0a.in \
-tross-0a.exp tross-0b.in tross-0b.exp tross-1a.in tross-1a.exp tross-1b.in \
-tross-1b.exp tross-2.in tross-2.exp tross-3.in tross-3.exp tross-4.in \
-tross-4.exp tross-5.in tross-5.exp tross-6.in tross-6.exp
-run_gen = t1.out t1.err t2.out t2.err t3.out t3.err t4.out t4.err t5.out \
-t5.err t6.out t6.err t7.out t7.err t8.out t8.err t9.out t9.err ta.out ta.err \
-tb.out tb.err tc.out tc.err td.out td.err te.out te.err tf.out tf.err tg.out \
-tg.err th.out th.err ti.out ti.err tj.out tj.err tk.out tk.err tl.out tl.err \
-tm.out tm.err tn.out tn.err to.out to.err tp.out tp.err tq.out tq.err tr.out \
-tr.err ts.out ts.err tt.out tt.err tu.out tu.err tv.out tv.err tw.out tw.err \
-tx.out tx.err ty.out ty.err tz.out tz.err trange-a-a.out trange-a-a.err \
-tnull.out tnull.err tupcase.out tupcase.err tdncase.out tdncase.err \
-trep-cclass.out trep-cclass.err trep-1.out trep-1.err trep-2.out trep-2.err \
-trep-3.out trep-3.err tesc.out tesc.err tross-0a.out tross-0a.err \
-tross-0b.out tross-0b.err tross-1a.out tross-1a.err tross-1b.out tross-1b.err \
-tross-2.out tross-2.err tross-3.out tross-3.err tross-4.out tross-4.err \
-tross-5.out tross-5.err tross-6.out tross-6.err
+maint_gen = 1.I 1.X 2.I 2.X 3.I 3.X 4.I 4.X 5.I 5.X 6.I 6.X 7.I 7.X 8.I 8.X \
+9.I 9.X a.I a.X b.I b.X c.I c.X d.I d.X e.I e.X f.I f.X g.I g.X h.I h.X i.I \
+i.X j.I j.X k.I k.X l.I l.X m.I m.X n.I n.X o.I o.X p.I p.X q.I q.X r.I r.X \
+s.I s.X t.I t.X u.I u.X v.I v.X w.I w.X x.I x.X y.I y.X z.I z.X range-a-a.I \
+range-a-a.X null.I null.X upcase.I upcase.X dncase.I dncase.X rep-cclass.I \
+rep-cclass.X rep-1.I rep-1.X rep-2.I rep-2.X rep-3.I rep-3.X esc.I esc.X \
+ross-0a.I ross-0a.X ross-0b.I ross-0b.X ross-1a.I ross-1a.X ross-1b.I \
+ross-1b.X ross-2.I ross-2.X ross-3.I ross-3.X ross-4.I ross-4.X ross-5.I \
+ross-5.X ross-6.I ross-6.X
+run_gen = 1.O 1.E 2.O 2.E 3.O 3.E 4.O 4.E 5.O 5.E 6.O 6.E 7.O 7.E 8.O 8.E 9.O \
+9.E a.O a.E b.O b.E c.O c.E d.O d.E e.O e.E f.O f.E g.O g.E h.O h.E i.O i.E \
+j.O j.E k.O k.E l.O l.E m.O m.E n.O n.E o.O o.E p.O p.E q.O q.E r.O r.E s.O \
+s.E t.O t.E u.O u.E v.O v.E w.O w.E x.O x.E y.O y.E z.O z.E range-a-a.O \
+range-a-a.E null.O null.E upcase.O upcase.E dncase.O dncase.E rep-cclass.O \
+rep-cclass.E rep-1.O rep-1.E rep-2.O rep-2.E rep-3.O rep-3.E esc.O esc.E \
+ross-0a.O ross-0a.E ross-0b.O ross-0b.E ross-1a.O ross-1a.E ross-1b.O \
+ross-1b.E ross-2.O ross-2.E ross-3.O ross-3.E ross-4.O ross-4.E ross-5.O \
+ross-5.E ross-6.O ross-6.E
 
 EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
diff --git a/tests/tr/tr-tests b/tests/tr/tr-tests
index 351bbd04a..e02fc8821 100755
--- a/tests/tr/tr-tests
+++ b/tests/tr/tr-tests
@@ -9,907 +9,1808 @@ $echo testing program: $xx
 errors=0
 test "$srcdir" || srcdir=.
 test "$VERBOSE" && $xx --version 2> /dev/null
-$xx 'abcd' '[]*]' < $srcdir/t1.in > t1.out 2> t1.err
+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: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t1.out $srcdir/t1.exp
+  cmp 1.O $srcdir/1.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 1"; fi ;;
-    1) $echo "Test 1 failed: files t1.out and $srcdir/t1.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1(|)"; fi ;;
+    1) $echo "Test 1(|) failed: files 1.O and $srcdir/1.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 1 may have failed." 1>&2;
-       $echo The command "cmp t1.out $srcdir/t1.exp" failed. 1>&2 ;
+    2) $echo "Test 1(|) may have failed." 1>&2;
+       $echo The command "cmp 1.O $srcdir/1.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1.err || rm -f t1.err
-$xx 'abc' '[%*]xyz' < $srcdir/t2.in > t2.out 2> t2.err
+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 2 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test 1(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t2.out $srcdir/t2.exp
+  cmp 1.O $srcdir/1.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 2"; fi ;;
-    1) $echo "Test 2 failed: files t2.out and $srcdir/t2.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 1(<)"; fi ;;
+    1) $echo "Test 1(<) failed: files 1.O and $srcdir/1.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 2 may have failed." 1>&2;
-       $echo The command "cmp t2.out $srcdir/t2.exp" failed. 1>&2 ;
+    2) $echo "Test 1(<) may have failed." 1>&2;
+       $echo The command "cmp 1.O $srcdir/1.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t2.err || rm -f t2.err
-$xx '' '[.*]' < $srcdir/t3.in > t3.out 2> t3.err
+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 3 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test 2(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t3.out $srcdir/t3.exp
+  cmp 2.O $srcdir/2.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 3"; fi ;;
-    1) $echo "Test 3 failed: files t3.out and $srcdir/t3.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2(|)"; fi ;;
+    1) $echo "Test 2(|) failed: files 2.O and $srcdir/2.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 3 may have failed." 1>&2;
-       $echo The command "cmp t3.out $srcdir/t3.exp" failed. 1>&2 ;
+    2) $echo "Test 2(|) may have failed." 1>&2;
+       $echo The command "cmp 2.O $srcdir/2.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3.err || rm -f t3.err
-$xx -t 'abcd' 'xy' < $srcdir/t4.in > t4.out 2> t4.err
+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 4 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test 2(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t4.out $srcdir/t4.exp
+  cmp 2.O $srcdir/2.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 4"; fi ;;
-    1) $echo "Test 4 failed: files t4.out and $srcdir/t4.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 2(<)"; fi ;;
+    1) $echo "Test 2(<) failed: files 2.O and $srcdir/2.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 4 may have failed." 1>&2;
-       $echo The command "cmp t4.out $srcdir/t4.exp" failed. 1>&2 ;
+    2) $echo "Test 2(<) may have failed." 1>&2;
+       $echo The command "cmp 2.O $srcdir/2.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4.err || rm -f t4.err
-$xx 'abcd' 'xy' < $srcdir/t5.in > t5.out 2> t5.err
+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 5 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t5.out $srcdir/t5.exp
+  cmp 3.O $srcdir/3.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 5"; fi ;;
-    1) $echo "Test 5 failed: files t5.out and $srcdir/t5.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3(|)"; fi ;;
+    1) $echo "Test 3(|) failed: files 3.O and $srcdir/3.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 5 may have failed." 1>&2;
-       $echo The command "cmp t5.out $srcdir/t5.exp" failed. 1>&2 ;
+    2) $echo "Test 3(|) may have failed." 1>&2;
+       $echo The command "cmp 3.O $srcdir/3.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5.err || rm -f t5.err
-$xx 'abcd' 'x[y*]' < $srcdir/t6.in > t6.out 2> t6.err
+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 6 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test 3(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t6.out $srcdir/t6.exp
+  cmp 3.O $srcdir/3.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 6"; fi ;;
-    1) $echo "Test 6 failed: files t6.out and $srcdir/t6.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 3(<)"; fi ;;
+    1) $echo "Test 3(<) failed: files 3.O and $srcdir/3.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 6 may have failed." 1>&2;
-       $echo The command "cmp t6.out $srcdir/t6.exp" failed. 1>&2 ;
+    2) $echo "Test 3(<) may have failed." 1>&2;
+       $echo The command "cmp 3.O $srcdir/3.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t6.err || rm -f t6.err
-$xx -s 'a-p' '%[.*]$' < $srcdir/t7.in > t7.out 2> t7.err
+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 7 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test 4(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t7.out $srcdir/t7.exp
+  cmp 4.O $srcdir/4.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 7"; fi ;;
-    1) $echo "Test 7 failed: files t7.out and $srcdir/t7.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4(|)"; fi ;;
+    1) $echo "Test 4(|) failed: files 4.O and $srcdir/4.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 7 may have failed." 1>&2;
-       $echo The command "cmp t7.out $srcdir/t7.exp" failed. 1>&2 ;
+    2) $echo "Test 4(|) may have failed." 1>&2;
+       $echo The command "cmp 4.O $srcdir/4.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t7.err || rm -f t7.err
-$xx -s 'a-p' '[.*]$' < $srcdir/t8.in > t8.out 2> t8.err
+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 8 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test 4(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t8.out $srcdir/t8.exp
+  cmp 4.O $srcdir/4.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 8"; fi ;;
-    1) $echo "Test 8 failed: files t8.out and $srcdir/t8.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 4(<)"; fi ;;
+    1) $echo "Test 4(<) failed: files 4.O and $srcdir/4.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 8 may have failed." 1>&2;
-       $echo The command "cmp t8.out $srcdir/t8.exp" failed. 1>&2 ;
+    2) $echo "Test 4(<) may have failed." 1>&2;
+       $echo The command "cmp 4.O $srcdir/4.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t8.err || rm -f t8.err
-$xx -s 'a-p' '%[.*]' < $srcdir/t9.in > t9.out 2> t9.err
+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 9 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test 5(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp t9.out $srcdir/t9.exp
+  cmp 5.O $srcdir/5.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 9"; fi ;;
-    1) $echo "Test 9 failed: files t9.out and $srcdir/t9.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5(|)"; fi ;;
+    1) $echo "Test 5(|) failed: files 5.O and $srcdir/5.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test 9 may have failed." 1>&2;
-       $echo The command "cmp t9.out $srcdir/t9.exp" failed. 1>&2 ;
+    2) $echo "Test 5(|) may have failed." 1>&2;
+       $echo The command "cmp 5.O $srcdir/5.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t9.err || rm -f t9.err
-$xx -s '[a-z]' < $srcdir/ta.in > ta.out 2> ta.err
+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 a failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test 5(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp ta.out $srcdir/ta.exp
+  cmp 5.O $srcdir/5.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed a"; fi ;;
-    1) $echo "Test a failed: files ta.out and $srcdir/ta.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 5(<)"; fi ;;
+    1) $echo "Test 5(<) failed: files 5.O and $srcdir/5.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test a may have failed." 1>&2;
-       $echo The command "cmp ta.out $srcdir/ta.exp" failed. 1>&2 ;
+    2) $echo "Test 5(<) may have failed." 1>&2;
+       $echo The command "cmp 5.O $srcdir/5.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s ta.err || rm -f ta.err
-$xx -s '[a-c]' < $srcdir/tb.in > tb.out 2> tb.err
+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 b failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test 6(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tb.out $srcdir/tb.exp
+  cmp 6.O $srcdir/6.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed b"; fi ;;
-    1) $echo "Test b failed: files tb.out and $srcdir/tb.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6(|)"; fi ;;
+    1) $echo "Test 6(|) failed: files 6.O and $srcdir/6.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test b may have failed." 1>&2;
-       $echo The command "cmp tb.out $srcdir/tb.exp" failed. 1>&2 ;
+    2) $echo "Test 6(|) may have failed." 1>&2;
+       $echo The command "cmp 6.O $srcdir/6.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tb.err || rm -f tb.err
-$xx -s '[a-b]' < $srcdir/tc.in > tc.out 2> tc.err
+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 c failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test 6(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tc.out $srcdir/tc.exp
+  cmp 6.O $srcdir/6.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed c"; fi ;;
-    1) $echo "Test c failed: files tc.out and $srcdir/tc.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 6(<)"; fi ;;
+    1) $echo "Test 6(<) failed: files 6.O and $srcdir/6.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test c may have failed." 1>&2;
-       $echo The command "cmp tc.out $srcdir/tc.exp" failed. 1>&2 ;
+    2) $echo "Test 6(<) may have failed." 1>&2;
+       $echo The command "cmp 6.O $srcdir/6.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tc.err || rm -f tc.err
-$xx -s '[b-c]' < $srcdir/td.in > td.out 2> td.err
+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 d failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test 7(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp td.out $srcdir/td.exp
+  cmp 7.O $srcdir/7.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed d"; fi ;;
-    1) $echo "Test d failed: files td.out and $srcdir/td.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7(|)"; fi ;;
+    1) $echo "Test 7(|) failed: files 7.O and $srcdir/7.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test d may have failed." 1>&2;
-       $echo The command "cmp td.out $srcdir/td.exp" failed. 1>&2 ;
+    2) $echo "Test 7(|) may have failed." 1>&2;
+       $echo The command "cmp 7.O $srcdir/7.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s td.err || rm -f td.err
-$xx -s '[\0-\5]' < $srcdir/te.in > te.out 2> te.err
+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 e failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test 7(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp te.out $srcdir/te.exp
+  cmp 7.O $srcdir/7.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed e"; fi ;;
-    1) $echo "Test e failed: files te.out and $srcdir/te.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 7(<)"; fi ;;
+    1) $echo "Test 7(<) failed: files 7.O and $srcdir/7.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test e may have failed." 1>&2;
-       $echo The command "cmp te.out $srcdir/te.exp" failed. 1>&2 ;
+    2) $echo "Test 7(<) may have failed." 1>&2;
+       $echo The command "cmp 7.O $srcdir/7.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s te.err || rm -f te.err
-$xx -d '[=[=]' < $srcdir/tf.in > tf.out 2> tf.err
+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 f failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test 8(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tf.out $srcdir/tf.exp
+  cmp 8.O $srcdir/8.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed f"; fi ;;
-    1) $echo "Test f failed: files tf.out and $srcdir/tf.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 8(|)"; fi ;;
+    1) $echo "Test 8(|) failed: files 8.O and $srcdir/8.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test f may have failed." 1>&2;
-       $echo The command "cmp tf.out $srcdir/tf.exp" failed. 1>&2 ;
+    2) $echo "Test 8(|) may have failed." 1>&2;
+       $echo The command "cmp 8.O $srcdir/8.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tf.err || rm -f tf.err
-$xx -d '[=]=]' < $srcdir/tg.in > tg.out 2> tg.err
+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 g failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test 8(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tg.out $srcdir/tg.exp
+  cmp 8.O $srcdir/8.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed g"; fi ;;
-    1) $echo "Test g failed: files tg.out and $srcdir/tg.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 8(<)"; fi ;;
+    1) $echo "Test 8(<) failed: files 8.O and $srcdir/8.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test g may have failed." 1>&2;
-       $echo The command "cmp tg.out $srcdir/tg.exp" failed. 1>&2 ;
+    2) $echo "Test 8(<) may have failed." 1>&2;
+       $echo The command "cmp 8.O $srcdir/8.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tg.err || rm -f tg.err
-$xx -d '[:xdigit:]' < $srcdir/th.in > th.out 2> th.err
+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 h failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp th.out $srcdir/th.exp
+  cmp 9.O $srcdir/9.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed h"; fi ;;
-    1) $echo "Test h failed: files th.out and $srcdir/th.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9(|)"; fi ;;
+    1) $echo "Test 9(|) failed: files 9.O and $srcdir/9.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test h may have failed." 1>&2;
-       $echo The command "cmp th.out $srcdir/th.exp" failed. 1>&2 ;
+    2) $echo "Test 9(|) may have failed." 1>&2;
+       $echo The command "cmp 9.O $srcdir/9.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s th.err || rm -f th.err
-$xx -d '[:xdigit:]' < $srcdir/ti.in > ti.out 2> ti.err
+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 i failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test 9(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp ti.out $srcdir/ti.exp
+  cmp 9.O $srcdir/9.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed i"; fi ;;
-    1) $echo "Test i failed: files ti.out and $srcdir/ti.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed 9(<)"; fi ;;
+    1) $echo "Test 9(<) failed: files 9.O and $srcdir/9.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test i may have failed." 1>&2;
-       $echo The command "cmp ti.out $srcdir/ti.exp" failed. 1>&2 ;
+    2) $echo "Test 9(<) may have failed." 1>&2;
+       $echo The command "cmp 9.O $srcdir/9.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s ti.err || rm -f ti.err
-$xx -d '[:digit:]' < $srcdir/tj.in > tj.out 2> tj.err
+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 j failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test a(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tj.out $srcdir/tj.exp
+  cmp a.O $srcdir/a.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed j"; fi ;;
-    1) $echo "Test j failed: files tj.out and $srcdir/tj.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed a(|)"; fi ;;
+    1) $echo "Test a(|) failed: files a.O and $srcdir/a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test j may have failed." 1>&2;
-       $echo The command "cmp tj.out $srcdir/tj.exp" failed. 1>&2 ;
+    2) $echo "Test a(|) may have failed." 1>&2;
+       $echo The command "cmp a.O $srcdir/a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tj.err || rm -f tj.err
-$xx -d '[:digit:]' < $srcdir/tk.in > tk.out 2> tk.err
+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 k failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test a(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tk.out $srcdir/tk.exp
+  cmp a.O $srcdir/a.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed k"; fi ;;
-    1) $echo "Test k failed: files tk.out and $srcdir/tk.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed a(<)"; fi ;;
+    1) $echo "Test a(<) failed: files a.O and $srcdir/a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test k may have failed." 1>&2;
-       $echo The command "cmp tk.out $srcdir/tk.exp" failed. 1>&2 ;
+    2) $echo "Test a(<) may have failed." 1>&2;
+       $echo The command "cmp a.O $srcdir/a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tk.err || rm -f tk.err
-$xx -d '[:lower:]' < $srcdir/tl.in > tl.out 2> tl.err
+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 l failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test b(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tl.out $srcdir/tl.exp
+  cmp b.O $srcdir/b.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed l"; fi ;;
-    1) $echo "Test l failed: files tl.out and $srcdir/tl.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed b(|)"; fi ;;
+    1) $echo "Test b(|) failed: files b.O and $srcdir/b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test l may have failed." 1>&2;
-       $echo The command "cmp tl.out $srcdir/tl.exp" failed. 1>&2 ;
+    2) $echo "Test b(|) may have failed." 1>&2;
+       $echo The command "cmp b.O $srcdir/b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tl.err || rm -f tl.err
-$xx -d '[:upper:]' < $srcdir/tm.in > tm.out 2> tm.err
+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 m failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test b(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tm.out $srcdir/tm.exp
+  cmp b.O $srcdir/b.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed m"; fi ;;
-    1) $echo "Test m failed: files tm.out and $srcdir/tm.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed b(<)"; fi ;;
+    1) $echo "Test b(<) failed: files b.O and $srcdir/b.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test m may have failed." 1>&2;
-       $echo The command "cmp tm.out $srcdir/tm.exp" failed. 1>&2 ;
+    2) $echo "Test b(<) may have failed." 1>&2;
+       $echo The command "cmp b.O $srcdir/b.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tm.err || rm -f tm.err
-$xx -d '[:lower:][:upper:]' < $srcdir/tn.in > tn.out 2> tn.err
+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 n failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test c(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tn.out $srcdir/tn.exp
+  cmp c.O $srcdir/c.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed n"; fi ;;
-    1) $echo "Test n failed: files tn.out and $srcdir/tn.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed c(|)"; fi ;;
+    1) $echo "Test c(|) failed: files c.O and $srcdir/c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test n may have failed." 1>&2;
-       $echo The command "cmp tn.out $srcdir/tn.exp" failed. 1>&2 ;
+    2) $echo "Test c(|) may have failed." 1>&2;
+       $echo The command "cmp c.O $srcdir/c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tn.err || rm -f tn.err
-$xx -d '[:alpha:]' < $srcdir/to.in > to.out 2> to.err
+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 o failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test c(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp to.out $srcdir/to.exp
+  cmp c.O $srcdir/c.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed o"; fi ;;
-    1) $echo "Test o failed: files to.out and $srcdir/to.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed c(<)"; fi ;;
+    1) $echo "Test c(<) failed: files c.O and $srcdir/c.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test o may have failed." 1>&2;
-       $echo The command "cmp to.out $srcdir/to.exp" failed. 1>&2 ;
+    2) $echo "Test c(<) may have failed." 1>&2;
+       $echo The command "cmp c.O $srcdir/c.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s to.err || rm -f to.err
-$xx -d '[:alnum:]' < $srcdir/tp.in > tp.out 2> tp.err
+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 p failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test d(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tp.out $srcdir/tp.exp
+  cmp d.O $srcdir/d.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed p"; fi ;;
-    1) $echo "Test p failed: files tp.out and $srcdir/tp.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed d(|)"; fi ;;
+    1) $echo "Test d(|) failed: files d.O and $srcdir/d.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test p may have failed." 1>&2;
-       $echo The command "cmp tp.out $srcdir/tp.exp" failed. 1>&2 ;
+    2) $echo "Test d(|) may have failed." 1>&2;
+       $echo The command "cmp d.O $srcdir/d.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tp.err || rm -f tp.err
-$xx -d '[:alnum:]' < $srcdir/tq.in > tq.out 2> tq.err
+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 q failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test d(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tq.out $srcdir/tq.exp
+  cmp d.O $srcdir/d.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed q"; fi ;;
-    1) $echo "Test q failed: files tq.out and $srcdir/tq.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed d(<)"; fi ;;
+    1) $echo "Test d(<) failed: files d.O and $srcdir/d.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test q may have failed." 1>&2;
-       $echo The command "cmp tq.out $srcdir/tq.exp" failed. 1>&2 ;
+    2) $echo "Test d(<) may have failed." 1>&2;
+       $echo The command "cmp d.O $srcdir/d.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tq.err || rm -f tq.err
-$xx -ds '[:alnum:]' '.' < $srcdir/tr.in > tr.out 2> tr.err
+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 r failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test e(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tr.out $srcdir/tr.exp
+  cmp e.O $srcdir/e.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed r"; fi ;;
-    1) $echo "Test r failed: files tr.out and $srcdir/tr.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed e(|)"; fi ;;
+    1) $echo "Test e(|) failed: files e.O and $srcdir/e.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test r may have failed." 1>&2;
-       $echo The command "cmp tr.out $srcdir/tr.exp" failed. 1>&2 ;
+    2) $echo "Test e(|) may have failed." 1>&2;
+       $echo The command "cmp e.O $srcdir/e.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tr.err || rm -f tr.err
-$xx -cs '[:alnum:]' '\n' < $srcdir/ts.in > ts.out 2> ts.err
+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 s failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test e(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp ts.out $srcdir/ts.exp
+  cmp e.O $srcdir/e.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed s"; fi ;;
-    1) $echo "Test s failed: files ts.out and $srcdir/ts.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed e(<)"; fi ;;
+    1) $echo "Test e(<) failed: files e.O and $srcdir/e.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test s may have failed." 1>&2;
-       $echo The command "cmp ts.out $srcdir/ts.exp" failed. 1>&2 ;
+    2) $echo "Test e(<) may have failed." 1>&2;
+       $echo The command "cmp e.O $srcdir/e.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s ts.err || rm -f ts.err
-$xx -cs '[:alnum:]' '[\n*]' < $srcdir/tt.in > tt.out 2> tt.err
+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 t failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test f(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tt.out $srcdir/tt.exp
+  cmp f.O $srcdir/f.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed t"; fi ;;
-    1) $echo "Test t failed: files tt.out and $srcdir/tt.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed f(|)"; fi ;;
+    1) $echo "Test f(|) failed: files f.O and $srcdir/f.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test t may have failed." 1>&2;
-       $echo The command "cmp tt.out $srcdir/tt.exp" failed. 1>&2 ;
+    2) $echo "Test f(|) may have failed." 1>&2;
+       $echo The command "cmp f.O $srcdir/f.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tt.err || rm -f tt.err
-$xx -ds 'b' 'a' < $srcdir/tu.in > tu.out 2> tu.err
+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 u failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test f(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tu.out $srcdir/tu.exp
+  cmp f.O $srcdir/f.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed u"; fi ;;
-    1) $echo "Test u failed: files tu.out and $srcdir/tu.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed f(<)"; fi ;;
+    1) $echo "Test f(<) failed: files f.O and $srcdir/f.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test u may have failed." 1>&2;
-       $echo The command "cmp tu.out $srcdir/tu.exp" failed. 1>&2 ;
+    2) $echo "Test f(<) may have failed." 1>&2;
+       $echo The command "cmp f.O $srcdir/f.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tu.err || rm -f tu.err
-$xx -ds '[:xdigit:]' 'Z' < $srcdir/tv.in > tv.out 2> tv.err
+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 v failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test g(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tv.out $srcdir/tv.exp
+  cmp g.O $srcdir/g.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed v"; fi ;;
-    1) $echo "Test v failed: files tv.out and $srcdir/tv.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed g(|)"; fi ;;
+    1) $echo "Test g(|) failed: files g.O and $srcdir/g.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test v may have failed." 1>&2;
-       $echo The command "cmp tv.out $srcdir/tv.exp" failed. 1>&2 ;
+    2) $echo "Test g(|) may have failed." 1>&2;
+       $echo The command "cmp g.O $srcdir/g.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tv.err || rm -f tv.err
-$xx -ds '\350' '\345' < $srcdir/tw.in > tw.out 2> tw.err
+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 w failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test g(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tw.out $srcdir/tw.exp
+  cmp g.O $srcdir/g.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed w"; fi ;;
-    1) $echo "Test w failed: files tw.out and $srcdir/tw.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed g(<)"; fi ;;
+    1) $echo "Test g(<) failed: files g.O and $srcdir/g.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test w may have failed." 1>&2;
-       $echo The command "cmp tw.out $srcdir/tw.exp" failed. 1>&2 ;
+    2) $echo "Test g(<) may have failed." 1>&2;
+       $echo The command "cmp g.O $srcdir/g.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tw.err || rm -f tw.err
-$xx -s 'abcdefghijklmn' '[:*016]' < $srcdir/tx.in > tx.out 2> tx.err
+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 x failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test h(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tx.out $srcdir/tx.exp
+  cmp h.O $srcdir/h.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed x"; fi ;;
-    1) $echo "Test x failed: files tx.out and $srcdir/tx.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed h(|)"; fi ;;
+    1) $echo "Test h(|) failed: files h.O and $srcdir/h.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test x may have failed." 1>&2;
-       $echo The command "cmp tx.out $srcdir/tx.exp" failed. 1>&2 ;
+    2) $echo "Test h(|) may have failed." 1>&2;
+       $echo The command "cmp h.O $srcdir/h.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tx.err || rm -f tx.err
-$xx -d 'a-z' < $srcdir/ty.in > ty.out 2> ty.err
+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 y failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test h(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp ty.out $srcdir/ty.exp
+  cmp h.O $srcdir/h.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed y"; fi ;;
-    1) $echo "Test y failed: files ty.out and $srcdir/ty.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed h(<)"; fi ;;
+    1) $echo "Test h(<) failed: files h.O and $srcdir/h.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test y may have failed." 1>&2;
-       $echo The command "cmp ty.out $srcdir/ty.exp" failed. 1>&2 ;
+    2) $echo "Test h(<) may have failed." 1>&2;
+       $echo The command "cmp h.O $srcdir/h.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s ty.err || rm -f ty.err
-$xx -ds 'a-z' '$.' < $srcdir/tz.in > tz.out 2> tz.err
+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 z failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test i(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tz.out $srcdir/tz.exp
+  cmp i.O $srcdir/i.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed z"; fi ;;
-    1) $echo "Test z failed: files tz.out and $srcdir/tz.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed i(|)"; fi ;;
+    1) $echo "Test i(|) failed: files i.O and $srcdir/i.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test z may have failed." 1>&2;
-       $echo The command "cmp tz.out $srcdir/tz.exp" failed. 1>&2 ;
+    2) $echo "Test i(|) may have failed." 1>&2;
+       $echo The command "cmp i.O $srcdir/i.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tz.err || rm -f tz.err
-$xx 'a-a' 'z' < $srcdir/trange-a-a.in > trange-a-a.out 2> trange-a-a.err
+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 range-a-a failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test i(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp trange-a-a.out $srcdir/trange-a-a.exp
+  cmp i.O $srcdir/i.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed range-a-a"; fi ;;
-    1) $echo "Test range-a-a failed: files trange-a-a.out and $srcdir/trange-a-a.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed i(<)"; fi ;;
+    1) $echo "Test i(<) failed: files i.O and $srcdir/i.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test range-a-a may have failed." 1>&2;
-       $echo The command "cmp trange-a-a.out $srcdir/trange-a-a.exp" failed. 1>&2 ;
+    2) $echo "Test i(<) may have failed." 1>&2;
+       $echo The command "cmp i.O $srcdir/i.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s trange-a-a.err || rm -f trange-a-a.err
-$xx 'a' '''' < $srcdir/tnull.in > tnull.out 2> tnull.err
+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
+  errors=`expr $errors + 1`
+else
+  cmp j.O $srcdir/j.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed j(|)"; fi ;;
+    1) $echo "Test j(|) failed: files j.O and $srcdir/j.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test j(|) may have failed." 1>&2;
+       $echo The command "cmp j.O $srcdir/j.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp j.O $srcdir/j.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed j(<)"; fi ;;
+    1) $echo "Test j(<) failed: files j.O and $srcdir/j.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test j(<) may have failed." 1>&2;
+       $echo The command "cmp j.O $srcdir/j.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp k.O $srcdir/k.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed k(|)"; fi ;;
+    1) $echo "Test k(|) failed: files k.O and $srcdir/k.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test k(|) may have failed." 1>&2;
+       $echo The command "cmp k.O $srcdir/k.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp k.O $srcdir/k.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed k(<)"; fi ;;
+    1) $echo "Test k(<) failed: files k.O and $srcdir/k.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test k(<) may have failed." 1>&2;
+       $echo The command "cmp k.O $srcdir/k.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp l.O $srcdir/l.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed l(|)"; fi ;;
+    1) $echo "Test l(|) failed: files l.O and $srcdir/l.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test l(|) may have failed." 1>&2;
+       $echo The command "cmp l.O $srcdir/l.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp l.O $srcdir/l.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed l(<)"; fi ;;
+    1) $echo "Test l(<) failed: files l.O and $srcdir/l.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test l(<) may have failed." 1>&2;
+       $echo The command "cmp l.O $srcdir/l.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp m.O $srcdir/m.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed m(|)"; fi ;;
+    1) $echo "Test m(|) failed: files m.O and $srcdir/m.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test m(|) may have failed." 1>&2;
+       $echo The command "cmp m.O $srcdir/m.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp m.O $srcdir/m.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed m(<)"; fi ;;
+    1) $echo "Test m(<) failed: files m.O and $srcdir/m.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test m(<) may have failed." 1>&2;
+       $echo The command "cmp m.O $srcdir/m.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp n.O $srcdir/n.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n(|)"; fi ;;
+    1) $echo "Test n(|) failed: files n.O and $srcdir/n.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n(|) may have failed." 1>&2;
+       $echo The command "cmp n.O $srcdir/n.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp n.O $srcdir/n.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed n(<)"; fi ;;
+    1) $echo "Test n(<) failed: files n.O and $srcdir/n.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test n(<) may have failed." 1>&2;
+       $echo The command "cmp n.O $srcdir/n.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp o.O $srcdir/o.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed o(|)"; fi ;;
+    1) $echo "Test o(|) failed: files o.O and $srcdir/o.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test o(|) may have failed." 1>&2;
+       $echo The command "cmp o.O $srcdir/o.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp o.O $srcdir/o.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed o(<)"; fi ;;
+    1) $echo "Test o(<) failed: files o.O and $srcdir/o.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test o(<) may have failed." 1>&2;
+       $echo The command "cmp o.O $srcdir/o.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp p.O $srcdir/p.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed p(|)"; fi ;;
+    1) $echo "Test p(|) failed: files p.O and $srcdir/p.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test p(|) may have failed." 1>&2;
+       $echo The command "cmp p.O $srcdir/p.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp p.O $srcdir/p.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed p(<)"; fi ;;
+    1) $echo "Test p(<) failed: files p.O and $srcdir/p.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test p(<) may have failed." 1>&2;
+       $echo The command "cmp p.O $srcdir/p.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp q.O $srcdir/q.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed q(|)"; fi ;;
+    1) $echo "Test q(|) failed: files q.O and $srcdir/q.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test q(|) may have failed." 1>&2;
+       $echo The command "cmp q.O $srcdir/q.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp q.O $srcdir/q.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed q(<)"; fi ;;
+    1) $echo "Test q(<) failed: files q.O and $srcdir/q.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test q(<) may have failed." 1>&2;
+       $echo The command "cmp q.O $srcdir/q.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp r.O $srcdir/r.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed r(|)"; fi ;;
+    1) $echo "Test r(|) failed: files r.O and $srcdir/r.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test r(|) may have failed." 1>&2;
+       $echo The command "cmp r.O $srcdir/r.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp r.O $srcdir/r.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed r(<)"; fi ;;
+    1) $echo "Test r(<) failed: files r.O and $srcdir/r.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test r(<) may have failed." 1>&2;
+       $echo The command "cmp r.O $srcdir/r.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp s.O $srcdir/s.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed s(|)"; fi ;;
+    1) $echo "Test s(|) failed: files s.O and $srcdir/s.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test s(|) may have failed." 1>&2;
+       $echo The command "cmp s.O $srcdir/s.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp s.O $srcdir/s.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed s(<)"; fi ;;
+    1) $echo "Test s(<) failed: files s.O and $srcdir/s.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test s(<) may have failed." 1>&2;
+       $echo The command "cmp s.O $srcdir/s.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp t.O $srcdir/t.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed t(|)"; fi ;;
+    1) $echo "Test t(|) failed: files t.O and $srcdir/t.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test t(|) may have failed." 1>&2;
+       $echo The command "cmp t.O $srcdir/t.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp t.O $srcdir/t.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed t(<)"; fi ;;
+    1) $echo "Test t(<) failed: files t.O and $srcdir/t.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test t(<) may have failed." 1>&2;
+       $echo The command "cmp t.O $srcdir/t.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp u.O $srcdir/u.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed u(|)"; fi ;;
+    1) $echo "Test u(|) failed: files u.O and $srcdir/u.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test u(|) may have failed." 1>&2;
+       $echo The command "cmp u.O $srcdir/u.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp u.O $srcdir/u.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed u(<)"; fi ;;
+    1) $echo "Test u(<) failed: files u.O and $srcdir/u.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test u(<) may have failed." 1>&2;
+       $echo The command "cmp u.O $srcdir/u.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp v.O $srcdir/v.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed v(|)"; fi ;;
+    1) $echo "Test v(|) failed: files v.O and $srcdir/v.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test v(|) may have failed." 1>&2;
+       $echo The command "cmp v.O $srcdir/v.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp v.O $srcdir/v.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed v(<)"; fi ;;
+    1) $echo "Test v(<) failed: files v.O and $srcdir/v.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test v(<) may have failed." 1>&2;
+       $echo The command "cmp v.O $srcdir/v.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp w.O $srcdir/w.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed w(|)"; fi ;;
+    1) $echo "Test w(|) failed: files w.O and $srcdir/w.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test w(|) may have failed." 1>&2;
+       $echo The command "cmp w.O $srcdir/w.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp w.O $srcdir/w.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed w(<)"; fi ;;
+    1) $echo "Test w(<) failed: files w.O and $srcdir/w.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test w(<) may have failed." 1>&2;
+       $echo The command "cmp w.O $srcdir/w.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp x.O $srcdir/x.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed x(|)"; fi ;;
+    1) $echo "Test x(|) failed: files x.O and $srcdir/x.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test x(|) may have failed." 1>&2;
+       $echo The command "cmp x.O $srcdir/x.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp x.O $srcdir/x.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed x(<)"; fi ;;
+    1) $echo "Test x(<) failed: files x.O and $srcdir/x.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test x(<) may have failed." 1>&2;
+       $echo The command "cmp x.O $srcdir/x.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp y.O $srcdir/y.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed y(|)"; fi ;;
+    1) $echo "Test y(|) failed: files y.O and $srcdir/y.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test y(|) may have failed." 1>&2;
+       $echo The command "cmp y.O $srcdir/y.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp y.O $srcdir/y.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed y(<)"; fi ;;
+    1) $echo "Test y(<) failed: files y.O and $srcdir/y.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test y(<) may have failed." 1>&2;
+       $echo The command "cmp y.O $srcdir/y.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp z.O $srcdir/z.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed z(|)"; fi ;;
+    1) $echo "Test z(|) failed: files z.O and $srcdir/z.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test z(|) may have failed." 1>&2;
+       $echo The command "cmp z.O $srcdir/z.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp z.O $srcdir/z.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed z(<)"; fi ;;
+    1) $echo "Test z(<) failed: files z.O and $srcdir/z.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test z(<) may have failed." 1>&2;
+       $echo The command "cmp z.O $srcdir/z.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp range-a-a.O $srcdir/range-a-a.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed range-a-a(|)"; fi ;;
+    1) $echo "Test range-a-a(|) failed: files range-a-a.O and $srcdir/range-a-a.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test range-a-a(|) may have failed." 1>&2;
+       $echo The command "cmp range-a-a.O $srcdir/range-a-a.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp range-a-a.O $srcdir/range-a-a.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed range-a-a(<)"; fi ;;
+    1) $echo "Test range-a-a(<) failed: files range-a-a.O and $srcdir/range-a-a.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test range-a-a(<) may have failed." 1>&2;
+       $echo The command "cmp range-a-a.O $srcdir/range-a-a.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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: ../../src/tr return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp null.O $srcdir/null.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed null(|)"; fi ;;
+    1) $echo "Test null(|) failed: files null.O and $srcdir/null.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test null(|) may have failed." 1>&2;
+       $echo The command "cmp null.O $srcdir/null.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp null.O $srcdir/null.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed null(<)"; fi ;;
+    1) $echo "Test null(<) failed: files null.O and $srcdir/null.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test null(<) may have failed." 1>&2;
+       $echo The command "cmp null.O $srcdir/null.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp upcase.O $srcdir/upcase.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed upcase(|)"; fi ;;
+    1) $echo "Test upcase(|) failed: files upcase.O and $srcdir/upcase.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test upcase(|) may have failed." 1>&2;
+       $echo The command "cmp upcase.O $srcdir/upcase.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp upcase.O $srcdir/upcase.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed upcase(<)"; fi ;;
+    1) $echo "Test upcase(<) failed: files upcase.O and $srcdir/upcase.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test upcase(<) may have failed." 1>&2;
+       $echo The command "cmp upcase.O $srcdir/upcase.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp dncase.O $srcdir/dncase.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed dncase(|)"; fi ;;
+    1) $echo "Test dncase(|) failed: files dncase.O and $srcdir/dncase.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test dncase(|) may have failed." 1>&2;
+       $echo The command "cmp dncase.O $srcdir/dncase.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp dncase.O $srcdir/dncase.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed dncase(<)"; fi ;;
+    1) $echo "Test dncase(<) failed: files dncase.O and $srcdir/dncase.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test dncase(<) may have failed." 1>&2;
+       $echo The command "cmp dncase.O $srcdir/dncase.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp rep-cclass.O $srcdir/rep-cclass.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed rep-cclass(|)"; fi ;;
+    1) $echo "Test rep-cclass(|) failed: files rep-cclass.O and $srcdir/rep-cclass.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test rep-cclass(|) may have failed." 1>&2;
+       $echo The command "cmp rep-cclass.O $srcdir/rep-cclass.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp rep-cclass.O $srcdir/rep-cclass.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed rep-cclass(<)"; fi ;;
+    1) $echo "Test rep-cclass(<) failed: files rep-cclass.O and $srcdir/rep-cclass.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test rep-cclass(<) may have failed." 1>&2;
+       $echo The command "cmp rep-cclass.O $srcdir/rep-cclass.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
   errors=`expr $errors + 1`
 else
-  cmp tnull.out $srcdir/tnull.exp
+  cmp rep-1.O $srcdir/rep-1.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed null"; fi ;;
-    1) $echo "Test null failed: files tnull.out and $srcdir/tnull.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed rep-1(|)"; fi ;;
+    1) $echo "Test rep-1(|) failed: files rep-1.O and $srcdir/rep-1.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test null may have failed." 1>&2;
-       $echo The command "cmp tnull.out $srcdir/tnull.exp" failed. 1>&2 ;
+    2) $echo "Test rep-1(|) may have failed." 1>&2;
+       $echo The command "cmp rep-1.O $srcdir/rep-1.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tnull.err || rm -f tnull.err
-$xx '[:lower:]' '[:upper:]' < $srcdir/tupcase.in > tupcase.out 2> tupcase.err
+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 upcase failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test rep-1(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tupcase.out $srcdir/tupcase.exp
+  cmp rep-1.O $srcdir/rep-1.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed upcase"; fi ;;
-    1) $echo "Test upcase failed: files tupcase.out and $srcdir/tupcase.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed rep-1(<)"; fi ;;
+    1) $echo "Test rep-1(<) failed: files rep-1.O and $srcdir/rep-1.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test upcase may have failed." 1>&2;
-       $echo The command "cmp tupcase.out $srcdir/tupcase.exp" failed. 1>&2 ;
+    2) $echo "Test rep-1(<) may have failed." 1>&2;
+       $echo The command "cmp rep-1.O $srcdir/rep-1.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tupcase.err || rm -f tupcase.err
-$xx '[:upper:]' '[:lower:]' < $srcdir/tdncase.in > tdncase.out 2> tdncase.err
+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 dncase failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test rep-2(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tdncase.out $srcdir/tdncase.exp
+  cmp rep-2.O $srcdir/rep-2.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed dncase"; fi ;;
-    1) $echo "Test dncase failed: files tdncase.out and $srcdir/tdncase.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed rep-2(|)"; fi ;;
+    1) $echo "Test rep-2(|) failed: files rep-2.O and $srcdir/rep-2.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test dncase may have failed." 1>&2;
-       $echo The command "cmp tdncase.out $srcdir/tdncase.exp" failed. 1>&2 ;
+    2) $echo "Test rep-2(|) may have failed." 1>&2;
+       $echo The command "cmp rep-2.O $srcdir/rep-2.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tdncase.err || rm -f tdncase.err
-$xx 'a[=*2][=c=]' 'xyyz' < $srcdir/trep-cclass.in > trep-cclass.out 2> trep-cclass.err
+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-cclass failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test rep-2(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp trep-cclass.out $srcdir/trep-cclass.exp
+  cmp rep-2.O $srcdir/rep-2.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed rep-cclass"; fi ;;
-    1) $echo "Test rep-cclass failed: files trep-cclass.out and $srcdir/trep-cclass.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed rep-2(<)"; fi ;;
+    1) $echo "Test rep-2(<) failed: files rep-2.O and $srcdir/rep-2.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test rep-cclass may have failed." 1>&2;
-       $echo The command "cmp trep-cclass.out $srcdir/trep-cclass.exp" failed. 1>&2 ;
+    2) $echo "Test rep-2(<) may have failed." 1>&2;
+       $echo The command "cmp rep-2.O $srcdir/rep-2.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s trep-cclass.err || rm -f trep-cclass.err
-$xx '[:*3][:digit:]' 'a-m' < $srcdir/trep-1.in > trep-1.out 2> trep-1.err
+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-1 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test rep-3(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp trep-1.out $srcdir/trep-1.exp
+  cmp rep-3.O $srcdir/rep-3.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed rep-1"; fi ;;
-    1) $echo "Test rep-1 failed: files trep-1.out and $srcdir/trep-1.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed rep-3(|)"; fi ;;
+    1) $echo "Test rep-3(|) failed: files rep-3.O and $srcdir/rep-3.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test rep-1 may have failed." 1>&2;
-       $echo The command "cmp trep-1.out $srcdir/trep-1.exp" failed. 1>&2 ;
+    2) $echo "Test rep-3(|) may have failed." 1>&2;
+       $echo The command "cmp rep-3.O $srcdir/rep-3.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s trep-1.err || rm -f trep-1.err
-$xx 'a[b*512]c' '1[x*]2' < $srcdir/trep-2.in > trep-2.out 2> trep-2.err
+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-2 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test rep-3(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp trep-2.out $srcdir/trep-2.exp
+  cmp rep-3.O $srcdir/rep-3.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed rep-2"; fi ;;
-    1) $echo "Test rep-2 failed: files trep-2.out and $srcdir/trep-2.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed rep-3(<)"; fi ;;
+    1) $echo "Test rep-3(<) failed: files rep-3.O and $srcdir/rep-3.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test rep-2 may have failed." 1>&2;
-       $echo The command "cmp trep-2.out $srcdir/trep-2.exp" failed. 1>&2 ;
+    2) $echo "Test rep-3(<) may have failed." 1>&2;
+       $echo The command "cmp rep-3.O $srcdir/rep-3.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s trep-2.err || rm -f trep-2.err
-$xx 'a[b*513]c' '1[x*]2' < $srcdir/trep-3.in > trep-3.out 2> trep-3.err
+test -s rep-3.E || rm -f rep-3.E
+cat $srcdir/esc.I | $xx 'a\-z' 'A-Z' > esc.O 2> esc.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 esc(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp trep-3.out $srcdir/trep-3.exp
+  cmp esc.O $srcdir/esc.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed rep-3"; fi ;;
-    1) $echo "Test rep-3 failed: files trep-3.out and $srcdir/trep-3.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed esc(|)"; fi ;;
+    1) $echo "Test esc(|) failed: files esc.O and $srcdir/esc.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test rep-3 may have failed." 1>&2;
-       $echo The command "cmp trep-3.out $srcdir/trep-3.exp" failed. 1>&2 ;
+    2) $echo "Test esc(|) may have failed." 1>&2;
+       $echo The command "cmp esc.O $srcdir/esc.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s trep-3.err || rm -f trep-3.err
-$xx 'a\-z' 'A-Z' < $srcdir/tesc.in > tesc.out 2> tesc.err
+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: ../../src/tr return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp esc.O $srcdir/esc.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed esc(<)"; fi ;;
+    1) $echo "Test esc(<) failed: files esc.O and $srcdir/esc.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test esc(<) may have failed." 1>&2;
+       $echo The command "cmp esc.O $srcdir/esc.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
   errors=`expr $errors + 1`
 else
-  cmp tesc.out $srcdir/tesc.exp
+  cmp ross-0a.O $srcdir/ross-0a.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed esc"; fi ;;
-    1) $echo "Test esc failed: files tesc.out and $srcdir/tesc.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed ross-0a(|)"; fi ;;
+    1) $echo "Test ross-0a(|) failed: files ross-0a.O and $srcdir/ross-0a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test esc may have failed." 1>&2;
-       $echo The command "cmp tesc.out $srcdir/tesc.exp" failed. 1>&2 ;
+    2) $echo "Test ross-0a(|) may have failed." 1>&2;
+       $echo The command "cmp ross-0a.O $srcdir/ross-0a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tesc.err || rm -f tesc.err
-$xx -cs '[:upper:]' 'X[Y*]' < $srcdir/tross-0a.in > tross-0a.out 2> tross-0a.err
+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: ../../src/tr return code $code differs from expected value 1" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tross-0a.out $srcdir/tross-0a.exp
+  cmp ross-0a.O $srcdir/ross-0a.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed ross-0a"; fi ;;
-    1) $echo "Test ross-0a failed: files tross-0a.out and $srcdir/tross-0a.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed ross-0a(<)"; fi ;;
+    1) $echo "Test ross-0a(<) failed: files ross-0a.O and $srcdir/ross-0a.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test ross-0a may have failed." 1>&2;
-       $echo The command "cmp tross-0a.out $srcdir/tross-0a.exp" failed. 1>&2 ;
+    2) $echo "Test ross-0a(<) may have failed." 1>&2;
+       $echo The command "cmp ross-0a.O $srcdir/ross-0a.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tross-0a.err || rm -f tross-0a.err
-$xx -cs '[:cntrl:]' 'X[Y*]' < $srcdir/tross-0b.in > tross-0b.out 2> tross-0b.err
+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: ../../src/tr return code $code differs from expected value 1" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp ross-0b.O $srcdir/ross-0b.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed ross-0b(|)"; fi ;;
+    1) $echo "Test ross-0b(|) failed: files ross-0b.O and $srcdir/ross-0b.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test ross-0b(|) may have failed." 1>&2;
+       $echo The command "cmp ross-0b.O $srcdir/ross-0b.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp ross-0b.O $srcdir/ross-0b.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed ross-0b(<)"; fi ;;
+    1) $echo "Test ross-0b(<) failed: files ross-0b.O and $srcdir/ross-0b.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test ross-0b(<) may have failed." 1>&2;
+       $echo The command "cmp ross-0b.O $srcdir/ross-0b.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp ross-1a.O $srcdir/ross-1a.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed ross-1a(|)"; fi ;;
+    1) $echo "Test ross-1a(|) failed: files ross-1a.O and $srcdir/ross-1a.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test ross-1a(|) may have failed." 1>&2;
+       $echo The command "cmp ross-1a.O $srcdir/ross-1a.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp ross-1a.O $srcdir/ross-1a.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed ross-1a(<)"; fi ;;
+    1) $echo "Test ross-1a(<) failed: files ross-1a.O and $srcdir/ross-1a.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test ross-1a(<) may have failed." 1>&2;
+       $echo The command "cmp ross-1a.O $srcdir/ross-1a.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp ross-1b.O $srcdir/ross-1b.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed ross-1b(|)"; fi ;;
+    1) $echo "Test ross-1b(|) failed: files ross-1b.O and $srcdir/ross-1b.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test ross-1b(|) may have failed." 1>&2;
+       $echo The command "cmp ross-1b.O $srcdir/ross-1b.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp ross-1b.O $srcdir/ross-1b.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed ross-1b(<)"; fi ;;
+    1) $echo "Test ross-1b(<) failed: files ross-1b.O and $srcdir/ross-1b.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test ross-1b(<) may have failed." 1>&2;
+       $echo The command "cmp ross-1b.O $srcdir/ross-1b.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp ross-2.O $srcdir/ross-2.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed ross-2(|)"; fi ;;
+    1) $echo "Test ross-2(|) failed: files ross-2.O and $srcdir/ross-2.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test ross-2(|) may have failed." 1>&2;
+       $echo The command "cmp ross-2.O $srcdir/ross-2.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
+  errors=`expr $errors + 1`
+else
+  cmp ross-2.O $srcdir/ross-2.X
+  case $? in
+    0) if test "$VERBOSE" ; then $echo "passed ross-2(<)"; fi ;;
+    1) $echo "Test ross-2(<) failed: files ross-2.O and $srcdir/ross-2.X differ" 1>&2;
+       errors=`expr $errors + 1` ;;
+    2) $echo "Test ross-2(<) may have failed." 1>&2;
+       $echo The command "cmp ross-2.O $srcdir/ross-2.X" failed. 1>&2 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+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
   errors=`expr $errors + 1`
 else
-  cmp tross-0b.out $srcdir/tross-0b.exp
+  cmp ross-3.O $srcdir/ross-3.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed ross-0b"; fi ;;
-    1) $echo "Test ross-0b failed: files tross-0b.out and $srcdir/tross-0b.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed ross-3(|)"; fi ;;
+    1) $echo "Test ross-3(|) failed: files ross-3.O and $srcdir/ross-3.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test ross-0b may have failed." 1>&2;
-       $echo The command "cmp tross-0b.out $srcdir/tross-0b.exp" failed. 1>&2 ;
+    2) $echo "Test ross-3(|) may have failed." 1>&2;
+       $echo The command "cmp ross-3.O $srcdir/ross-3.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tross-0b.err || rm -f tross-0b.err
-$xx -cs '[:upper:]' '[X*]' < $srcdir/tross-1a.in > tross-1a.out 2> tross-1a.err
+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-1a failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test ross-3(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tross-1a.out $srcdir/tross-1a.exp
+  cmp ross-3.O $srcdir/ross-3.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed ross-1a"; fi ;;
-    1) $echo "Test ross-1a failed: files tross-1a.out and $srcdir/tross-1a.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed ross-3(<)"; fi ;;
+    1) $echo "Test ross-3(<) failed: files ross-3.O and $srcdir/ross-3.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test ross-1a may have failed." 1>&2;
-       $echo The command "cmp tross-1a.out $srcdir/tross-1a.exp" failed. 1>&2 ;
+    2) $echo "Test ross-3(<) may have failed." 1>&2;
+       $echo The command "cmp ross-3.O $srcdir/ross-3.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tross-1a.err || rm -f tross-1a.err
-$xx -cs '[:upper:][:digit:]' '[Z*]' < $srcdir/tross-1b.in > tross-1b.out 2> tross-1b.err
+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-1b failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test ross-4(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tross-1b.out $srcdir/tross-1b.exp
+  cmp ross-4.O $srcdir/ross-4.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed ross-1b"; fi ;;
-    1) $echo "Test ross-1b failed: files tross-1b.out and $srcdir/tross-1b.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed ross-4(|)"; fi ;;
+    1) $echo "Test ross-4(|) failed: files ross-4.O and $srcdir/ross-4.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test ross-1b may have failed." 1>&2;
-       $echo The command "cmp tross-1b.out $srcdir/tross-1b.exp" failed. 1>&2 ;
+    2) $echo "Test ross-4(|) may have failed." 1>&2;
+       $echo The command "cmp ross-4.O $srcdir/ross-4.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tross-1b.err || rm -f tross-1b.err
-$xx -dcs '[:lower:]' 'n-rs-z' < $srcdir/tross-2.in > tross-2.out 2> tross-2.err
+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-2 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test ross-4(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tross-2.out $srcdir/tross-2.exp
+  cmp ross-4.O $srcdir/ross-4.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed ross-2"; fi ;;
-    1) $echo "Test ross-2 failed: files tross-2.out and $srcdir/tross-2.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed ross-4(<)"; fi ;;
+    1) $echo "Test ross-4(<) failed: files ross-4.O and $srcdir/ross-4.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test ross-2 may have failed." 1>&2;
-       $echo The command "cmp tross-2.out $srcdir/tross-2.exp" failed. 1>&2 ;
+    2) $echo "Test ross-4(<) may have failed." 1>&2;
+       $echo The command "cmp ross-4.O $srcdir/ross-4.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tross-2.err || rm -f tross-2.err
-$xx -ds '[:xdigit:]' '[:alnum:]' < $srcdir/tross-3.in > tross-3.out 2> tross-3.err
+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-3 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test ross-5(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tross-3.out $srcdir/tross-3.exp
+  cmp ross-5.O $srcdir/ross-5.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed ross-3"; fi ;;
-    1) $echo "Test ross-3 failed: files tross-3.out and $srcdir/tross-3.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed ross-5(|)"; fi ;;
+    1) $echo "Test ross-5(|) failed: files ross-5.O and $srcdir/ross-5.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test ross-3 may have failed." 1>&2;
-       $echo The command "cmp tross-3.out $srcdir/tross-3.exp" failed. 1>&2 ;
+    2) $echo "Test ross-5(|) may have failed." 1>&2;
+       $echo The command "cmp ross-5.O $srcdir/ross-5.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tross-3.err || rm -f tross-3.err
-$xx -dcs '[:alnum:]' '[:digit:]' < $srcdir/tross-4.in > tross-4.out 2> tross-4.err
+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-4 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test ross-5(<) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tross-4.out $srcdir/tross-4.exp
+  cmp ross-5.O $srcdir/ross-5.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed ross-4"; fi ;;
-    1) $echo "Test ross-4 failed: files tross-4.out and $srcdir/tross-4.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed ross-5(<)"; fi ;;
+    1) $echo "Test ross-5(<) failed: files ross-5.O and $srcdir/ross-5.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test ross-4 may have failed." 1>&2;
-       $echo The command "cmp tross-4.out $srcdir/tross-4.exp" failed. 1>&2 ;
+    2) $echo "Test ross-5(<) may have failed." 1>&2;
+       $echo The command "cmp ross-5.O $srcdir/ross-5.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tross-4.err || rm -f tross-4.err
-$xx -dc '[:lower:]' < $srcdir/tross-5.in > tross-5.out 2> tross-5.err
+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-5 failed: ../../src/tr return code $code differs from expected value 0" 1>&2
+  $echo "Test ross-6(|) failed: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tross-5.out $srcdir/tross-5.exp
+  cmp ross-6.O $srcdir/ross-6.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed ross-5"; fi ;;
-    1) $echo "Test ross-5 failed: files tross-5.out and $srcdir/tross-5.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed ross-6(|)"; fi ;;
+    1) $echo "Test ross-6(|) failed: files ross-6.O and $srcdir/ross-6.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test ross-5 may have failed." 1>&2;
-       $echo The command "cmp tross-5.out $srcdir/tross-5.exp" failed. 1>&2 ;
+    2) $echo "Test ross-6(|) may have failed." 1>&2;
+       $echo The command "cmp ross-6.O $srcdir/ross-6.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tross-5.err || rm -f tross-5.err
-$xx -dc '[:upper:]' < $srcdir/tross-6.in > tross-6.out 2> tross-6.err
+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: ../../src/tr return code $code differs from expected value 0" 1>&2
   errors=`expr $errors + 1`
 else
-  cmp tross-6.out $srcdir/tross-6.exp
+  cmp ross-6.O $srcdir/ross-6.X
   case $? in
-    0) if test "$VERBOSE" ; then $echo "passed ross-6"; fi ;;
-    1) $echo "Test ross-6 failed: files tross-6.out and $srcdir/tross-6.exp differ" 1>&2;
+    0) if test "$VERBOSE" ; then $echo "passed ross-6(<)"; fi ;;
+    1) $echo "Test ross-6(<) failed: files ross-6.O and $srcdir/ross-6.X differ" 1>&2;
        errors=`expr $errors + 1` ;;
-    2) $echo "Test ross-6 may have failed." 1>&2;
-       $echo The command "cmp tross-6.out $srcdir/tross-6.exp" failed. 1>&2 ;
+    2) $echo "Test ross-6(<) may have failed." 1>&2;
+       $echo The command "cmp ross-6.O $srcdir/ross-6.X" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s tross-6.err || rm -f tross-6.err
+test -s ross-6.E || rm -f ross-6.E
 if test $errors = 0 ; then
   $echo Passed all 53 tests. 1>&2
 else