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
This commit is contained in:
Jim Meyering
2007-09-08 08:57:42 +02:00
parent aa3a727dc0
commit a0cbaa4fc8
6 changed files with 4 additions and 17 deletions

View File

@@ -343,7 +343,6 @@ AC_CONFIG_FILES(
tests/cut/Makefile tests/cut/Makefile
tests/dd/Makefile tests/dd/Makefile
tests/du/Makefile tests/du/Makefile
tests/fmt/Makefile
tests/head/Makefile tests/head/Makefile
tests/install/Makefile tests/install/Makefile
tests/join/Makefile tests/join/Makefile

View File

@@ -44,7 +44,7 @@ EXTRA_DIST = \
## N O T E :: Please do not add new tests/ directories. ## N O T E :: Please do not add new tests/ directories.
## There are too many already. Put new tests in misc/. ## There are too many already. Put new tests in misc/.
SUBDIRS = \ 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 \ 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 \ seq sha1sum shred sort stty sum tac tail tail-2 tee test touch tr \
tsort unexpand uniq wc tsort unexpand uniq wc

View File

@@ -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

View File

@@ -69,6 +69,8 @@ TESTS = \
expr \ expr \
factor \ factor \
false-status \ false-status \
fmt \
fmt-long-line \
fold \ fold \
groups-version \ groups-version \
head-c \ head-c \

View File

@@ -79,8 +79,7 @@ my @Tests =
my $save_temps = $ENV{DEBUG}; my $save_temps = $ENV{DEBUG};
my $verbose = $ENV{VERBOSE}; my $verbose = $ENV{VERBOSE};
my $prog = 'fmt';
my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n";
my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
exit $fail; exit $fail;
EOF EOF