From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Sat, 3 Apr 1999 13:27:20 +0000 (+0000)
Subject: * automake.in (handle_tests): Test `dir=./' before `dir=', so that
X-Git-Tag: last-merge-into-user-dep-gen-branch~50
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=1e2b3dc320444ba4856edf6376ca2a86e0be2361;p=automake.git

* automake.in (handle_tests): Test `dir=./' before `dir=', so that
we do not depend on PATH starting with `.'.
---

diff --git a/ChangeLog b/ChangeLog
index 27ed4a6a..13d9be6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-04-03  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* automake.in (handle_tests): Test `dir=./' before `dir=', so that 
+	we do not depend on PATH starting with `.'.
+
 1999-03-31  Tom Tromey  <tromey@cygnus.com>
 
 	* automake.in (quote_cond_val): Quote \n.
diff --git a/automake.in b/automake.in
index ffac781f..d392491d 100755
--- a/automake.in
+++ b/automake.in
@@ -3794,12 +3794,13 @@ sub handle_tests
 	push (@phony, 'check-TESTS');
 
 	# Note: Solaris 2.7 seems to expand TESTS using VPATH.  That's
-	# why we choose `dir=' and not `dir=.'
+	# why we also try `dir='
 	$output_rules .= 'check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \\
 	srcdir=$(srcdir); export srcdir; \\
 	for tst in $(TESTS); do \\
-	  if test -f $$tst; then dir=; \\
+	  if test -f ./$$tst; then dir=./; \\
+	  elif test -f $$tst; then dir=; \\
 	  else dir="$(srcdir)/"; fi; \\
 	  if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \\
 	    all=`expr $$all + 1`; \\