tests: remove directory, tests/tac/

* configure.ac (AC_CONFIG_FILES): Remove tests/tac/Makefile.
* tests/Makefile.am (SUBDIRS): Remove tac.
* tests/misc/tac: Many new tests, from...
* tests/tac/Test.pm: ...here.  Remove file.

4 files changed, 33 insertions, 84 deletions

diff --git a/configure.ac b/configure.ac
index 42ca02e0e..306f5ade2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -350,7 +350,6 @@ AC_CONFIG_FILES(
   tests/join/Makefile
   tests/pr/Makefile
   tests/sort/Makefile
-  tests/tac/Makefile
   tests/tail/Makefile
   )
 AC_OUTPUT
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 701c5f88a..e2cfa27a2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,7 +23,7 @@ EXTRA_DIST =		\
 
 ## N O T E :: Do not add more names to this list.
 ## N O T E :: Even these are expected to go away.
-SUBDIRS = join pr sort tac tail
+SUBDIRS = join pr sort tail
 
 root_tests =					\
   chown/basic					\
diff --git a/tests/misc/tac b/tests/misc/tac
index 208791a4a..9aa9ebaaf 100755
--- a/tests/misc/tac
+++ b/tests/misc/tac
@@ -33,6 +33,38 @@ my @Tests =
 (
   ['segfault', '-r', {IN=>"a\n"}, {IN=>"b\n"}, {OUT=>"a\nb\n"}],
   ['segfault2','-r', {IN=>"a\nb\n"}, {IN=>"1\n2\n"}, {OUT=>"b\na\n2\n1\n"}],
+
+  ['basic-0', '', {IN=>""}, {OUT=>""}],
+  ['basic-a', '', {IN=>"a"}, {OUT=>"a"}],
+  ['basic-b', '', {IN=>"\n"}, {OUT=>"\n"}],
+  ['basic-c', '', {IN=>"a\n"}, {OUT=>"a\n"}],
+  ['basic-d', '', {IN=>"a\nb"}, {OUT=>"ba\n"}],
+  ['basic-e', '', {IN=>"a\nb\n"}, {OUT=>"b\na\n"}],
+  ['basic-f', '', {IN=>"1234567\n8\n"}, {OUT=>"8\n1234567\n"}],
+  ['basic-g', '', {IN=>"12345678\n9\n"}, {OUT=>"9\n12345678\n"}],
+  ['basic-h', '', {IN=>"123456\n8\n"}, {OUT=>"8\n123456\n"}],
+  ['basic-i', '', {IN=>"12345\n8\n"}, {OUT=>"8\n12345\n"}],
+  ['basic-j', '', {IN=>"1234\n8\n"}, {OUT=>"8\n1234\n"}],
+  ['basic-k', '', {IN=>"123\n8\n"}, {OUT=>"8\n123\n"}],
+
+  ['opt-b', '-b', {IN=>"\na\nb\nc"}, {OUT=>"\nc\nb\na"}],
+  ['opt-s', '-s:', {IN=>"a:b:c:"}, {OUT=>"c:b:a:"}],
+  ['opt-sb', qw(-s : -b), {IN=>":a:b:c"}, {OUT=>":c:b:a"}],
+  ['opt-r', qw(-r -s '\._+'),
+   {IN=>"1._2.__3.___4._"},
+   {OUT=>"4._3.___2.__1._"}],
+
+  ['opt-r2', qw(-r -s '\._+'),
+   {IN=>"a.___b.__1._2.__3.___4._"},
+   {OUT=>"4._3.___2.__1._b.__a.___"}],
+
+  # This gave incorrect output (.___4._2.__3._1) with tac-1.22.
+  ['opt-br', qw(-b -r -s '\._+'),
+   {IN=>"._1._2.__3.___4"}, {OUT=>".___4.__3._2._1"}],
+
+  ['opt-br2', qw(-b -r -s '\._+'),
+   {IN=>".__x.___y.____z._1._2.__3.___4"},
+   {OUT=>".___4.__3._2._1.____z.___y.__x"}],
 );
 
 # @Tests = triple_test \@Tests;
diff --git a/tests/tac/Test.pm b/tests/tac/Test.pm
deleted file mode 100644
index 10a5cf25f..000000000
--- a/tests/tac/Test.pm
+++ /dev/null
@@ -1,82 +0,0 @@
-# Test "tac".
-
-# Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package Test;
-require 5.002;
-use strict;
-
-my @tv = (
-# test name, options, input, expected output, expected return code
-#
-['basic-0', '', "", "", 0],
-['basic-a', '', "a", "a\n", 0],
-['basic-b', '', "\n", "\n", 0],
-['basic-c', '', "a\n", "a\n", 0],
-['basic-d', '', "a\nb", "b\na\n", 0],
-['basic-e', '', "a\nb\n", "b\na\n", 0],
-['basic-f', '', "1234567\n8\n", "8\n1234567\n", 0],
-['basic-g', '', "12345678\n9\n", "9\n12345678\n", 0],
-['basic-h', '', "123456\n8\n", "8\n123456\n", 0],
-['basic-i', '', "12345\n8\n", "8\n12345\n", 0],
-['basic-j', '', "1234\n8\n", "8\n1234\n", 0],
-['basic-k', '', "123\n8\n", "8\n123\n", 0],
-
-['b2-e', '', "a\nb", "b\na\n", 0],
-['b2-f', '', "1234567\n8", "8\n1234567\n", 0],
-['b2-g', '', "12345678\n9", "9\n12345678\n", 0],
-['b2-h', '', "123456\n8", "8\n123456\n", 0],
-['b2-i', '', "12345\n8", "8\n12345\n", 0],
-['b2-j', '', "1234\n8", "8\n1234\n", 0],
-['b2-k', '', "123\n8", "8\n123\n", 0],
-
-['opt-b', '-b', "\na\nb\nc", "\nc\nb\na", 0],
-['opt-s', '-s:', "a:b:c:", "c:b:a:", 0],
-['opt-sb', '-s : -b', ":a:b:c", ":c:b:a", 0],
-['opt-r',     "-r -s '\\._+'", "1._2.__3.___4._", "4._3.___2.__1._", 0],
-
-['opt-r2',    "-r -s '\\._+'", "a.___b.__1._2.__3.___4._",
-                               "4._3.___2.__1._b.__a.___", 0],
-
-# This gave incorrect output (.___4._2.__3._1) with tac-1.22.
-['opt-br', "-b -r -s '\\._+'", "._1._2.__3.___4", ".___4.__3._2._1", 0],
-
-['opt-br2', "-b -r -s '\\._+'", ".__x.___y.____z._1._2.__3.___4",
-                                ".___4.__3._2._1.____z.___y.__x", 0],
-);
-
-sub test_vector
-{
-  my $t;
-  foreach $t (@tv)
-    {
-      my ($test_name, $flags, $in, $exp, $ret) = @$t;
-
-      $Test::input_via{$test_name} = {REDIR => 0, FILE => 0, PIPE => 0}
-    }
-
-  # Temporarily turn off losing tests.
-  # These tests lose because tac_file isn't yet up to snuff with tac_mem.
-  foreach $t (qw (basic-a basic-d b2-e b2-f b2-g b2-h b2-i b2-j b2-k))
-    {
-      # $Test::input_via{$t} = {REDIR => 0, PIPE => 0};
-      $Test::input_via{$t} = {};
-    }
-
-  return @tv;
-}
-
-1;