summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2006-06-05 20:03:27 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2006-06-05 20:03:27 +0000
commit0d82817eb4d3111c64c4b671aae0e4697d2785ac (patch)
treefdb11ba07529a626858e475f680bd0720eb16cd8 /tests
parentf9265a7efe4b53093dedcfa44de0d330484b86ef (diff)
downloadcoreutils-0d82817eb4d3111c64c4b671aae0e4697d2785ac.tar.xz
(PROG): Take the basename of $$tst,
in case Solaris make has prepended the directory. (TESTS): Adjust to test script renamings.
Diffstat (limited to 'tests')
-rw-r--r--tests/misc/Makefile.am16
1 files changed, 11 insertions, 5 deletions
diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index 0ede6faf2..5f6b07a92 100644
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -9,7 +9,13 @@ TESTS_ENVIRONMENT = \
PERL="$(PERL)" \
BUILD_SRC_DIR="`pwd`/../../src" \
PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
- PROG=$$tst
+ PROG=`../../src/basename -- "$$tst"`
+
+# Do not choose a name that is a shell keyword like 'if', or a
+# commonly-used utility like 'cat' or 'test', as the name of a test.
+# Otherwise, VPATH builds will fail on hosts like Solaris, since they
+# will expand 'if test ...' to 'if .../test ...', and the '.../test'
+# will execute the test script rather than the standard utility.
TESTS = \
base64 \
@@ -20,7 +26,7 @@ TESTS = \
date-sec \
dirname \
expand \
- false \
+ false-status \
fold \
head-c \
head-elide-tail \
@@ -33,12 +39,12 @@ TESTS = \
pathchk1 \
printf \
printf-hex \
- pwd \
+ pwd-long \
sha224sum \
sha256sum \
sha384sum \
sha512sum \
- sort \
+ sort-merge \
sort-rand \
split-a \
split-fail \
@@ -46,5 +52,5 @@ TESTS = \
stat-fmt \
stat-printf \
tac-continue \
- test \
+ test-diag \
tty-eof