* lib/autotest/general.m4 (AT_INIT): Replace a `tr' with a `sed'. Join

PATH members so as to not prepend an empty element.  Move a comment.
* Makefile.am (SUBDIRS): Build in `tests' last.
* tests/Makefile.am (installcheck-local): Add check-local dependencies.

diff --git a/ChangeLog b/ChangeLog
index bc88f29ec8b0c693a4da173a0b18bb3f51277e01..d527fff4e2cbece15d121b33850781f2861e2069 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-08  Noah Misch  <noah@cs.caltech.edu>
+
+       * lib/autotest/general.m4 (AT_INIT): Replace a `tr' with a `sed'.  Join
+       PATH members so as to not prepend an empty element.  Move a comment.
+       * Makefile.am (SUBDIRS): Build in `tests' last.
+        * tests/Makefile.am (installcheck-local): Add check-local dependencies.
+
 2004-12-08  Paul Eggert  <eggert@cs.ucla.edu>
 
        * lib/mdate-sh: Don't use "set - x`$ls_command /`", as zsh mishandles

diff --git a/Makefile.am b/Makefile.am
index 40da19f0b038d1aab2442b5c8d29c4320473ef77..8e4081b6e1c0cad9a16edd01b05e132fa81991fb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,9 +20,9 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-# bin/ and tests/ must be run first, as they build the tests executables
-# (tests/autom4te etc.), that we happen to use here.
-SUBDIRS = bin tests . lib config man doc
+# bin/ must be run first, as it builds executables needed for tests.
+# autom4te uses autotest.m4f to generate `testsuite', so build tests last.
+SUBDIRS = bin . lib config man doc tests
 
 ACLOCAL_AMFLAGS = -I config
 

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 35524a8a7fe89f1e9afb027b79cc09c2cd229fb0..1fbecc00fbff8adf53769be84c06227f5bc831ec 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -440,29 +440,30 @@ m4_divert_push([PREPARE_TESTS])dnl
 # For embedded test suites, AUTOTEST_PATH is relative to the top level
 # of the package.  Then expand it into build/src parts, since users
 # may create executables in both places.
-#
-# There might be directories that don't exist, but don't redirect
-# builtins' (eg., cd) stderr directly: Ultrix's sh hates that.
-AUTOTEST_PATH=`echo $AUTOTEST_PATH | tr ':' $PATH_SEPARATOR`
+AUTOTEST_PATH=`echo $AUTOTEST_PATH | sed "s,:,$PATH_SEPARATOR,g"`
 at_path=
 _AS_PATH_WALK([$AUTOTEST_PATH $PATH],
-[case $as_dir in
+[test -n "$at_path" && at_path=$at_path$PATH_SEPARATOR
+case $as_dir in
   [[\\/]]* | ?:[[\\/]]* )
-    at_path=$at_path$PATH_SEPARATOR$as_dir
+    at_path=$at_path$as_dir
     ;;
   * )
     if test -z "$at_top_builddir"; then
       # Stand-alone test suite.
-      at_path=$at_path$PATH_SEPARATOR$as_dir
+      at_path=$at_path$as_dir
     else
       # Embedded test suite.
-      at_path=$at_path$PATH_SEPARATOR$at_top_builddir/$as_dir
-      at_path=$at_path$PATH_SEPARATOR$at_top_srcdir/$as_dir
+      at_path=$at_path$at_top_builddir/$as_dir$PATH_SEPARATOR
+      at_path=$at_path$at_top_srcdir/$as_dir
     fi
     ;;
 esac])
 
 # Now build and simplify PATH.
+#
+# There might be directories that don't exist, but don't redirect
+# builtins' (eg., cd) stderr directly: Ultrix's sh hates that.
 PATH=
 _AS_PATH_WALK([$at_path],
 [as_dir=`(cd "$as_dir" && pwd) 2>/dev/null`

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e338a7d8a21da281d3ff188cbe97370d7b33373e..09e874d96b16f74b8203467d295da413acb1cdcf 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -105,7 +105,7 @@ check-local: atconfig atlocal $(TESTSUITE)
        $(SHELL) $(TESTSUITE)
 
 # Run the test suite on the *installed* tree.
-installcheck-local:
+installcheck-local: atconfig atlocal $(TESTSUITE)
        $(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin