Move the two tests in tests/fmt to tests/misc/fmt.

* tests/fmt/basic: Move this file to ...
* tests/misc/fmt: ...here.  Don't rely on $PROG in env.
* tests/fmt/long-line: Move this file to ...
* tests/misc/fmt-long-line: ...here.
* tests/misc/Makefile.am (TESTS): Add fmt.
* tests/Makefile.am (SUBDIRS): Remove fmt.
* tests/fmt: Remove the directory.
* configure.ac (AC_CONFIG_FILES): Remove tests/fmt/Makefile

6 files changed, 4 insertions, 17 deletions

diff --git a/configure.ac b/configure.ac
index ed6953f37..6012b5625 100644
--- a/configure.ac
+++ b/configure.ac
@@ -343,7 +343,6 @@ AC_CONFIG_FILES(
   tests/cut/Makefile
   tests/dd/Makefile
   tests/du/Makefile
-  tests/fmt/Makefile
   tests/head/Makefile
   tests/install/Makefile
   tests/join/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 53985da04..be36fb87a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -44,7 +44,7 @@ EXTRA_DIST =		\
 ## N O T E :: Please do not add new tests/ directories.
 ## There are too many already.  Put new tests in misc/.
 SUBDIRS = \
-  chgrp chmod chown cp cut dd du fmt head \
+  chgrp chmod chown cp cut dd du head \
   install join ln ls ls-2 md5sum misc mkdir mv od pr readlink rm rmdir \
   seq sha1sum shred sort stty sum tac tail tail-2 tee test touch tr \
   tsort unexpand uniq wc
diff --git a/tests/fmt/Makefile.am b/tests/fmt/Makefile.am
deleted file mode 100644
index 3ed6f7283..000000000
--- a/tests/fmt/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-
-EXTRA_DIST = $(TESTS)
-
-TESTS_ENVIRONMENT = \
-  top_srcdir=$(top_srcdir) \
-  srcdir=$(srcdir) \
-  PERL="$(PERL)" \
-  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
-  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
-  PROG=fmt
-
-TESTS = basic long-line
diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index b23785847..faf9e49da 100644
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -69,6 +69,8 @@ TESTS = \
   expr \
   factor \
   false-status \
+  fmt \
+  fmt-long-line \
   fold \
   groups-version \
   head-c \
diff --git a/tests/fmt/basic b/tests/misc/fmt
index dae2f97bc..043bf723a 100755
--- a/tests/fmt/basic
+++ b/tests/misc/fmt
@@ -79,8 +79,7 @@ my @Tests =
 
 my $save_temps = $ENV{DEBUG};
 my $verbose = $ENV{VERBOSE};
-
-my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n";
+my $prog = 'fmt';
 my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
 exit $fail;
 EOF
diff --git a/tests/fmt/long-line b/tests/misc/fmt-long-line
index 547b02f3c..547b02f3c 100755
--- a/tests/fmt/long-line
+++ b/tests/misc/fmt-long-line