.

2 files changed, 115 insertions, 5 deletions

diff --git a/tests/cut/Makefile.am b/tests/cut/Makefile.am
index 93202d34b..a01cabe6f 100644
--- a/tests/cut/Makefile.am
+++ b/tests/cut/Makefile.am
@@ -11,8 +11,9 @@ empty-fl.X missing-fl.I missing-fl.X empty-bl.I empty-bl.X missing-bl.I \
 missing-bl.X empty-f1.I empty-f1.X empty-f2.I empty-f2.X o-delim.I o-delim.X \
 nul-idelim.I nul-idelim.X nul-odelim.I nul-odelim.X multichar-od.I \
 multichar-od.X 8bit-delim.I 8bit-delim.X out-delim1.I out-delim1.X \
-out-delim2.I out-delim2.X out-delim3.I out-delim3.X out-delim4.I out-delim4.X \
-out-delim5.I out-delim5.X
+out-delim2.I out-delim2.X out-delim3.I out-delim3.X out-delim3a.I \
+out-delim3a.X out-delim4.I out-delim4.X out-delim5.I out-delim5.X \
+out-delim6.I out-delim6.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 \
@@ -21,8 +22,9 @@ empty-fl.E missing-fl.O missing-fl.E empty-bl.O empty-bl.E missing-bl.O \
 missing-bl.E empty-f1.O empty-f1.E empty-f2.O empty-f2.E o-delim.O o-delim.E \
 nul-idelim.O nul-idelim.E nul-odelim.O nul-odelim.E multichar-od.O \
 multichar-od.E 8bit-delim.O 8bit-delim.E out-delim1.O out-delim1.E \
-out-delim2.O out-delim2.E out-delim3.O out-delim3.E out-delim4.O out-delim4.E \
-out-delim5.O out-delim5.E
+out-delim2.O out-delim2.E out-delim3.O out-delim3.E out-delim3a.O \
+out-delim3a.E out-delim4.O out-delim4.E out-delim5.O out-delim5.E \
+out-delim6.O out-delim6.E
 ##test-files-end
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
diff --git a/tests/cut/cut-tests b/tests/cut/cut-tests
index 7251c64a8..a92dfce9d 100755
--- a/tests/cut/cut-tests
+++ b/tests/cut/cut-tests
@@ -2556,6 +2556,60 @@ else
   esac
 fi
 test -s out-delim3.E || rm -f out-delim3.E
+$xx -c1-3,2-4,6- --output-d=: $srcdir/out-delim3a.I > out-delim3a.O 2> out-delim3a.E
+code=$?
+if test $code != 0; then
+  $echo "Test out-delim3a(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp out-delim3a.O $srcdir/out-delim3a.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed out-delim3a(F)"; fi;;
+    1) $echo "Test out-delim3a(F) failed: files out-delim3a.O and $srcdir/out-delim3a.X differ" 1>&2
+       (diff -c out-delim3a.O $srcdir/out-delim3a.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test out-delim3a(F) may have failed." 1>&2
+       $echo The command "cmp out-delim3a.O $srcdir/out-delim3a.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s out-delim3a.E || rm -f out-delim3a.E
+cat $srcdir/out-delim3a.I | $xx -c1-3,2-4,6- --output-d=: > out-delim3a.O 2> out-delim3a.E
+code=$?
+if test $code != 0; then
+  $echo "Test out-delim3a(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp out-delim3a.O $srcdir/out-delim3a.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed out-delim3a(|)"; fi;;
+    1) $echo "Test out-delim3a(|) failed: files out-delim3a.O and $srcdir/out-delim3a.X differ" 1>&2
+       (diff -c out-delim3a.O $srcdir/out-delim3a.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test out-delim3a(|) may have failed." 1>&2
+       $echo The command "cmp out-delim3a.O $srcdir/out-delim3a.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s out-delim3a.E || rm -f out-delim3a.E
+$xx -c1-3,2-4,6- --output-d=: < $srcdir/out-delim3a.I > out-delim3a.O 2> out-delim3a.E
+code=$?
+if test $code != 0; then
+  $echo "Test out-delim3a(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp out-delim3a.O $srcdir/out-delim3a.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed out-delim3a(<)"; fi;;
+    1) $echo "Test out-delim3a(<) failed: files out-delim3a.O and $srcdir/out-delim3a.X differ" 1>&2
+       (diff -c out-delim3a.O $srcdir/out-delim3a.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test out-delim3a(<) may have failed." 1>&2
+       $echo The command "cmp out-delim3a.O $srcdir/out-delim3a.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s out-delim3a.E || rm -f out-delim3a.E
 $xx -c4-,2-3 --output-d=: $srcdir/out-delim4.I > out-delim4.O 2> out-delim4.E
 code=$?
 if test $code != 0; then
@@ -2664,8 +2718,62 @@ else
   esac
 fi
 test -s out-delim5.E || rm -f out-delim5.E
+$xx -c2,1-3 --output-d=: $srcdir/out-delim6.I > out-delim6.O 2> out-delim6.E
+code=$?
+if test $code != 0; then
+  $echo "Test out-delim6(F) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp out-delim6.O $srcdir/out-delim6.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed out-delim6(F)"; fi;;
+    1) $echo "Test out-delim6(F) failed: files out-delim6.O and $srcdir/out-delim6.X differ" 1>&2
+       (diff -c out-delim6.O $srcdir/out-delim6.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test out-delim6(F) may have failed." 1>&2
+       $echo The command "cmp out-delim6.O $srcdir/out-delim6.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s out-delim6.E || rm -f out-delim6.E
+cat $srcdir/out-delim6.I | $xx -c2,1-3 --output-d=: > out-delim6.O 2> out-delim6.E
+code=$?
+if test $code != 0; then
+  $echo "Test out-delim6(|) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp out-delim6.O $srcdir/out-delim6.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed out-delim6(|)"; fi;;
+    1) $echo "Test out-delim6(|) failed: files out-delim6.O and $srcdir/out-delim6.X differ" 1>&2
+       (diff -c out-delim6.O $srcdir/out-delim6.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test out-delim6(|) may have failed." 1>&2
+       $echo The command "cmp out-delim6.O $srcdir/out-delim6.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s out-delim6.E || rm -f out-delim6.E
+$xx -c2,1-3 --output-d=: < $srcdir/out-delim6.I > out-delim6.O 2> out-delim6.E
+code=$?
+if test $code != 0; then
+  $echo "Test out-delim6(<) failed: ../../src/cut return code $code differs from expected value 0" 1>&2
+  errors=`expr $errors + 1`
+else
+  cmp out-delim6.O $srcdir/out-delim6.X > /dev/null 2>&1
+  case $? in
+    0) if test "$VERBOSE"; then $echo "passed out-delim6(<)"; fi;;
+    1) $echo "Test out-delim6(<) failed: files out-delim6.O and $srcdir/out-delim6.X differ" 1>&2
+       (diff -c out-delim6.O $srcdir/out-delim6.X) 2> /dev/null
+       errors=`expr $errors + 1`;;
+    2) $echo "Test out-delim6(<) may have failed." 1>&2
+       $echo The command "cmp out-delim6.O $srcdir/out-delim6.X" failed. 1>&2
+       errors=`expr $errors + 1`;;
+  esac
+fi
+test -s out-delim6.E || rm -f out-delim6.E
 if test $errors = 0; then
-  $echo Passed all 147 tests. 1>&2
+  $echo Passed all 153 tests. 1>&2
 else
   $echo Failed $errors tests. 1>&2
 fi