Re: testsuite -C dir

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Eric Blake on 1/26/2008 8:11 PM:
|
| In the spirit of make -C (and tar -C), autotest testsuites should support
| -C, as in this patch.  Then the above can be written as:
|
| check-local: tests/atconfig tests/m4 $(TESTSUITE) $(check_LTLIBRARIES)
|     $(SHELL) tests/testsuite -C tests $(TESTS_ENVIRONMENT) \
|       $(TESTSUITEFLAGS)

Done as follows.  Yes, this means that head now depends on unreleased
autoconf in addition to unreleased libtool, but I'm hoping that the
licensing issues holding up the release of autoconf 2.62 will be solved
soon.  But the branch is still (intentionally) fine with released autoconf.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHne/l84KuGfSFAYARAsiIAJ4x3FSafCJMW8S6yZeYHjAHZMfyHwCeNsuD
4cm/2X0DD4aLZ1bnbtT+Zgw=
=4n5M
-----END PGP SIGNATURE-----

>From 71c6a7d82b7519b73b43671187419c9d5d0a7676 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Mon, 28 Jan 2008 08:03:16 -0700
Subject: [PATCH] Depend on newer autoconf, for testsuite -C dir.

* Makefile.am (CD_TESTDIR): Delete, no longer required.
(check-local, installcheck-local, clean-local-tests): Use new -C
option from autotest.
* configure.ac (AC_PREREQ): Bump to 2.61a.347.
* bootstrap: Mention new dependency.
* HACKING: Likewise.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog    |   10 ++++++++++
 HACKING      |    2 +-
 Makefile.am  |   22 ++++++----------------
 bootstrap    |    8 ++++----
 configure.ac |    3 ++-
 5 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 34b9491..612654b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-01-28  Eric Blake  <address@hidden>
+
+       Depend on newer autoconf, for testsuite -C dir.
+       * Makefile.am (CD_TESTDIR): Delete, no longer required.
+       (check-local, installcheck-local, clean-local-tests): Use new -C
+       option from autotest.
+       * configure.ac (AC_PREREQ): Bump to 2.61a.347.
+       * bootstrap: Mention new dependency.
+       * HACKING: Likewise.
+
 2008-01-27  Eric Blake  <address@hidden>
 
        Stage 13: push composite text tokens.
diff --git a/HACKING b/HACKING
index f81dd05..c5d07c8 100644
--- a/HACKING
+++ b/HACKING
@@ -64,7 +64,7 @@ and is not part of a release distribution.
 * Before you can build from git, you need to bootstrap.  This requires:
   - A pre-installed version of GNU M4 1.4.5 or later, built from a
   package
-  - Autoconf 2.60 or later
+  - A git checkout of Autoconf (will become Autoconf 2.62)
   - Automake 1.10.1 or later
   - CVS Head of Libtool (will become Libtool 2.0)
   - Gettext 0.16 or later
diff --git a/Makefile.am b/Makefile.am
index e79210c..8626031 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -403,30 +403,20 @@ tests/atconfig: config.status
        $(SHELL) ./config.status tests/atconfig
 DISTCLEANFILES += tests/atconfig
 
-# FIXME - After 2.60, autoconf might add an option to testsuite to specify
-# which directory it should output testsuite.log.  Until then, we want it
-# to drop in tests, so we have to do a cd inside the targets that invoke
-# testsuite.  As a result, we need an absolute path since the relative
-# $(srcdir) inside $(TESTSUITE) does not work after cd.
-CD_TESTDIR     = cd ./tests
-
 # Hook the test suite into the check rule
 check-local: tests/atconfig tests/m4 $(TESTSUITE) $(check_LTLIBRARIES)
-       $(CD_TESTDIR); \
-       $(SHELL) '$(abs_srcdir)/tests/testsuite' $(TESTS_ENVIRONMENT) \
-         $(TESTSUITEFLAGS)
+       $(SHELL) '$(srcdir)/tests/testsuite' -C tests \
+         $(TESTS_ENVIRONMENT) $(TESTSUITEFLAGS)
 
 # Run the test suite on the *installed* tree.
 installcheck-local: tests/atconfig $(TESTSUITE) $(check_LTLIBRARIES)
-       $(CD_TESTDIR); \
-       $(SHELL) '$(abs_srcdir)/tests/testsuite' $(TESTS_ENVIRONMENT) \
-         AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS)
+       $(SHELL) '$(srcdir)/tests/testsuite' -C tests \
+         $(TESTS_ENVIRONMENT) AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS)
 
 # We need to remove any file droppings left behind by testsuite.
 clean-local-tests:
-       $(CD_TESTDIR); \
-       test ! -f '$(abs_srcdir)/tests/testsuite' || \
-         $(SHELL) '$(abs_srcdir)/tests/testsuite' --clean
+       test ! -f '$(srcdir)/tests/testsuite' || \
+         $(SHELL) '$(srcdir)/tests/testsuite' -C tests --clean
 
 OTHER_FILES    = tests/iso8859.m4 tests/stackovf.test \
                tests/null.m4 tests/null.out tests/null.err
diff --git a/bootstrap b/bootstrap
index 8da38fd..2dcede2 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# bootstrap (GNU M4) version 2008-01-22
+# bootstrap (GNU M4) version 2008-01-28
 # Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 # This is free software: you are free to change and redistribute it.
@@ -39,9 +39,9 @@
 
 # This script bootstraps a git or CVS checkout of GNU M4 by correctly calling
 # out to parts of the GNU Build Platform.  Currently this requires GNU
-# Gettext 0.16 or better, Autoconf 2.60 or better, GNU M4 1.4.x or
-# better, a git snapshot of Automake 1.10.1 or better, a CVS snapshot
-# of Libtool 2.1a or better, and the latest git or CVS checkout of Gnulib.
+# Gettext 0.16 or better, a git snapshot of Autoconf 2.61a or better,
+# GNU M4 1.4.x or better, Automake 1.10.1 or better, a CVS snapshot of
+# Libtool 2.1a or better, and the latest git or CVS checkout of Gnulib.
 # Libtool must be installed; either with the same --prefix as
 # automake, or made accessible to aclocal's search path via
 # $AUTOMAKE_prefix/share/aclocal/dirlist.
diff --git a/configure.ac b/configure.ac
index 05c5c9a..4523dbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_PREREQ([2.60])
+dnl We depend on autotest's ./testsuite -C.
+AC_PREREQ([2.61a.347])
 
 ## ------------------------ ##
 ## Autoconf initialization. ##
-- 
1.5.3.8