Move the sole test in tests/factor to tests/misc/factor.

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

diff --git a/configure.ac b/configure.ac
index 157ca30bec45074995571748172819c2f8b035d5..ed6953f3702cb2aaef70823db8118e0f7d2af917 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -343,7 +343,6 @@ AC_CONFIG_FILES(
   tests/cut/Makefile
   tests/dd/Makefile
   tests/du/Makefile
-  tests/factor/Makefile
   tests/fmt/Makefile
   tests/head/Makefile
   tests/install/Makefile

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 84e0fdd872ac1fffc044342437fdeec713952e43..53985da046e73b177e2f184df608d5c4bbd7f9df 100644 (file)
--- 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 factor fmt head \
+  chgrp chmod chown cp cut dd du fmt 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/factor/Makefile.am b/tests/factor/Makefile.am
deleted file mode 100644 (file)
index dedc143..0000000
--- a/tests/factor/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-TESTS = basic
-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=factor

diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index f1775d85eaa0e660a0cfa6fc6144420dd6e8bf30..b2378584702a689ea70781e9b7c5ec92595050a4 100644 (file)
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -67,6 +67,7 @@ TESTS = \
   dirname \
   expand \
   expr \
+  factor \
   false-status \
   fold \
   groups-version \

diff --git a/tests/factor/basic b/tests/misc/factor
similarity index 97%
rename from tests/factor/basic
rename to tests/misc/factor
index bd2cc0851732fd5feb3fbd89321db8a6d2357214..e6d3bcf71065662609fa75d9acd1de34d70ad824 100755 (executable)
--- a/tests/factor/basic
+++ b/tests/misc/factor
@@ -33,12 +33,11 @@ require 5.003;
 use strict;
 
 (my $program_name = $0) =~ s|.*/||;
+my $prog = 'factor';
 
 # Turn off localisation of executable's ouput.
 @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
 
-my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n";
-
 my @Tests =
     (
      ['1', '9',          {OUT => '3 3'}],