.

4 files changed, 311 insertions, 52 deletions

diff --git a/tests/tail/Makefile.am b/tests/tail/Makefile.am
index 1f04832da..783ce12f2 100644
--- a/tests/tail/Makefile.am
+++ b/tests/tail/Makefile.am
@@ -3,9 +3,18 @@
 ##test-files-begin
 x = tail
 explicit =
-maint_gen = t1.in t1.exp t2.in t2.exp t3.in t3.exp t4.in t4.exp t5.in t5.exp
-run_gen = t1.out t1.err t2.out t2.err t3.out t3.err t4.out t4.err t5.out \
-t5.err
+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 terr-1.in terr-1.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 terr-1.out terr-1.err
 ##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 ff534c4e2..733da7157 100644
--- a/tests/tail/Makefile.in
+++ b/tests/tail/Makefile.in
@@ -44,9 +44,18 @@ CC = @CC@
 
 x = tail
 explicit =
-maint_gen = t1.in t1.exp t2.in t2.exp t3.in t3.exp t4.in t4.exp t5.in t5.exp
-run_gen = t1.out t1.err t2.out t2.err t3.out t3.err t4.out t4.err t5.out \
-t5.err
+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 terr-1.in terr-1.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 terr-1.out terr-1.err
 
 EXTRA_DIST = mk-script.pl Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
diff --git a/tests/tail/Test.pm b/tests/tail/Test.pm
index 05feee636..9d18af2cb 100755
--- a/tests/tail/Test.pm
+++ b/tests/tail/Test.pm
@@ -7,11 +7,31 @@ $Test::input_via_stdin = 1;
 my @tv = (
 # test name, options, input, expected output, expected return code
 #
-['1', '+2c', 'abcd', 'bcd', 0],
-['2', '+8c', 'abcd', '', 0],
-['3', '-1c', 'abcd', 'd', 0],
-['4', '-9c', 'abcd', 'abcd', 0],
-['5', '-12c', 'x' . ('y' x 12) . 'z', ('y' x 11) . 'z', 0],
+['obs-c1', '+2c', 'abcd', 'bcd', 0],
+['obs-c2', '+8c', 'abcd', '', 0],
+['obs-c3', '-1c', 'abcd', 'd', 0],
+['obs-c4', '-9c', 'abcd', 'abcd', 0],
+['obs-c5', '-12c', 'x' . ('y' x 12) . 'z', ('y' x 11) . 'z', 0],
+
+['obs-l1', '-1l', 'x', 'x', 0],
+['obs-l2', '-1l', "x\ny\n", "y\n", 0],
+['obs-l3', '-1l', "x\ny", "y", 0],
+['obs-l4', '+1l', "x\ny\n", "x\ny\n", 0],
+['obs-l5', '+2l', "x\ny\n", "y\n", 0],
+
+# Same as -l tests, but without the `l'.
+['obs-1', '-1', 'x', 'x', 0],
+['obs-2', '-1', "x\ny\n", "y\n", 0],
+['obs-3', '-1', "x\ny", "y", 0],
+['obs-4', '+1', "x\ny\n", "x\ny\n", 0],
+['obs-5', '+2', "x\ny\n", "y\n", 0],
+
+# This is equivalent to +10c
+['obsx-1', '+c', 'x' . ('y' x 10) . 'z', 'yyz', 0],
+# This is equivalent to +10l
+['obsx-2', '+l', "x\n" . ("y\n" x 10) . 'z', "y\ny\nz", 0],
+
+['err-1', '+2', "x\ny\n", "y\n", 0],
 );
 
 sub test_vector
diff --git a/tests/tail/tail-tests b/tests/tail/tail-tests
index 6804eeaac..ec602d836 100755
--- a/tests/tail/tail-tests
+++ b/tests/tail/tail-tests
@@ -9,93 +9,314 @@ $echo testing program: $xx
 errors=0
 test "$srcdir" || srcdir=.
 test "$VERBOSE" && $xx --version 2> /dev/null
