Idea from Nicolas Thiery:

	* automake.texi (Tests): Document DEJATOOL as a list.
	* dejagnu.am (RUNTESTDEFAULTFLAGS): Use $$tool, not $(DEJATOOL).
	(check-DEJAGNU): Run runtest in a loop.

diff --git a/ChangeLog b/ChangeLog
index f07afecfee61eea1aa8f24401d12d216bd0361d9..03e5b629870755ca91864c567badd786001cb8ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-08-04  Tom Tromey  <tromey@cygnus.com>
+
+       Idea from Nicolas Thiery:
+       * automake.texi (Tests): Document DEJATOOL as a list.
+       * dejagnu.am (RUNTESTDEFAULTFLAGS): Use $$tool, not $(DEJATOOL).
+       (check-DEJAGNU): Run runtest in a loop.
+
 2000-08-02  Akim Demaille  <akim@epita.fr>
 
        * m4: Quote properly the name of the macros being defined.

diff --git a/THANKS b/THANKS
index 25010dd89d501121fd897627dac04443358dee3d..c6c6d0188bb362261aadb0a062a70d62c09f0b5a 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -85,6 +85,7 @@ Miles Bader           miles@ccs.mt.nec.co.jp
 Miodrag Vallat         miodrag@ifrance.com
 Motoyuki Kasahara      m-kasahr@sra.co.jp
 Motoyuki Kasahara      m-kasahr@sra.co.jp
+Nicolas Thiery         nthiery@Icare.mines.edu
 NISHIDA Keisuke                knishida@nn.iij4u.or.jp
 Nelson H. F. Beebe     beebe@math.utah.edu
 Noah Friedman          friedman@gnu.ai.mit.edu

diff --git a/automake.texi b/automake.texi
index 01fcda43bf7448cef46fd19a9e31ec765aefd605..27e147da6df3e7b49f4cb0b7092b948df466236e 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -3026,9 +3026,10 @@ set @code{TESTS_ENVIRONMENT} to an invocation of the shell (e.g.
 
 If @uref{ftp://prep.ai.mit.edu/pub/gnu/dejagnu-1.3.tar.gz,
 @samp{dejagnu}} appears in @code{AUTOMAKE_OPTIONS}, then a
-@code{dejagnu}-based test suite is assumed.  The value of the variable
-@code{DEJATOOL} is passed as the @code{--tool} argument to
-@code{runtest}; it defaults to the name of the package.
+@code{dejagnu}-based test suite is assumed.  The variable
+@code{DEJATOOL} is a list of names which are passed, one at a time, as
+the @code{--tool} argument to @code{runtest} invocations; it defaults to
+the name of the package.
 
 The variable @code{RUNTESTDEFAULTFLAGS} holds the @code{--tool} and
 @code{--srcdir} flags that are passed to dejagnu by default; this can be

diff --git a/dejagnu.am b/dejagnu.am
index f199ebebaaeeead43039a2c389a29b950d38456b..fdfc113fa81d1d69e9dca0383db7f7cae6d166df 100644 (file)
--- a/dejagnu.am
+++ b/dejagnu.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@ RUNTESTFLAGS =
 DEJATOOL = $(PACKAGE)
 
 ## Default flags to pass to dejagnu.  The user can override this.
-RUNTESTDEFAULTFLAGS = --tool $(DEJATOOL) --srcdir $$srcdir
+RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
 
 check-DEJAGNU: site.exp
 ## Life is easiest with an absolute srcdir, so do that.
@@ -39,6 +39,8 @@ CYGNUS        fi; \
 ## If runtest can't be found, print a warning but don't die.  It is
 ## pointless to cause a failure if the tests cannot be run at all.
        if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
-         $$runtest $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \
+         l='$(DEJATOOL)'; for tool in $$l; do \
+           $$runtest $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \
+         done; \
        else echo "WARNING: could not find \`runtest'" 1>&2; :;\
        fi

diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am
index f199ebebaaeeead43039a2c389a29b950d38456b..fdfc113fa81d1d69e9dca0383db7f7cae6d166df 100644 (file)
--- a/lib/am/dejagnu.am
+++ b/lib/am/dejagnu.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@ RUNTESTFLAGS =
 DEJATOOL = $(PACKAGE)
 
 ## Default flags to pass to dejagnu.  The user can override this.
-RUNTESTDEFAULTFLAGS = --tool $(DEJATOOL) --srcdir $$srcdir
+RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
 
 check-DEJAGNU: site.exp
 ## Life is easiest with an absolute srcdir, so do that.
@@ -39,6 +39,8 @@ CYGNUS        fi; \
 ## If runtest can't be found, print a warning but don't die.  It is
 ## pointless to cause a failure if the tests cannot be run at all.
        if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
-         $$runtest $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \
+         l='$(DEJATOOL)'; for tool in $$l; do \
+           $$runtest $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \
+         done; \
        else echo "WARNING: could not find \`runtest'" 1>&2; :;\
        fi