summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2007-09-12 15:55:54 +0200
committerJim Meyering <jim@meyering.net>2007-09-15 08:40:39 +0200
commit5cb2610710820b9fcc4d90928738c17ecc749e59 (patch)
tree47d059d31f6b8c934b4b75621daa350f853e3507
parenta669dfdabb3fa1be2e1367d53a797d495e7bd5c9 (diff)
downloadcoreutils-5cb2610710820b9fcc4d90928738c17ecc749e59.tar.xz
Move the sole test in tests/ls-2/ to tests/misc/.
* tests/ls-2/basic-1: Move this file to ... * tests/misc/ls-misc: ...here. Don't rely on $PROG in env. * tests/misc/Makefile.am (TESTS): Add ls-misc. * tests/Makefile.am (SUBDIRS): Remove ls-2. * tests/ls-2: Remove the directory. * configure.ac (AC_CONFIG_FILES): Remove tests/ls-2/Makefile.
-rw-r--r--configure.ac1
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/ls-2/Makefile.am14
-rw-r--r--tests/misc/Makefile.am1
-rwxr-xr-xtests/misc/ls-misc (renamed from tests/ls-2/tests)2
5 files changed, 3 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index 3240bd56f..59dc2853f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -347,7 +347,6 @@ AC_CONFIG_FILES(
tests/install/Makefile
tests/join/Makefile
tests/ln/Makefile
- tests/ls-2/Makefile
tests/ls/Makefile
tests/misc/Makefile
tests/mkdir/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d3cfb930f..7fa6ed5ac 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -45,7 +45,7 @@ EXTRA_DIST = \
## There are too many already. Put new tests in misc/.
SUBDIRS = \
chgrp chmod chown cp cut dd du head \
- install join ln ls ls-2 misc mkdir mv pr readlink rm rmdir \
+ install join ln ls misc mkdir mv pr readlink rm rmdir \
sort tac tail tail-2 test touch tr \
uniq wc
## N O T E :: Please do not add new directories.
diff --git a/tests/ls-2/Makefile.am b/tests/ls-2/Makefile.am
deleted file mode 100644
index edb6accfa..000000000
--- a/tests/ls-2/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-
-EXTRA_DIST = $(TESTS)
-
-TESTS_ENVIRONMENT = \
- abs_top_builddir=$(abs_top_builddir) \
- 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=ls
-
-TESTS = tests
diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index a08b7192c..636918c39 100644
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -43,6 +43,7 @@ TESTS_ENVIRONMENT = \
TESTS = \
head-elide-tail \
ls-time \
+ ls-misc \
date \
xstrtol \
od \
diff --git a/tests/ls-2/tests b/tests/misc/ls-misc
index c0500fbcb..4fb8f1662 100755
--- a/tests/ls-2/tests
+++ b/tests/misc/ls-misc
@@ -178,7 +178,7 @@ my @Tests =
my $save_temps = $ENV{SAVE_TEMPS};
my $verbose = $ENV{VERBOSE};
-my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n";
+my $prog = 'ls';
my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
exit $fail;
EOF