Remove the generated tests/*/Makefile.am files from version control.

* tests/cut/Makefile.am: git-remove this generated file.
* tests/head/Makefile.am: Likewise.
* tests/join/Makefile.am: Likewise.
* tests/pr/Makefile.am: Likewise.
* tests/sort/Makefile.am: Likewise.
* tests/tac/Makefile.am: Likewise.
* tests/tail/Makefile.am: Likewise.
* tests/test/Makefile.am: Likewise.
* tests/tr/Makefile.am: Likewise.
* tests/uniq/Makefile.am: Likewise.
* tests/wc/Makefile.am: Likewise.
* .cvsignore, .gitignore: Ignore these generated files.

* src/.cvsignore, src/.gitignore: Add chcon here, ...
* .cvsignore, .gitignore: ... not here.

16 files changed, 41 insertions, 1005 deletions

diff --git a/.cvsignore b/.cvsignore
index 577887b0c..0f06bb5c4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -8,7 +8,17 @@ Makefile
 Makefile.in
 THANKS-to-translators
 aclocal.m4
-chcon
 config.status
 configure
 coreutils-*
+tests/cut/Makefile.am
+tests/head/Makefile.am
+tests/join/Makefile.am
+tests/pr/Makefile.am
+tests/sort/Makefile.am
+tests/tac/Makefile.am
+tests/tail/Makefile.am
+tests/test/Makefile.am
+tests/tr/Makefile.am
+tests/uniq/Makefile.am
+tests/wc/Makefile.am
diff --git a/.gitignore b/.gitignore
index 0937c2b11..db24bee89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@ Makefile.in
 THANKS-to-translators
 aclocal.m4
 autom4te.cache
-chcon
 config.cache
 config.h
 config.hin
@@ -27,14 +26,25 @@ coreutils-*.tar.gz.sig
 coreutils-*.xdelta
 coreutils-*.xdelta.sig
 stamp-h1
+tests/cut/Makefile.am
 tests/cut/cut-tests
+tests/head/Makefile.am
 tests/head/head-tests
+tests/join/Makefile.am
 tests/join/join-tests
+tests/pr/Makefile.am
 tests/pr/pr-tests
+tests/sort/Makefile.am
 tests/sort/sort-tests
+tests/tac/Makefile.am
 tests/tac/tac-tests
+tests/tail/Makefile.am
 tests/tail/tail-tests
+tests/test/Makefile.am
 tests/test/test-tests
+tests/tr/Makefile.am
 tests/tr/tr-tests
+tests/uniq/Makefile.am
 tests/uniq/uniq-tests
+tests/wc/Makefile.am
 tests/wc/wc-tests
diff --git a/ChangeLog b/ChangeLog
index bbbf99ff5..08b4a9262 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2007-05-13  Jim Meyering  <jim@meyering.net>
 
+	Remove the generated tests/*/Makefile.am files from version control.
+	* tests/cut/Makefile.am: git-remove this generated file.
+	* tests/head/Makefile.am: Likewise.
+	* tests/join/Makefile.am: Likewise.
+	* tests/pr/Makefile.am: Likewise.
+	* tests/sort/Makefile.am: Likewise.
+	* tests/tac/Makefile.am: Likewise.
+	* tests/tail/Makefile.am: Likewise.
+	* tests/test/Makefile.am: Likewise.
+	* tests/tr/Makefile.am: Likewise.
+	* tests/uniq/Makefile.am: Likewise.
+	* tests/wc/Makefile.am: Likewise.
+	* .cvsignore, .gitignore: Ignore these generated files.
+
+	* src/.cvsignore, src/.gitignore: Add chcon here, ...
+	* .cvsignore, .gitignore: ... not here.
+
 	Test uniq's new --zero-terminated (-z) option.
 	* tests/uniq/Test.pm: When possible, create a "-z"-testing variant
 	of each existing test.
diff --git a/src/.cvsignore b/src/.cvsignore
index 155412096..d7a19469b 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -5,6 +5,7 @@ Makefile.in
 base64
 basename
 cat
+chcon
 chgrp
 chmod
 chown
diff --git a/src/.gitignore b/src/.gitignore
index 676b6f5b1..0825f7108 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -2,6 +2,7 @@
 base64
 basename
 cat
+chcon
 chgrp
 chmod
 chown