-$xx +2c < $srcdir/t1.in > t1.out 2> t1.err
+$xx +2c < $srcdir/tobs-c1.in > tobs-c1.out 2> tobs-c1.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 1 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 t1.out $srcdir/t1.exp
+  cmp tobs-c1.out $srcdir/tobs-c1.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 1; fi ;; # equal files
-    1) $echo Test 1 failed: files t1.out and $srcdir/t1.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo passed obs-c1; fi ;; # equal files
+    1) $echo Test obs-c1 failed: files tobs-c1.out and $srcdir/tobs-c1.exp 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 obs-c1 may have failed. 1>&2;
+       $echo The command "cmp tobs-c1.out $srcdir/tobs-c1.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t1.err || rm -f t1.err
-$xx +8c < $srcdir/t2.in > t2.out 2> t2.err
+test -s tobs-c1.err || rm -f tobs-c1.err
+$xx +8c < $srcdir/tobs-c2.in > tobs-c2.out 2> tobs-c2.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 2 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 t2.out $srcdir/t2.exp
+  cmp tobs-c2.out $srcdir/tobs-c2.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 2; fi ;; # equal files
-    1) $echo Test 2 failed: files t2.out and $srcdir/t2.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo passed obs-c2; fi ;; # equal files
+    1) $echo Test obs-c2 failed: files tobs-c2.out and $srcdir/tobs-c2.exp 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 obs-c2 may have failed. 1>&2;
+       $echo The command "cmp tobs-c2.out $srcdir/tobs-c2.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t2.err || rm -f t2.err
-$xx -1c < $srcdir/t3.in > t3.out 2> t3.err
+test -s tobs-c2.err || rm -f tobs-c2.err
+$xx -1c < $srcdir/tobs-c3.in > tobs-c3.out 2> tobs-c3.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 3 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 t3.out $srcdir/t3.exp
+  cmp tobs-c3.out $srcdir/tobs-c3.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 3; fi ;; # equal files
-    1) $echo Test 3 failed: files t3.out and $srcdir/t3.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo passed obs-c3; fi ;; # equal files
+    1) $echo Test obs-c3 failed: files tobs-c3.out and $srcdir/tobs-c3.exp 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 obs-c3 may have failed. 1>&2;
+       $echo The command "cmp tobs-c3.out $srcdir/tobs-c3.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t3.err || rm -f t3.err
-$xx -9c < $srcdir/t4.in > t4.out 2> t4.err
+test -s tobs-c3.err || rm -f tobs-c3.err
+$xx -9c < $srcdir/tobs-c4.in > tobs-c4.out 2> tobs-c4.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 4 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 t4.out $srcdir/t4.exp
+  cmp tobs-c4.out $srcdir/tobs-c4.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 4; fi ;; # equal files
-    1) $echo Test 4 failed: files t4.out and $srcdir/t4.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo passed obs-c4; fi ;; # equal files
+    1) $echo Test obs-c4 failed: files tobs-c4.out and $srcdir/tobs-c4.exp 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 obs-c4 may have failed. 1>&2;
+       $echo The command "cmp tobs-c4.out $srcdir/tobs-c4.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t4.err || rm -f t4.err
-$xx -12c < $srcdir/t5.in > t5.out 2> t5.err
+test -s tobs-c4.err || rm -f tobs-c4.err
+$xx -12c < $srcdir/tobs-c5.in > tobs-c5.out 2> tobs-c5.err
 code=$?
 if test $code != 0 ; then
-  $echo Test 5 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 t5.out $srcdir/t5.exp
+  cmp tobs-c5.out $srcdir/tobs-c5.exp
   case $? in
-    0) if test "$VERBOSE" ; then $echo passed 5; fi ;; # equal files
-    1) $echo Test 5 failed: files t5.out and $srcdir/t5.exp differ 1>&2;
+    0) if test "$VERBOSE" ; then $echo passed obs-c5; fi ;; # equal files
+    1) $echo Test obs-c5 failed: files tobs-c5.out and $srcdir/tobs-c5.exp 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 obs-c5 may have failed. 1>&2;
+       $echo The command "cmp tobs-c5.out $srcdir/tobs-c5.exp" failed. 1>&2 ;
        errors=`expr $errors + 1` ;;
   esac
 fi
