Rename file to avoid bugs with VPATH builds and Solaris 'make'.

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