summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac1
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/dircolors/Makefile.am13
-rw-r--r--tests/misc/Makefile.am1
-rwxr-xr-xtests/misc/dircolors (renamed from tests/dircolors/simple)4
5 files changed, 4 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index df9b2a8af..c488f0d8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -342,7 +342,6 @@ AC_CONFIG_FILES(
tests/cp/Makefile
tests/cut/Makefile
tests/dd/Makefile
- tests/dircolors/Makefile
tests/du/Makefile
tests/expr/Makefile
tests/factor/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5d91f5956..2d57bfcf5 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 dircolors du expr factor fmt head \
+ chgrp chmod chown cp cut dd du expr factor 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/dircolors/Makefile.am b/tests/dircolors/Makefile.am
deleted file mode 100644
index 41e754e69..000000000
--- a/tests/dircolors/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=dircolors
-
-TESTS = simple
diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index 98951d8dd..9555636f9 100644
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -62,6 +62,7 @@ TESTS = \
close-stdout \
csplit \
date-sec \
+ dircolors \
df \
dirname \
expand \
diff --git a/tests/dircolors/simple b/tests/misc/dircolors
index 2db796192..e93d2fb7d 100755
--- a/tests/dircolors/simple
+++ b/tests/misc/dircolors
@@ -1,7 +1,7 @@
#!/bin/sh
# Simple dircolors tests.
-# Copyright (C) 1998, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2003, 2005-2007 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
@@ -53,7 +53,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 = 'dircolors';
my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
exit $fail;
EOF