diff --git a/tests/cut/Makefile.am b/tests/cut/Makefile.am
deleted file mode 100644
index e0ba2ccf7..000000000
--- a/tests/cut/Makefile.am
+++ /dev/null
@@ -1,82 +0,0 @@
-# Make coreutils tests.					-*-Makefile-*-
-
-# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 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 2 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-##test-files-begin
-x = cut
-explicit =
-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 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-delim3a.I \
-out-delim3a.X out-delim4.I out-delim4.X out-delim5.I out-delim5.X \
-out-delim6.I out-delim6.X od-abut.I od-abut.X od-overlap.I od-overlap.X \
-od-overlap2.I od-overlap2.X od-overlap3.I od-overlap3.X od-overlap4.I \
-od-overlap4.X od-overlap5.I od-overlap5.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 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-delim3a.O \
-out-delim3a.E out-delim4.O out-delim4.E out-delim5.O out-delim5.E \
-out-delim6.O out-delim6.E od-abut.O od-abut.E od-overlap.O od-overlap.E \
-od-overlap2.O od-overlap2.E od-overlap3.O od-overlap3.E od-overlap4.O \
-od-overlap4.E od-overlap5.O od-overlap5.E
-##test-files-end
-
-EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
-noinst_SCRIPTS = $x-tests
-TESTS_ENVIRONMENT = \
-  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
-  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
-
-editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
-
-TESTS = $x-tests
-
-mk_script = $(srcdir)/../mk-script
-$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
-	test '$x' = test && prog=../../src/$x || prog=$x; \
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
-	mv $@.n $@
-	chmod 755 $@
-
-MAINTAINERCLEANFILES = $x-tests $(maint_gen)
-CLEANFILES = $(run_gen)
-
-check: $(maint_gen)
-
-$(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
-	rm -f $@ $@t
-	sed -n '1,/^##test-files-begin/p' $(srcdir)/../Makefile.am.in > $@t
-	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-	  echo "x = $$tool" >> $@t
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t
-	sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t
-	chmod -w $@t
-	mv $@t $@
diff --git a/tests/head/Makefile.am b/tests/head/Makefile.am
deleted file mode 100644
index eb6e6ce39..000000000
--- a/tests/head/Makefile.am
+++ /dev/null
@@ -1,69 +0,0 @@
-# Make coreutils tests.					-*-Makefile-*-
-
-# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 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 2 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-##test-files-begin
-x = head
-explicit = in in-1024
-maint_gen = idem-0.I idem-0.X idem-1.I idem-1.X idem-2.I idem-2.X idem-3.I \
-idem-3.X basic-0-10.I basic-0-10.X basic-0-09.I basic-0-09.X basic-0-11.I \
-basic-0-11.X obs-0.I obs-0.X obs-1.I obs-1.X obs-2.I obs-2.X obs-3.I obs-3.X \
-fail-1.I fail-1.X null-1.I null-1.X no-oct-1.I no-oct-1.X no-oct-2.I \
-no-oct-2.X no-oct-3.I no-oct-3.X no-oct-4.I no-oct-4.X posix-0.I posix-0.X \
-posix-1.I posix-1.X posix-2.I posix-2.X posix-3.I posix-3.X
-run_gen = idem-0.O idem-0.E idem-1.O idem-1.E idem-2.O idem-2.E idem-3.O \
-idem-3.E basic-0-10.O basic-0-10.E basic-0-09.O basic-0-09.E basic-0-11.O \
-basic-0-11.E obs-0.O obs-0.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 fail-1.O fail-1.E null-1.O null-1.E \
-no-oct-1.O no-oct-1.E no-oct-2.O no-oct-2.E no-oct-3.O no-oct-3.E no-oct-4.O \
-no-oct-4.E posix-0.O posix-0.E posix-1.O posix-1.E posix-2.O posix-2.E \
-posix-3.O posix-3.E posix-4.O posix-4.E posix-5.O posix-5.E
-##test-files-end
-
-EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
-noinst_SCRIPTS = $x-tests
-TESTS_ENVIRONMENT = \
-  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
-  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
-
-editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
-
-TESTS = $x-tests
-
-mk_script = $(srcdir)/../mk-script
-$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
-	test '$x' = test && prog=../../src/$x || prog=$x; \
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
-	mv $@.n $@
-	chmod 755 $@
-
-MAINTAINERCLEANFILES = $x-tests $(maint_gen)
-CLEANFILES = $(run_gen)
-
-check: $(maint_gen)
-
-$(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
-	rm -f $@ $@t
-	sed -n '1,/^##test-files-begin/p' $(srcdir)/../Makefile.am.in > $@t
-	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-	  echo "x = $$tool" >> $@t
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t
-	sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t
-	chmod -w $@t
-	mv $@t $@
diff --git a/tests/join/Makefile.am b/tests/join/Makefile.am
deleted file mode 100644
index fe2d5cd5a..000000000
--- a/tests/join/Makefile.am
+++ /dev/null
@@ -1,74 +0,0 @@
-# Make coreutils tests.					-*-Makefile-*-
-
-# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 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 2 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-##test-files-begin
-x = join
-explicit =
-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 trailing-sp.I1 trailing-sp.I2 trailing-sp.X sp-vs-blank.I1 \
-sp-vs-blank.I2 sp-vs-blank.X 8-bit-t.I1 8-bit-t.I2 8-bit-t.X bigfield.I1 \
-bigfield.I2 bigfield.X invalid-j.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 trailing-sp.O \
-trailing-sp.E sp-vs-blank.O sp-vs-blank.E 8-bit-t.O 8-bit-t.E bigfield.O \
-bigfield.E invalid-j.O invalid-j.E
-##test-files-end
-
-EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
-noinst_SCRIPTS = $x-tests
-TESTS_ENVIRONMENT = \
-  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
-  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
-
-editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
-
-TESTS = $x-tests
-
-mk_script = $(srcdir)/../mk-script
-$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
-	test '$x' = test && prog=../../src/$x || prog=$x; \
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
-	mv $@.n $@
-	chmod 755 $@
-
-MAINTAINERCLEANFILES = $x-tests $(maint_gen)
-CLEANFILES = $(run_gen)
-
-check: $(maint_gen)
-
-$(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
-	rm -f $@ $@t
-	sed -n '1,/^##test-files-begin/p' $(srcdir)/../Makefile.am.in > $@t
-	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-	  echo "x = $$tool" >> $@t
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t
-	sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t
-	chmod -w $@t
-	mv $@t $@
diff --git a/tests/pr/Makefile.am b/tests/pr/Makefile.am
deleted file mode 100644
index f24cc94b1..000000000
--- a/tests/pr/Makefile.am
+++ /dev/null
@@ -1,157 +0,0 @@
-# Make coreutils tests.					-*-Makefile-*-
-
-# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 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 2 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-##test-files-begin
-x = pr
-explicit = 0F 0FF 0FFnt 0FFt 0FnFnt 0FnFt 0Fnt 0Ft 2-S_f-t_notab 2-Sf-t_notab \
-2f-t_notab 2s_f-t_notab 2s_w60f-t_nota 2sf-t_notab 2sw60f-t_notab \
-2w60f-t_notab 3-0F 3-5l17f-t 3-FF 3a2l17-FF 3a3f-0F 3a3l15-t 3a3l8f-t \
-3b2l17-FF 3b3f-0F 3b3f-0FF 3b3f-FF 3b3l15-t 3b3l8f-t 3f-0F 3f-FF 3l17f-t \
-3l24-t 3ml17f-t 3ml24-FF 3ml24-t 3ml24-t-FF 4-7l24-FF 4l24-FF FF FFn FFtn \
-FnFn Ja3l17f-lm Jb3l17f-lm Jml17f-lm-lo W-72l17f-ll W20l17f-ll W26l17f-ll \
-W27l17f-ll W28l17f-ll W35Ja3l17f-lm W35Jb3l17f-lm W35Jml17f-lmlo W35a3l17f-lm \
-W35b3l17f-lm W35ml17f-lm-lo W72Jl17f-ll a2l15-FF a2l17-FF a3-0F a3f-0F \
-a3f-0FF a3f-FF a3l15-t a3l17f-lm a3l8f-t b2l15-FF b2l17-FF b3-0F b3f-0F \
-b3f-0FF b3f-FF b3l15-t b3l17f-lm b3l8f-t l17f-t l24-FF l24-t loli ml17f-0F \
-ml17f-lm-lo ml17f-t ml17f-t-0F ml20-FF-t ml24-FF ml24-t ml24-t-FF \
-n+2-5l17f-0FF n+2l17f-0FF n+2l17f-bl n+3-7l24-FF n+3l17f-0FF n+3l17f-bl \
-n+3ml13f-bl-FF n+3ml17f-bl-tn n+3ml17f-tn-bl n+4-8a2l17-FF n+4b2l10f-0FF \
-n+5-8b3l10f-FF n+5a3l6f-0FF n+6a2l17-FF n+6b3l6f-FF n+7l24-FF n+8l20-FF \
-nJml17f-lmlmlo nJml17f-lmlolm nN1+3l17f-bl nN15l17f-bl nSml13-bl-FF \
-nSml13-t-t-FF nSml13-t-tFFFF nSml17-bl-FF nSml17-t-t-FF nSml17-t-tFFFF \
-nl17f-bl o3Jml17f-lm-lo o3a3Sl17f-tn o3a3Snl17f-tn o3a3l17f-tn o3b3Sl17f-tn \
-o3b3Snl17f-tn o3b3l17f-tn o3mSl17f-bl-tn o3mSnl17fbltn o3ml17f-bl-tn t-0FF \
-t-FF t-bl t-t tFFn tFFt tFFt-bl tFFt-ll tFFt-lm tFnFt t_notab t_tab t_tab_ \
-ta3-0FF ta3-FF tb3-0FF tb3-FF tn tn2e5o3-t_tab tn2e8-t_tab tn2e8o3-t_tab \
-tn_2e8-t_tab tn_2e8S-t_tab tne8-t_tab tne8o3-t_tab tt-0FF tt-FF tt-bl tt-t \
-tta3-0FF tta3-FF ttb3-0FF ttb3-FF w72l17f-ll
-maint_gen = i-opt-a.I i-opt-a.X i-opt-b.I i-opt-b.X ncut-a.I ncut-a.X \
-ncut-b.I ncut-b.X margin-0.I margin-0.X dbl-sp-a.I dbl-sp-a.X dbl-sp-b.I \
-dbl-sp-b.X narrow-1.I narrow-1.X col-last.I col-last.X col-02.I col-02.X \
-col-02.C.I col-02.C.X col-2.I col-2.X col-2.C.I col-2.C.X col-long.I \
-col-long.X col-long.C.I col-long.C.X col-0.I col-0.X col-0.C.I col-0.C.X \
-col-inval.I col-inval.X col-inval.C.I col-inval.C.X neg-page.I neg-page.X
-run_gen = 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1e.C.O 1e.C.E \
-1f.O 1f.E 1f.C.O 1f.C.E 1g.O 1g.E 1g.C.O 1g.C.E 1h.O 1h.E 1h.C.O 1h.C.E 1i.O \
-1i.E 1i.C.O 1i.C.E 1j.O 1j.E 1j.C.O 1j.C.E 1k.O 1k.E 1k.C.O 1k.C.E 1l.O 1l.E \
-1l.C.O 1l.C.E 2a.O 2a.E 2b.O 2b.E 2c.O 2c.E 2c.C.O 2c.C.E 2d.O 2d.E 2d.C.O \
-2d.C.E 2e.O 2e.E 2e.C.O 2e.C.E 2f.O 2f.E 2f.C.O 2f.C.E 2g.O 2g.E 2g.C.O \
-2g.C.E 2h.O 2h.E 2h.C.O 2h.C.E 2i.O 2i.E 2i.C.O 2i.C.E 2j.O 2j.E 2j.C.O \
-2j.C.E 3a.O 3a.E 3b.O 3b.E 3c.O 3c.E 3d.O 3d.E 3e.O 3e.E 3e.C.O 3e.C.E 3f.O \
-3f.E 3f.C.O 3f.C.E 3g.O 3g.E 3g.C.O 3g.C.E 3h.O 3h.E 3h.C.O 3h.C.E 3i.O 3i.E \
-3i.C.O 3i.C.E 3j.O 3j.E 3j.C.O 3j.C.E 3k.O 3k.E 3k.C.O 3k.C.E 3l.O 3l.E \
-3l.C.O 3l.C.E 3m.O 3m.E 3m.C.O 3m.C.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 3aa.C.O 3aa.C.E 3ab.O 3ab.E \
-3ab.C.O 3ab.C.E 3ac.O 3ac.E 3ac.C.O 3ac.C.E 3ad.O 3ad.E 3ad.C.O 3ad.C.E 3ae.O \
-3ae.E 3ae.C.O 3ae.C.E 3af.O 3af.E 3af.C.O 3af.C.E 3ag.O 3ag.E 3ag.C.O 3ag.C.E \
-3ah.O 3ah.E 3ah.C.O 3ah.C.E 3ai.O 3ai.E 3ai.C.O 3ai.C.E 3aj.O 3aj.E 3aj.C.O \
-3aj.C.E 3ak.O 3ak.E 3ak.C.O 3ak.C.E 3ba.O 3ba.E 3ba.C.O 3ba.C.E 3bb.O 3bb.E \
-3bb.C.O 3bb.C.E 3bc.O 3bc.E 3bc.C.O 3bc.C.E 3bd.O 3bd.E 3bd.C.O 3bd.C.E 3be.O \
-3be.E 3be.C.O 3be.C.E 3bf.O 3bf.E 3bf.C.O 3bf.C.E 3bg.O 3bg.E 3bg.C.O 3bg.C.E \
-3bh.O 3bh.E 3bh.C.O 3bh.C.E 3bi.O 3bi.E 3bi.C.O 3bi.C.E 3bj.O 3bj.E 3bj.C.O \
-3bj.C.E 3bk.O 3bk.E 3bk.C.O 3bk.C.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 3Paa.C.O 3Paa.C.E \
-3Pab.O 3Pab.E 3Pab.C.O 3Pab.C.E 3Pac.O 3Pac.E 3Pac.C.O 3Pac.C.E 3Pad.O 3Pad.E \
-3Pad.C.O 3Pad.C.E 3Pae.O 3Pae.E 3Pae.C.O 3Pae.C.E 3Paf.O 3Paf.E 3Paf.C.O \
-3Paf.C.E 3Pba.O 3Pba.E 3Pba.C.O 3Pba.C.E 3Pbb.O 3Pbb.E 3Pbb.C.O 3Pbb.C.E \
-3Pbc.O 3Pbc.E 3Pbc.C.O 3Pbc.C.E 3Pbd.O 3Pbd.E 3Pbd.C.O 3Pbd.C.E 3Pbe.O 3Pbe.E \
-3Pbe.C.O 3Pbe.C.E 3Pbf.O 3Pbf.E 3Pbf.C.O 3Pbf.C.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 4f.C.O 4f.C.E 4g.O 4g.E 4g.C.O 4g.C.E 4h.O \
-4h.E 4h.C.O 4h.C.E 4i.O 4i.E 4i.C.O 4i.C.E 4j.O 4j.E 4j.C.O 4j.C.E 4k.O 4k.E \
-4k.C.O 4k.C.E 4l.O 4l.E 4l.C.O 4l.C.E 4m.O 4m.E 4m.C.O 4m.C.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 \
-6aa.C.O 6aa.C.E 6ab.O 6ab.E 6ab.C.O 6ab.C.E 6ac.O 6ac.E 6ac.C.O 6ac.C.E 6ba.O \
-6ba.E 6ba.C.O 6ba.C.E 6bb.O 6bb.E 6bb.C.O 6bb.C.E 6bc.O 6bc.E 6bc.C.O 6bc.C.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 7aa.C.O 7aa.C.E 7ab.O 7ab.E 7ab.C.O 7ab.C.E 7ac.O 7ac.E 7ac.C.O 7ac.C.E \
-7ba.O 7ba.E 7ba.C.O 7ba.C.E 7bb.O 7bb.E 7bb.C.O 7bb.C.E 7bc.O 7bc.E 7bc.C.O \
-7bc.C.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 9Paa.C.O 9Paa.C.E 9Pab.O 9Pab.E \
-9Pab.C.O 9Pab.C.E 9Pac.O 9Pac.E 9Pac.C.O 9Pac.C.E 9Pad.O 9Pad.E 9Pad.C.O \
-9Pad.C.E 9Pae.O 9Pae.E 9Pae.C.O 9Pae.C.E 9Paf.O 9Paf.E 9Paf.C.O 9Paf.C.E \
-9Pag.O 9Pag.E 9Pag.C.O 9Pag.C.E 9Pah.O 9Pah.E 9Pah.C.O 9Pah.C.E 9Pai.O 9Pai.E \
-9Pai.C.O 9Pai.C.E 9Paj.O 9Paj.E 9Paj.C.O 9Paj.C.E 9Pak.O 9Pak.E 9Pak.C.O \
-9Pak.C.E 9Pba.O 9Pba.E 9Pba.C.O 9Pba.C.E 9Pbb.O 9Pbb.E 9Pbb.C.O 9Pbb.C.E \
-9Pbc.O 9Pbc.E 9Pbc.C.O 9Pbc.C.E 9Pbd.O 9Pbd.E 9Pbd.C.O 9Pbd.C.E 9Pbe.O 9Pbe.E \
-9Pbe.C.O 9Pbe.C.E 9Pbf.O 9Pbf.E 9Pbf.C.O 9Pbf.C.E 9Pbg.O 9Pbg.E 9Pbg.C.O \
-9Pbg.C.E 9Pbh.O 9Pbh.E 9Pbh.C.O 9Pbh.C.E 9Pbi.O 9Pbi.E 9Pbi.C.O 9Pbi.C.E \
-9Pbj.O 9Pbj.E 9Pbj.C.O 9Pbj.C.E 9Pbk.O 9Pbk.E 9Pbk.C.O 9Pbk.C.E 9Pma.O 9Pma.E \
-9Pmb.O 9Pmb.E 9Pmc.O 9Pmc.E 10wa.O 10wa.E 10wb.O 10wb.E 10wc.O 10wc.E 10wd.O \
-10wd.E 10we.O 10we.E 10wf.O 10wf.E 10wg.O 10wg.E 10wh.O 10wh.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 10mg.O \
-10mg.E 10mh.O 10mh.E 10aa.O 10aa.E 10aa.C.O 10aa.C.E 10ab.O 10ab.E 10ab.C.O \
-10ab.C.E 10ac.O 10ac.E 10ac.C.O 10ac.C.E 10ad.O 10ad.E 10ad.C.O 10ad.C.E \
-10ba.O 10ba.E 10ba.C.O 10ba.C.E 10bb.O 10bb.E 10bb.C.O 10bb.C.E 10bc.O 10bc.E \
-10bc.C.O 10bc.C.E 10bd.O 10bd.E 10bd.C.O 10bd.C.E 11sa.O 11sa.E 11sb.O 11sb.E \
-11se.O 11se.E 11sf.O 11sf.E 11sg.O 11sg.E 11sh.O 11sh.E 12aa.O 12aa.E \
-12aa.C.O 12aa.C.E 12ab.O 12ab.E 12ab.C.O 12ab.C.E 12ac.O 12ac.E 12ac.C.O \
-12ac.C.E 12ba.O 12ba.E 12ba.C.O 12ba.C.E 12bb.O 12bb.E 12bb.C.O 12bb.C.E \
-12bc.O 12bc.E 12bc.C.O 12bc.C.E 12ma.O 12ma.E 12mb.O 12mb.E 12mc.O 12mc.E \
-12md.O 12md.E 13a.O 13a.E 13b.O 13b.E 13ba.O 13ba.E 13ba.C.O 13ba.C.E 13bb.O \
-13bb.E 13bb.C.O 13bb.C.E 13bc.O 13bc.E 13bc.C.O 13bc.C.E 13bd.O 13bd.E \
-13bd.C.O 13bd.C.E 13be.O 13be.E 13be.C.O 13be.C.E 13bf.O 13bf.E 13bf.C.O \
-13bf.C.E 14a.O 14a.E 14a.C.O 14a.C.E 14b.O 14b.E 14b.C.O 14b.C.E 14c.O 14c.E \
-14c.C.O 14c.C.E 14d.O 14d.E 14d.C.O 14d.C.E 14e.O 14e.E 14e.C.O 14e.C.E 14f.O \
-14f.E 14f.C.O 14f.C.E 14g.O 14g.E 14g.C.O 14g.C.E 14h.O 14h.E 14h.C.O 14h.C.E \
-14i.O 14i.E 14i.C.O 14i.C.E 14j.O 14j.E 14j.C.O 14j.C.E 14k.O 14k.E 14k.C.O \
-14k.C.E 14l.O 14l.E 14l.C.O 14l.C.E 14m.O 14m.E 14m.C.O 14m.C.E i-opt-a.O \
-i-opt-a.E i-opt-b.O i-opt-b.E ncut-a.O ncut-a.E ncut-b.O ncut-b.E margin-0.O \
-margin-0.E dbl-sp-a.O dbl-sp-a.E dbl-sp-b.O dbl-sp-b.E narrow-1.O narrow-1.E \
-col-last.O col-last.E col-02.O col-02.E col-02.C.O col-02.C.E col-2.O col-2.E \
-col-2.C.O col-2.C.E col-long.O col-long.E col-long.C.O col-long.C.E col-0.O \
-col-0.E col-0.C.O col-0.C.E col-inval.O col-inval.E col-inval.C.O \
-col-inval.C.E neg-page.O neg-page.E
-##test-files-end
-
-EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
-noinst_SCRIPTS = $x-tests
-TESTS_ENVIRONMENT = \
-  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
-  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
-
-editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
-
-TESTS = $x-tests
-
-mk_script = $(srcdir)/../mk-script
-$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
-	test '$x' = test && prog=../../src/$x || prog=$x; \
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
-	mv $@.n $@
-	chmod 755 $@
-
-MAINTAINERCLEANFILES = $x-tests $(maint_gen)
-CLEANFILES = $(run_gen)
-
-check: $(maint_gen)
-
-$(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
-	rm -f $@ $@t
-	sed -n '1,/^##test-files-begin/p' $(srcdir)/../Makefile.am.in > $@t
-	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-	  echo "x = $$tool" >> $@t
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t
-	sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t
-	chmod -w $@t
-	mv $@t $@
diff --git a/tests/sort/Makefile.am b/tests/sort/Makefile.am
deleted file mode 100644
index 66600e5a2..000000000
--- a/tests/sort/Makefile.am
+++ /dev/null
@@ -1,99 +0,0 @@
-# Make coreutils tests.					-*-Makefile-*-
-
-# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 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 2 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-##test-files-begin
-x = sort
-explicit =
-maint_gen = n1.I n1.X n2.I n2.X n3.I n3.X n4.I n4.X n5.I n5.X n6.I n6.X n7.I \
-n7.X n8a.I n8a.X n8b.I n8b.X n9a.I n9a.X n9b.I n9b.X n10a.I n10a.X n10b.I \
-n10b.X n11a.I n11a.X n11b.I n11b.X 01a.I 01a.X 02a.I 02a.X 02b.I 02b.X 02c.I \
-02c.X 02d.I 02d.X 02e.I 02e.X 02m.I 02m.X 02n.I 02n.X 02o.I 02o.X 02p.I 02p.X \
-03a.I 03a.X 03b.I 03b.X 03c.I 03c.X 03d.I 03d.X 03e.I 03e.X 03f.I 03f.X 03g.I \
-03g.X 03h.I 03h.X 03i.I 03i.X 04a.I 04a.X 04b.I 04b.X 04c.I 04c.X 04d.I 04d.X \
-04e.I 04e.X 05a.I 05a.X 05b.I 05b.X 05c.I 05c.X 05d.I 05d.X 05e.I 05e.X 05f.I \
-05f.X 06a.I 06a.X 06b.I 06b.X 06c.I 06c.X 06d.I 06d.X 06e.I 06e.X 06f.I 06f.X \
-07a.I 07a.X 07b.I 07b.X 07c.I 07c.X 07d.I 07d.X 08a.I 08a.X 08b.I 08b.X 09a.I \
-09a.X 09b.I 09b.X 09c.I 09c.X 09d.I 09d.X 10a.I 10a.X 10b.I 10b.X 10c.I 10c.X \
-10d.I 10d.X 10a0.I 10a0.X 10a1.I 10a1.X 10a2.I 10a2.X 10e.I 10e.X 10f.I 10f.X \
-10g.I 10g.X 11a.I 11a.X 11b.I 11b.X 11c.I 11c.X 11d.I 11d.X 12a.I 12a.X 12b.I \
-12b.X 12c.I 12c.X 12d.I 12d.X 13a.I 13a.X 13b.I 13b.X 14a.I 14a.X 14b.I 14b.X \
-15a.I 15a.X 15b.I 15b.X 15c.I 15c.X 15d.I 15d.X 15e.I 15e.X 16a.I 16a.X 17.I \
-17.X 18a.I 18a.X 18b.I 18b.X 18c.I 18c.X 18d.I 18d.X 18e.I 18e.X 19a.I 19a.X \
-19b.I 19b.X 20a.I 20a.X 21a.I 21a.X 21b.I 21b.X 21c.I 21c.X 21d.I 21d.X 21e.I \
-21e.X 21f.I 21f.X 21g.I 21g.X 22a.I 22a.X 22b.I 22b.X no-file1.X o-no-file1.X \
-create-empty.X neg-nls.I neg-nls.X nul-nls.I nul-nls.X use-nl.I use-nl.X o2.I \
-o2.X incompat1.I incompat1.X incompat2.I incompat2.X incompat3.I incompat3.X \
-incompat4.I incompat4.X incompat5.I incompat5.X incompat6.I incompat6.X \
-nul-tab.I nul-tab.X bigfield.I bigfield.X
-run_gen = n1.O n1.E n2.O n2.E n3.O n3.E n4.O n4.E n5.O n5.E n6.O n6.E n7.O \
-n7.E n8a.O n8a.E n8b.O n8b.E n9a.O n9a.E n9b.O n9b.E n10a.O n10a.E n10b.O \
-n10b.E n11a.O n11a.E n11b.O n11b.E 01a.O 01a.E 02a.O 02a.E 02b.O 02b.E 02c.O \
-02c.E 02d.O 02d.E 02e.O 02e.E 02m.O 02m.E 02n.O 02n.E 02o.O 02o.E 02p.O 02p.E \
-03a.O 03a.E 03b.O 03b.E 03c.O 03c.E 03d.O 03d.E 03e.O 03e.E 03f.O 03f.E 03g.O \
-03g.E 03h.O 03h.E 03i.O 03i.E 04a.O 04a.E 04b.O 04b.E 04c.O 04c.E 04d.O 04d.E \
-04e.O 04e.E 05a.O 05a.E 05b.O 05b.E 05c.O 05c.E 05d.O 05d.E 05e.O 05e.E 05f.O \
-05f.E 06a.O 06a.E 06b.O 06b.E 06c.O 06c.E 06d.O 06d.E 06e.O 06e.E 06f.O 06f.E \
-07a.O 07a.E 07b.O 07b.E 07c.O 07c.E 07d.O 07d.E 08a.O 08a.E 08b.O 08b.E 09a.O \
-09a.E 09b.O 09b.E 09c.O 09c.E 09d.O 09d.E 10a.O 10a.E 10b.O 10b.E 10c.O 10c.E \
-10d.O 10d.E 10a0.O 10a0.E 10a1.O 10a1.E 10a2.O 10a2.E 10e.O 10e.E 10f.O 10f.E \
-10g.O 10g.E 11a.O 11a.E 11b.O 11b.E 11c.O 11c.E 11d.O 11d.E 12a.O 12a.E 12b.O \
-12b.E 12c.O 12c.E 12d.O 12d.E 13a.O 13a.E 13b.O 13b.E 14a.O 14a.E 14b.O 14b.E \
-15a.O 15a.E 15b.O 15b.E 15c.O 15c.E 15d.O 15d.E 15e.O 15e.E 16a.O 16a.E 17.O \
-17.E 18a.O 18a.E 18b.O 18b.E 18c.O 18c.E 18d.O 18d.E 18e.O 18e.E 19a.O 19a.E \
-19b.O 19b.E 20a.O 20a.E 21a.O 21a.E 21b.O 21b.E 21c.O 21c.E 21d.O 21d.E 21e.O \
-21e.E 21f.O 21f.E 21g.O 21g.E 22a.O 22a.E 22b.O 22b.E no-file1.O no-file1.E \
-o-no-file1.O o-no-file1.E create-empty.O create-empty.E neg-nls.O neg-nls.E \
-nul-nls.O nul-nls.E use-nl.O use-nl.E o2.O o2.E incompat1.O incompat1.E \
-incompat2.O incompat2.E incompat3.O incompat3.E incompat4.O incompat4.E \
-incompat5.O incompat5.E incompat6.O incompat6.E nul-tab.O nul-tab.E \
-bigfield.O bigfield.E
-##test-files-end
-
-EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
-noinst_SCRIPTS = $x-tests
-TESTS_ENVIRONMENT = \
-  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
-  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
-
-editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
-
-TESTS = $x-tests
-
-mk_script = $(srcdir)/../mk-script
-$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
-	test '$x' = test && prog=../../src/$x || prog=$x; \
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
-	mv $@.n $@
-	chmod 755 $@
-
-MAINTAINERCLEANFILES = $x-tests $(maint_gen)
-CLEANFILES = $(run_gen)
-
-check: $(maint_gen)
-
-$(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
-	rm -f $@ $@t
-	sed -n '1,/^##test-files-begin/p' $(srcdir)/../Makefile.am.in > $@t
-	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-	  echo "x = $$tool" >> $@t
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t
-	sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t
-	chmod -w $@t
-	mv $@t $@
diff --git a/tests/tac/Makefile.am b/tests/tac/Makefile.am
deleted file mode 100644
index b8cc47639..000000000
--- a/tests/tac/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-# Make coreutils tests.					-*-Makefile-*-
-
-# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 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 2 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-##test-files-begin
-x = tac
-explicit =
-maint_gen = basic-0.I basic-0.X basic-a.I basic-a.X basic-b.I basic-b.X \
-basic-c.I basic-c.X basic-d.I basic-d.X basic-e.I basic-e.X basic-f.I \
-basic-f.X basic-g.I basic-g.X basic-h.I basic-h.X basic-i.I basic-i.X \
-basic-j.I basic-j.X basic-k.I basic-k.X b2-e.I b2-e.X b2-f.I b2-f.X b2-g.I \
-b2-g.X b2-h.I b2-h.X b2-i.I b2-i.X b2-j.I b2-j.X b2-k.I b2-k.X opt-b.I \
-opt-b.X opt-s.I opt-s.X opt-sb.I opt-sb.X opt-r.I opt-r.X opt-r2.I opt-r2.X \
-opt-br.I opt-br.X opt-br2.I opt-br2.X
-run_gen = basic-0.O basic-0.E basic-a.O basic-a.E basic-b.O basic-b.E \
-basic-c.O basic-c.E basic-d.O basic-d.E basic-e.O basic-e.E basic-f.O \
-basic-f.E basic-g.O basic-g.E basic-h.O basic-h.E basic-i.O basic-i.E \
-basic-j.O basic-j.E basic-k.O basic-k.E b2-e.O b2-e.E b2-f.O b2-f.E b2-g.O \
-b2-g.E b2-h.O b2-h.E b2-i.O b2-i.E b2-j.O b2-j.E b2-k.O b2-k.E opt-b.O \
-opt-b.E opt-s.O opt-s.E opt-sb.O opt-sb.E opt-r.O opt-r.E opt-r2.O opt-r2.E \
-opt-br.O opt-br.E opt-br2.O opt-br2.E
-##test-files-end
-
-EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
-noinst_SCRIPTS = $x-tests
-TESTS_ENVIRONMENT = \
-  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
-  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
-
-editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
-
-TESTS = $x-tests
-
-mk_script = $(srcdir)/../mk-script
-$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
-	test '$x' = test && prog=../../src/$x || prog=$x; \
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
-	mv $@.n $@
-	chmod 755 $@
-
-MAINTAINERCLEANFILES = $x-tests $(maint_gen)
-CLEANFILES = $(run_gen)
-
-check: $(maint_gen)
-
-$(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
-	rm -f $@ $@t
-	sed -n '1,/^##test-files-begin/p' $(srcdir)/../Makefile.am.in > $@t
-	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-	  echo "x = $$tool" >> $@t
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t
-	sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t
-	chmod -w $@t
-	mv $@t $@
diff --git a/tests/tail/Makefile.am b/tests/tail/Makefile.am
deleted file mode 100644
index f969cdf6c..000000000
--- a/tests/tail/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-# Make coreutils tests.					-*-Makefile-*-
-
-# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 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 2 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-##test-files-begin
-x = tail
-explicit =
-maint_gen = obs-plus-c1.I obs-plus-c1.X obs-plus-c2.I obs-plus-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-plus-l4.I obs-plus-l4.X obs-plus-l5.I \
-obs-plus-l5.X obs-1.I obs-1.X obs-2.I obs-2.X obs-3.I obs-3.X obs-plus-4.I \
-obs-plus-4.X obs-plus-5.I obs-plus-5.X obs-plus-x1.I obs-plus-x1.X \
-obs-plus-x2.I obs-plus-x2.X obs-l.I obs-l.X obs-b.I obs-b.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 c-2.I c-2.X c-2-minus.I \
-c-2-minus.X c2.I c2.X c2-minus.I c2-minus.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 \
-f-pipe-1.I f-pipe-1.X
-run_gen = obs-plus-c1.O obs-plus-c1.E obs-plus-c2.O obs-plus-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-plus-l4.O obs-plus-l4.E obs-plus-l5.O \
-obs-plus-l5.E obs-1.O obs-1.E obs-2.O obs-2.E obs-3.O obs-3.E obs-plus-4.O \
-obs-plus-4.E obs-plus-5.O obs-plus-5.E obs-plus-x1.O obs-plus-x1.E \
-obs-plus-x2.O obs-plus-x2.E obs-l.O obs-l.E obs-b.O obs-b.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 c-2.O c-2.E c-2-minus.O \
-c-2-minus.E c2.O c2.E c2-minus.O c2-minus.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 \
-f-pipe-1.O f-pipe-1.E
-##test-files-end
-
-EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
-noinst_SCRIPTS = $x-tests
-TESTS_ENVIRONMENT = \
-  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
-  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
-
-editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
-
-TESTS = $x-tests
-
-mk_script = $(srcdir)/../mk-script
-$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
-	test '$x' = test && prog=../../src/$x || prog=$x; \
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
-	mv $@.n $@
-	chmod 755 $@
-
-MAINTAINERCLEANFILES = $x-tests $(maint_gen)
-CLEANFILES = $(run_gen)
-
-check: $(maint_gen)
-
-$(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
-	rm -f $@ $@t
-	sed -n '1,/^##test-files-begin/p' $(srcdir)/../Makefile.am.in > $@t
-	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-	  echo "x = $$tool" >> $@t
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t
-	sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t
-	chmod -w $@t
-	mv $@t $@
diff --git a/tests/test/Makefile.am b/tests/test/Makefile.am
deleted file mode 100644
index fe191eff2..000000000
--- a/tests/test/Makefile.am
+++ /dev/null
@@ -1,154 +0,0 @@
-# Make coreutils tests.					-*-Makefile-*-
-
-# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 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 2 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-##test-files-begin
-x = test
-explicit =
-maint_gen = ne-1.X ne-2.X ne-3.X ne-4.X ne-5.X ne-6.X le-1.X le-2.X le-3.X \
-le-4.X le-5.X ge-1.X ge-2.X ge-3.X ge-4.X ge-5.X N-1b.X P-1b.X NP-1b.X \
-NNP-1b.X N-1c.X P-1c.X NP-1c.X NNP-1c.X N-1d.X P-1d.X NP-1d.X NNP-1d.X N-1e.X \
-P-1e.X NP-1e.X NNP-1e.X N-1f.X P-1f.X NP-1f.X NNP-1f.X N-1g.X P-1g.X NP-1g.X \
-NNP-1g.X N-1h.X P-1h.X NP-1h.X NNP-1h.X N-1i.X P-1i.X NP-1i.X NNP-1i.X N-1j.X \
-P-1j.X NP-1j.X NNP-1j.X N-1k.X P-1k.X NP-1k.X NNP-1k.X N-streq-1.X \
-P-streq-1.X NP-streq-1.X NNP-streq-1.X N-streq-2.X P-streq-2.X NP-streq-2.X \
-NNP-streq-2.X N-streq-3.X P-streq-3.X NP-streq-3.X NNP-streq-3.X N-streq-4.X \
-P-streq-4.X NP-streq-4.X NNP-streq-4.X N-streq-5.X P-streq-5.X NP-streq-5.X \
-NNP-streq-5.X N-streq-6.X N-strne-1.X P-strne-1.X NP-strne-1.X NNP-strne-1.X \
-N-strne-2.X P-strne-2.X NP-strne-2.X NNP-strne-2.X N-strne-3.X P-strne-3.X \
-NP-strne-3.X NNP-strne-3.X N-strne-4.X P-strne-4.X NP-strne-4.X NNP-strne-4.X \
-N-strne-5.X P-strne-5.X NP-strne-5.X NNP-strne-5.X N-strne-6.X N-and-1.X \
-P-and-1.X NP-and-1.X NNP-and-1.X N-and-2.X P-and-2.X NP-and-2.X NNP-and-2.X \
-N-and-3.X P-and-3.X NP-and-3.X NNP-and-3.X N-and-4.X P-and-4.X NP-and-4.X \
-NNP-and-4.X N-or-1.X P-or-1.X NP-or-1.X NNP-or-1.X N-or-2.X P-or-2.X \
-NP-or-2.X NNP-or-2.X N-or-3.X P-or-3.X NP-or-3.X NNP-or-3.X N-or-4.X P-or-4.X \
-NP-or-4.X NNP-or-4.X N-eq-1.X P-eq-1.X NP-eq-1.X NNP-eq-1.X N-eq-2.X P-eq-2.X \
-NP-eq-2.X NNP-eq-2.X N-eq-3.X P-eq-3.X NP-eq-3.X NNP-eq-3.X N-eq-4.X P-eq-4.X \
-NP-eq-4.X NNP-eq-4.X N-eq-5.X P-eq-5.X NP-eq-5.X NNP-eq-5.X N-eq-6.X P-eq-6.X \
-NP-eq-6.X NNP-eq-6.X N-gt-1.X P-gt-1.X NP-gt-1.X NNP-gt-1.X N-gt-2.X P-gt-2.X \
-NP-gt-2.X NNP-gt-2.X N-gt-3.X P-gt-3.X NP-gt-3.X NNP-gt-3.X N-gt-4.X P-gt-4.X \
-NP-gt-4.X NNP-gt-4.X N-gt-5.X P-gt-5.X NP-gt-5.X NNP-gt-5.X N-lt-1.X P-lt-1.X \
-NP-lt-1.X NNP-lt-1.X N-lt-2.X P-lt-2.X NP-lt-2.X NNP-lt-2.X N-lt-3.X P-lt-3.X \
-NP-lt-3.X NNP-lt-3.X N-lt-4.X P-lt-4.X NP-lt-4.X NNP-lt-4.X N-lt-5.X P-lt-5.X \
-NP-lt-5.X NNP-lt-5.X N-t1.X P-t1.X NP-t1.X NNP-t1.X N-t2.X P-t2.X NP-t2.X \
-NNP-t2.X N-paren-1.X N-paren-2.X N-paren-3.X N-paren-4.X N-paren-5.X 1a.X \
-1b.X 1c.X 1d.X 1e.X 1f.X 1g.X 1h.X 1i.X 1j.X 1k.X streq-1.X streq-2.X \
-streq-3.X streq-4.X streq-5.X streq-6.X strne-1.X strne-2.X strne-3.X \
-strne-4.X strne-5.X strne-6.X and-1.X and-2.X and-3.X and-4.X or-1.X or-2.X \
-or-3.X or-4.X eq-1.X eq-2.X eq-3.X eq-4.X eq-5.X eq-6.X gt-1.X gt-2.X gt-3.X \
-gt-4.X gt-5.X lt-1.X lt-2.X lt-3.X lt-4.X lt-5.X inv-1.X t1.X t2.X paren-1.X \
-paren-2.X paren-3.X paren-4.X paren-5.X
-run_gen = ne-1.O ne-1.E ne-2.O ne-2.E ne-3.O ne-3.E ne-4.O ne-4.E ne-5.O \
-ne-5.E ne-6.O ne-6.E le-1.O le-1.E le-2.O le-2.E le-3.O le-3.E le-4.O le-4.E \
-le-5.O le-5.E ge-1.O ge-1.E ge-2.O ge-2.E ge-3.O ge-3.E ge-4.O ge-4.E ge-5.O \
-ge-5.E N-1b.O N-1b.E P-1b.O P-1b.E NP-1b.O NP-1b.E NNP-1b.O NNP-1b.E N-1c.O \
-N-1c.E P-1c.O P-1c.E NP-1c.O NP-1c.E NNP-1c.O NNP-1c.E N-1d.O N-1d.E P-1d.O \
-P-1d.E NP-1d.O NP-1d.E NNP-1d.O NNP-1d.E N-1e.O N-1e.E P-1e.O P-1e.E NP-1e.O \
-NP-1e.E NNP-1e.O NNP-1e.E N-1f.O N-1f.E P-1f.O P-1f.E NP-1f.O NP-1f.E \
-NNP-1f.O NNP-1f.E N-1g.O N-1g.E P-1g.O P-1g.E NP-1g.O NP-1g.E NNP-1g.O \
-NNP-1g.E N-1h.O N-1h.E P-1h.O P-1h.E NP-1h.O NP-1h.E NNP-1h.O NNP-1h.E N-1i.O \
-N-1i.E P-1i.O P-1i.E NP-1i.O NP-1i.E NNP-1i.O NNP-1i.E N-1j.O N-1j.E P-1j.O \
-P-1j.E NP-1j.O NP-1j.E NNP-1j.O NNP-1j.E N-1k.O N-1k.E P-1k.O P-1k.E NP-1k.O \
-NP-1k.E NNP-1k.O NNP-1k.E N-streq-1.O N-streq-1.E P-streq-1.O P-streq-1.E \
-NP-streq-1.O NP-streq-1.E NNP-streq-1.O NNP-streq-1.E N-streq-2.O N-streq-2.E \
-P-streq-2.O P-streq-2.E NP-streq-2.O NP-streq-2.E NNP-streq-2.O NNP-streq-2.E \
-N-streq-3.O N-streq-3.E P-streq-3.O P-streq-3.E NP-streq-3.O NP-streq-3.E \
-NNP-streq-3.O NNP-streq-3.E N-streq-4.O N-streq-4.E P-streq-4.O P-streq-4.E \
-NP-streq-4.O NP-streq-4.E NNP-streq-4.O NNP-streq-4.E N-streq-5.O N-streq-5.E \
-P-streq-5.O P-streq-5.E NP-streq-5.O NP-streq-5.E NNP-streq-5.O NNP-streq-5.E \
-N-streq-6.O N-streq-6.E N-strne-1.O N-strne-1.E P-strne-1.O P-strne-1.E \
-NP-strne-1.O NP-strne-1.E NNP-strne-1.O NNP-strne-1.E N-strne-2.O N-strne-2.E \
-P-strne-2.O P-strne-2.E NP-strne-2.O NP-strne-2.E NNP-strne-2.O NNP-strne-2.E \
-N-strne-3.O N-strne-3.E P-strne-3.O P-strne-3.E NP-strne-3.O NP-strne-3.E \
-NNP-strne-3.O NNP-strne-3.E N-strne-4.O N-strne-4.E P-strne-4.O P-strne-4.E \
-NP-strne-4.O NP-strne-4.E NNP-strne-4.O NNP-strne-4.E N-strne-5.O N-strne-5.E \
-P-strne-5.O P-strne-5.E NP-strne-5.O NP-strne-5.E NNP-strne-5.O NNP-strne-5.E \
-N-strne-6.O N-strne-6.E N-and-1.O N-and-1.E P-and-1.O P-and-1.E NP-and-1.O \
-NP-and-1.E NNP-and-1.O NNP-and-1.E N-and-2.O N-and-2.E P-and-2.O P-and-2.E \
-NP-and-2.O NP-and-2.E NNP-and-2.O NNP-and-2.E N-and-3.O N-and-3.E P-and-3.O \
-P-and-3.E NP-and-3.O NP-and-3.E NNP-and-3.O NNP-and-3.E N-and-4.O N-and-4.E \
-P-and-4.O P-and-4.E NP-and-4.O NP-and-4.E NNP-and-4.O NNP-and-4.E N-or-1.O \
-N-or-1.E P-or-1.O P-or-1.E NP-or-1.O NP-or-1.E NNP-or-1.O NNP-or-1.E N-or-2.O \
-N-or-2.E P-or-2.O P-or-2.E NP-or-2.O NP-or-2.E NNP-or-2.O NNP-or-2.E N-or-3.O \
-N-or-3.E P-or-3.O P-or-3.E NP-or-3.O NP-or-3.E NNP-or-3.O NNP-or-3.E N-or-4.O \
-N-or-4.E P-or-4.O P-or-4.E NP-or-4.O NP-or-4.E NNP-or-4.O NNP-or-4.E N-eq-1.O \
-N-eq-1.E P-eq-1.O P-eq-1.E NP-eq-1.O NP-eq-1.E NNP-eq-1.O NNP-eq-1.E N-eq-2.O \
-N-eq-2.E P-eq-2.O P-eq-2.E NP-eq-2.O NP-eq-2.E NNP-eq-2.O NNP-eq-2.E N-eq-3.O \
-N-eq-3.E P-eq-3.O P-eq-3.E NP-eq-3.O NP-eq-3.E NNP-eq-3.O NNP-eq-3.E N-eq-4.O \
-N-eq-4.E P-eq-4.O P-eq-4.E NP-eq-4.O NP-eq-4.E NNP-eq-4.O NNP-eq-4.E N-eq-5.O \
-N-eq-5.E P-eq-5.O P-eq-5.E NP-eq-5.O NP-eq-5.E NNP-eq-5.O NNP-eq-5.E N-eq-6.O \
-N-eq-6.E P-eq-6.O P-eq-6.E NP-eq-6.O NP-eq-6.E NNP-eq-6.O NNP-eq-6.E N-gt-1.O \
-N-gt-1.E P-gt-1.O P-gt-1.E NP-gt-1.O NP-gt-1.E NNP-gt-1.O NNP-gt-1.E N-gt-2.O \
-N-gt-2.E P-gt-2.O P-gt-2.E NP-gt-2.O NP-gt-2.E NNP-gt-2.O NNP-gt-2.E N-gt-3.O \
-N-gt-3.E P-gt-3.O P-gt-3.E NP-gt-3.O NP-gt-3.E NNP-gt-3.O NNP-gt-3.E N-gt-4.O \
-N-gt-4.E P-gt-4.O P-gt-4.E NP-gt-4.O NP-gt-4.E NNP-gt-4.O NNP-gt-4.E N-gt-5.O \
-N-gt-5.E P-gt-5.O P-gt-5.E NP-gt-5.O NP-gt-5.E NNP-gt-5.O NNP-gt-5.E N-lt-1.O \
-N-lt-1.E P-lt-1.O P-lt-1.E NP-lt-1.O NP-lt-1.E NNP-lt-1.O NNP-lt-1.E N-lt-2.O \
-N-lt-2.E P-lt-2.O P-lt-2.E NP-lt-2.O NP-lt-2.E NNP-lt-2.O NNP-lt-2.E N-lt-3.O \
-N-lt-3.E P-lt-3.O P-lt-3.E NP-lt-3.O NP-lt-3.E NNP-lt-3.O NNP-lt-3.E N-lt-4.O \
-N-lt-4.E P-lt-4.O P-lt-4.E NP-lt-4.O NP-lt-4.E NNP-lt-4.O NNP-lt-4.E N-lt-5.O \
-N-lt-5.E P-lt-5.O P-lt-5.E NP-lt-5.O NP-lt-5.E NNP-lt-5.O NNP-lt-5.E N-t1.O \
-N-t1.E P-t1.O P-t1.E NP-t1.O NP-t1.E NNP-t1.O NNP-t1.E N-t2.O N-t2.E P-t2.O \
-P-t2.E NP-t2.O NP-t2.E NNP-t2.O NNP-t2.E N-paren-1.O N-paren-1.E N-paren-2.O \
-N-paren-2.E N-paren-3.O N-paren-3.E N-paren-4.O N-paren-4.E N-paren-5.O \
-N-paren-5.E 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 streq-1.O streq-1.E streq-2.O \
-streq-2.E streq-3.O streq-3.E streq-4.O streq-4.E streq-5.O streq-5.E \
-streq-6.O streq-6.E strne-1.O strne-1.E strne-2.O strne-2.E strne-3.O \
-strne-3.E strne-4.O strne-4.E strne-5.O strne-5.E strne-6.O strne-6.E and-1.O \
-and-1.E and-2.O and-2.E and-3.O and-3.E and-4.O and-4.E or-1.O or-1.E or-2.O \
-or-2.E or-3.O or-3.E or-4.O or-4.E eq-1.O eq-1.E eq-2.O eq-2.E eq-3.O eq-3.E \
-eq-4.O eq-4.E eq-5.O eq-5.E eq-6.O eq-6.E gt-1.O gt-1.E gt-2.O gt-2.E gt-3.O \
-gt-3.E gt-4.O gt-4.E gt-5.O gt-5.E lt-1.O lt-1.E lt-2.O lt-2.E lt-3.O lt-3.E \
-lt-4.O lt-4.E lt-5.O lt-5.E inv-1.O inv-1.E t1.O t1.E t2.O t2.E paren-1.O \
-paren-1.E paren-2.O paren-2.E paren-3.O paren-3.E paren-4.O paren-4.E \
-paren-5.O paren-5.E
-##test-files-end
-
-EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
-noinst_SCRIPTS = $x-tests
-TESTS_ENVIRONMENT = \
-  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
-  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
-
-editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
-
-TESTS = $x-tests
-
-mk_script = $(srcdir)/../mk-script
-$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
-	test '$x' = test && prog=../../src/$x || prog=$x; \
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
-	mv $@.n $@
-	chmod 755 $@
-
-MAINTAINERCLEANFILES = $x-tests $(maint_gen)
-CLEANFILES = $(run_gen)
-
-check: $(maint_gen)
-
-$(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
-	rm -f $@ $@t
-	sed -n '1,/^##test-files-begin/p' $(srcdir)/../Makefile.am.in > $@t
-	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-	  echo "x = $$tool" >> $@t
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t
-	sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t
-	chmod -w $@t
-	mv $@t $@
diff --git a/tests/tr/Makefile.am b/tests/tr/Makefile.am
deleted file mode 100644
index c9f4cf8f5..000000000
--- a/tests/tr/Makefile.am
+++ /dev/null
@@ -1,82 +0,0 @@
-# Make coreutils tests.					-*-Makefile-*-
-
-# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 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 2 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-##test-files-begin
-x = tr
-explicit =
-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 o-rep-1.I \
-o-rep-1.X o-rep-2.I o-rep-2.X esc.I esc.X bs-055.I bs-055.X bs-at-end.I \
-bs-at-end.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 empty-eq.I empty-eq.X empty-cc.I \
-empty-cc.X repeat-bs-9.I repeat-bs-9.X repeat-0.I repeat-0.X repeat-zeros.I \
-repeat-zeros.X repeat-compl.I repeat-compl.X repeat-xC.I repeat-xC.X \
-fowler-1.I fowler-1.X no-abort-1.I no-abort-1.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 o-rep-1.O \
-o-rep-1.E o-rep-2.O o-rep-2.E esc.O esc.E bs-055.O bs-055.E bs-at-end.O \
-bs-at-end.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 empty-eq.O empty-eq.E empty-cc.O \
-empty-cc.E repeat-bs-9.O repeat-bs-9.E repeat-0.O repeat-0.E repeat-zeros.O \
-repeat-zeros.E repeat-compl.O repeat-compl.E repeat-xC.O repeat-xC.E \
-fowler-1.O fowler-1.E no-abort-1.O no-abort-1.E
-##test-files-end
-
-EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
-noinst_SCRIPTS = $x-tests
-TESTS_ENVIRONMENT = \
-  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
-  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
-
-editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
-
-TESTS = $x-tests
-
-mk_script = $(srcdir)/../mk-script
-$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
-	test '$x' = test && prog=../../src/$x || prog=$x; \
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
-	mv $@.n $@
-	chmod 755 $@
-
-MAINTAINERCLEANFILES = $x-tests $(maint_gen)
-CLEANFILES = $(run_gen)
-
-check: $(maint_gen)
-
-$(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
-	rm -f $@ $@t
-	sed -n '1,/^##test-files-begin/p' $(srcdir)/../Makefile.am.in > $@t
-	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-	  echo "x = $$tool" >> $@t
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t
-	sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t
-	chmod -w $@t
-	mv $@t $@
diff --git a/tests/uniq/Makefile.am b/tests/uniq/Makefile.am
deleted file mode 100644
index 077a1a4e5..000000000
--- a/tests/uniq/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-# Make coreutils tests.					-*-Makefile-*-
-
-# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 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 2 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-##test-files-begin
-x = uniq
-explicit =
-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 10.I 10.X 11.I 11.X 12.I 12.X 13.I 13.X 20.I 20.X 21.I 21.X 22.I 22.X \
-23.I 23.X obs30.I obs30.X 31.I 31.X 32.I 32.X 33.I 33.X 34.I 34.X 35.I 35.X \
-obs-plus40.I obs-plus40.X obs-plus41.I obs-plus41.X 42.I 42.X 43.I 43.X \
-obs-plus44.I obs-plus44.X obs-plus45.I obs-plus45.X 50.I 50.X 51.I 51.X 52.I \
-52.X 53.I 53.X 54.I 54.X 55.I 55.X 56.I 56.X 57.I 57.X 60.I 60.X 61.I 61.X \
-62.I 62.X 63.I 63.X 64.I 64.X 65.I 65.X 90.I 90.X 91.I 91.X 92.I 92.X 93.I \
-93.X 94.I 94.X 101.I 101.X 102.I 102.X 110.I 110.X 111.I 111.X 112.I 112.X \
-113.I 113.X 114.I 114.X 115.I 115.X 116.I 116.X 117.I 117.X 118.I 118.X 119.I \
-119.X 120.I 120.X 121.I 121.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 10.O 10.E 11.O 11.E 12.O 12.E 13.O 13.E 20.O 20.E 21.O 21.E 22.O 22.E \
-23.O 23.E obs30.O obs30.E 31.O 31.E 32.O 32.E 33.O 33.E 34.O 34.E 35.O 35.E \
-obs-plus40.O obs-plus40.E obs-plus41.O obs-plus41.E 42.O 42.E 43.O 43.E \
-obs-plus44.O obs-plus44.E obs-plus45.O obs-plus45.E 50.O 50.E 51.O 51.E 52.O \
-52.E 53.O 53.E 54.O 54.E 55.O 55.E 56.O 56.E 57.O 57.E 60.O 60.E 61.O 61.E \
-62.O 62.E 63.O 63.E 64.O 64.E 65.O 65.E 90.O 90.E 91.O 91.E 92.O 92.E 93.O \
-93.E 94.O 94.E 101.O 101.E 102.O 102.E 110.O 110.E 111.O 111.E 112.O 112.E \
-113.O 113.E 114.O 114.E 115.O 115.E 116.O 116.E 117.O 117.E 118.O 118.E 119.O \
-119.E 120.O 120.E 121.O 121.E
-##test-files-end
-
-EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
-noinst_SCRIPTS = $x-tests
-TESTS_ENVIRONMENT = \
-  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
-  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
-
-editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
-
-TESTS = $x-tests
-
-mk_script = $(srcdir)/../mk-script
-$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
-	test '$x' = test && prog=../../src/$x || prog=$x; \
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
-	mv $@.n $@
-	chmod 755 $@
-
-MAINTAINERCLEANFILES = $x-tests $(maint_gen)
-CLEANFILES = $(run_gen)
-
-check: $(maint_gen)
-
-$(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
-	rm -f $@ $@t
-	sed -n '1,/^##test-files-begin/p' $(srcdir)/../Makefile.am.in > $@t
-	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-	  echo "x = $$tool" >> $@t
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t
-	sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t
-	chmod -w $@t
-	mv $@t $@
diff --git a/tests/wc/Makefile.am b/tests/wc/Makefile.am
deleted file mode 100644
index 04dad0276..000000000
--- a/tests/wc/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-# Make coreutils tests.					-*-Makefile-*-
-
-# Copyright (C) 1997, 1998, 2000, 2003, 2004, 2006 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 2 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-##test-files-begin
-x = wc
-explicit =
-maint_gen = a0.I a0.X a1.I a1.X a2.I a2.X a3.I a3.X a4.I a4.X a5.I a5.X a6.I \
-a6.X a7.I a7.X a8.I a8.X a9.I a9.X b0.I b0.X b1.I b1.X c0.I c0.X c1.I c1.X \
-c2.I c2.X
-run_gen = a0.O a0.E a1.O a1.E a2.O a2.E a3.O a3.E a4.O a4.E a5.O a5.E a6.O \
-a6.E a7.O a7.E a8.O a8.E a9.O a9.E b0.O b0.E b1.O b1.E c0.O c0.E c1.O c1.E \
-c2.O c2.E
-##test-files-end
-
-EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
-noinst_SCRIPTS = $x-tests
-TESTS_ENVIRONMENT = \
-  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
-  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
-
-editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
-
-TESTS = $x-tests
-
-mk_script = $(srcdir)/../mk-script
-$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
-	test '$x' = test && prog=../../src/$x || prog=$x; \
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
-	mv $@.n $@
-	chmod 755 $@
-
-MAINTAINERCLEANFILES = $x-tests $(maint_gen)
-CLEANFILES = $(run_gen)
-
-check: $(maint_gen)
-
-$(srcdir)/Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
-	rm -f $@ $@t
-	sed -n '1,/^##test-files-begin/p' $(srcdir)/../Makefile.am.in > $@t
-	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-	  echo "x = $$tool" >> $@t
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) --list >> $@t
-	sed -n '/^##test-files-end/,$$p' $(srcdir)/../Makefile.am.in >> $@t
-	chmod -w $@t
-	mv $@t $@