summaryrefslogtreecommitdiff
path: root/tests/misc
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2006-06-05 20:05:00 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2006-06-05 20:05:00 +0000
commit856e93df7667578d7a425e1ab6da71c113954f97 (patch)
tree8e768d8f0353c45269f1fcdbca1dc8c19e89f4ec /tests/misc
parent8818e69748b0cbf4d0c63d4ca770aa4e7b2a1b8d (diff)
downloadcoreutils-856e93df7667578d7a425e1ab6da71c113954f97.tar.xz
Rename file to avoid bugs with VPATH builds and Solaris 'make'.
Diffstat (limited to 'tests/misc')
-rw-r--r--tests/misc/Makefile.in16
-rwxr-xr-xtests/misc/false-status (renamed from tests/misc/false)0
-rwxr-xr-xtests/misc/pwd-long (renamed from tests/misc/pwd)0
-rwxr-xr-xtests/misc/sort-merge (renamed from tests/misc/sort)2
-rwxr-xr-xtests/misc/test-diag (renamed from tests/misc/test)0
5 files changed, 12 insertions, 6 deletions
diff --git a/tests/misc/Makefile.in b/tests/misc/Makefile.in
index 7894a2f90..87e775fa7 100644
--- a/tests/misc/Makefile.in
+++ b/tests/misc/Makefile.in
@@ -311,8 +311,14 @@ 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 \
basename \
@@ -322,7 +328,7 @@ TESTS = \
date-sec \
dirname \
expand \
- false \
+ false-status \
fold \
head-c \
head-elide-tail \
@@ -335,12 +341,12 @@ TESTS = \
pathchk1 \
printf \
printf-hex \
- pwd \
+ pwd-long \
sha224sum \
sha256sum \
sha384sum \
sha512sum \
- sort \
+ sort-merge \
sort-rand \
split-a \
split-fail \
@@ -348,7 +354,7 @@ TESTS = \
stat-fmt \
stat-printf \
tac-continue \
- test \
+ test-diag \
tty-eof
all: all-am
diff --git a/tests/misc/false b/tests/misc/false-status
index 2d85bb56c..2d85bb56c 100755
--- a/tests/misc/false
+++ b/tests/misc/false-status
diff --git a/tests/misc/pwd b/tests/misc/pwd-long
index 7975960e4..7975960e4 100755
--- a/tests/misc/pwd
+++ b/tests/misc/pwd-long
diff --git a/tests/misc/sort b/tests/misc/sort-merge
index 6cc6ed252..d27f42ea1 100755
--- a/tests/misc/sort
+++ b/tests/misc/sort-merge
@@ -26,7 +26,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 = 'sort';
my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
exit $fail;
EOF
diff --git a/tests/misc/test b/tests/misc/test-diag
index c154f38cf..c154f38cf 100755
--- a/tests/misc/test
+++ b/tests/misc/test-diag