-test -s t5.err || rm -f t5.err
+test -s tobs-c5.err || rm -f tobs-c5.err
+$xx -1l < $srcdir/tobs-l1.in > tobs-l1.out 2> tobs-l1.err
+code=$?
+if test $code != 0 ; then
+  $echo Test obs-l1 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
+  case $? in
+    0) if test "$VERBOSE" ; then $echo passed obs-l1; fi ;; # equal files
+    1) $echo Test obs-l1 failed: files tobs-l1.out and $srcdir/tobs-l1.exp 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 ;
+       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
+code=$?
+if test $code != 0 ; then
+  $echo Test obs-l2 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
+  case $? in
+    0) if test "$VERBOSE" ; then $echo passed obs-l2; fi ;; # equal files
+    1) $echo Test obs-l2 failed: files tobs-l2.out and $srcdir/tobs-l2.exp 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 ;
+       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
+code=$?
+if test $code != 0 ; then
+  $echo Test obs-l3 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
+  case $? in
+    0) if test "$VERBOSE" ; then $echo passed obs-l3; fi ;; # equal files
+    1) $echo Test obs-l3 failed: files tobs-l3.out and $srcdir/tobs-l3.exp 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 ;
+       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
+code=$?
+if test $code != 0 ; then
+  $echo Test obs-l4 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
+  case $? in
+    0) if test "$VERBOSE" ; then $echo passed obs-l4; fi ;; # equal files
+    1) $echo Test obs-l4 failed: files tobs-l4.out and $srcdir/tobs-l4.exp 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 ;
+       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
+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 tobs-l5.out $srcdir/tobs-l5.exp
+  case $? in
+    0) if test "$VERBOSE" ; then $echo passed obs-l5; fi ;; # equal files
+    1) $echo Test obs-l5 failed: files tobs-l5.out and $srcdir/tobs-l5.exp 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 ;
+       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
+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 tobs-1.out $srcdir/tobs-1.exp
+  case $? in
+    0) if test "$VERBOSE" ; then $echo passed obs-1; fi ;; # equal files
+    1) $echo Test obs-1 failed: files tobs-1.out and $srcdir/tobs-1.exp 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 ;
+       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
+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 tobs-2.out $srcdir/tobs-2.exp
+  case $? in
+    0) if test "$VERBOSE" ; then $echo passed obs-2; fi ;; # equal files
+    1) $echo Test obs-2 failed: files tobs-2.out and $srcdir/tobs-2.exp 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 ;
+       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
+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 tobs-3.out $srcdir/tobs-3.exp
+  case $? in
+    0) if test "$VERBOSE" ; then $echo passed obs-3; fi ;; # equal files
+    1) $echo Test obs-3 failed: files tobs-3.out and $srcdir/tobs-3.exp 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 ;
+       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
+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 tobs-4.out $srcdir/tobs-4.exp
+  case $? in
+    0) if test "$VERBOSE" ; then $echo passed obs-4; fi ;; # equal files
+    1) $echo Test obs-4 failed: files tobs-4.out and $srcdir/tobs-4.exp 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 ;
+       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
+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 tobs-5.out $srcdir/tobs-5.exp
+  case $? in
+    0) if test "$VERBOSE" ; then $echo passed obs-5; fi ;; # equal files
+    1) $echo Test obs-5 failed: files tobs-5.out and $srcdir/tobs-5.exp 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 ;
+       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
+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 tobsx-1.out $srcdir/tobsx-1.exp
+  case $? in
+    0) if test "$VERBOSE" ; then $echo passed obsx-1; fi ;; # equal files
+    1) $echo Test obsx-1 failed: files tobsx-1.out and $srcdir/tobsx-1.exp 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 ;
+       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
+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 tobsx-2.out $srcdir/tobsx-2.exp
+  case $? in
+    0) if test "$VERBOSE" ; then $echo passed obsx-2; fi ;; # equal files
+    1) $echo Test obsx-2 failed: files tobsx-2.out and $srcdir/tobsx-2.exp 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 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s tobsx-2.err || rm -f tobsx-2.err
+$xx +2 < $srcdir/terr-1.in > terr-1.out 2> terr-1.err
+code=$?
+if test $code != 0 ; then
+  $echo Test err-1 failed: ../../src/tail return code $code differs from expected value 0 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp terr-1.out $srcdir/terr-1.exp
+  case $? in
+    0) if test "$VERBOSE" ; then $echo passed err-1; fi ;; # equal files
+    1) $echo Test err-1 failed: files terr-1.out and $srcdir/terr-1.exp 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 ;
+       errors=`expr $errors + 1` ;;
+  esac
+fi
+test -s terr-1.err || rm -f terr-1.err
 if test $errors = 0 ; then
-  $echo Passed all 5 tests. 1>&2
+  $echo Passed all 18 tests. 1>&2
 else
   $echo Failed $errors tests. 1>&2
 fi