* tests/mktests.sh (au_exclude_egrep): Fix output copyright notice.

* lib/autom4te.cfg (args): Add local.at? for Autotest args.
* tests/atspecific.m4: Rename as...
* tests/local.at: This.
* tests/suite.at: Move the globals into...
* tests/local.at: here.
* tests/Makefile.am: Adjust.
* doc/autoconf.texi (testsuite Scripts): Adjust.

diff --git a/ChangeLog b/ChangeLog
index 23a54a475c8c8163e412645b2c0018c2105fc55d..0889cf066ab778c01182f3e10e59cd93e7b4a239 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-06-23  Akim Demaille  <akim@epita.fr>
+
+       * tests/mktests.sh (au_exclude_egrep): Fix output copyright notice.
+       * lib/autom4te.cfg (args): Add local.at? for Autotest args.
+       * tests/atspecific.m4: Rename as...
+       * tests/local.at: This.
+       * tests/suite.at: Move the globals into...
+       * tests/local.at: here.
+       * tests/Makefile.am: Adjust.
+       * doc/autoconf.texi (testsuite Scripts): Adjust.
+
 2003-06-21  Kevin Ryde  <user42@zip.com.au>
 
        * lib/autoconf/c.m4 (_AC_PROG_CC_STDC): Extend test program to get an

diff --git a/NEWS b/NEWS
index 8ee51edf21ee7f02f6d8f384949d0f32e02d6225..30f601da76953820a4191d3999798a0b614df7b0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 * Major changes in Autoconf 2.57b                       -*- outline -*-
 
+** Autotest and local.at
+  The optional file local.at is always included in Autotest test suites.
+
 * Major changes in Autoconf 2.57a
 
   Released 2003-06-20 by Akim Demaille.

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 16a02602e6a31d49f3bdbd6d28efb8b4e3fa3f62..ed6192410b2f68fbc9ca2138d5d54d10c47be91e 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -14177,6 +14177,14 @@ health checking, before listing include statements for all other test
 files.  The special file @file{package.m4}, containing the
 identification of the package, is automatically included if found.
 
+A convenient alternative consists in moving all the global issues
+(local Autotest macros, elementary health checking, and @code{AT_INIT}
+invocation) into the file @code{local.at}, and making
+@file{testsuite.at} be a simple list of @code{m4_include} of sub test
+suites.  In such case, generating the whole test suite or pieces of it
+is only a matter of choosing the @command{autom4te} command line
+arguments.
+
 The validation scripts that Autotest produces are by convention called
 @command{testsuite}.  When run, @command{testsuite} executes each test
 group in turn, producing only one summary line per test to say if that
@@ -14216,13 +14224,13 @@ Here is a diagram showing the relationship between files.
 Files used in preparing a software package for distribution:
 
 @example
-subfile-1.at ->.
-    ...         \
-subfile-i.at ---->-- testsuite.at -->.
-    ...         /                     \
-subfile-n.at ->'                       >-- autom4te* -->testsuite
-                                     /
-                     [package.m4] ->'
+                [package.m4] -->.
+                                 \
+subfile-1.at ->.  [local.at] ---->+
+    ...         \                  \
+subfile-i.at ---->-- testsuite.at -->-- autom4te* -->testsuite
+    ...         /
+subfile-n.at ->'
 @end example
 
 @noindent

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 79e704be36b6272b856758f0e11a94513407ead5..cb7c0afd6dc72bb359c95e2e693b1c2b203f434d 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to create Makefile.in. -*-Makefile-*-
 
 ## Makefile for Autoconf testsuite.
-## Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+## Copyright (C) 2000, 2001, 2002, 2003 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
@@ -20,7 +20,7 @@
 
 # We don't actually distribute the testsuite, since one only
 # needs m4 to build it, m4 being required anyway to install Autoconf.
-EXTRA_DIST = $(TESTSUITE_AT) atspecific.m4 mktests.sh \
+EXTRA_DIST = $(TESTSUITE_AT) local.at mktests.sh \
             atlocal.in package.m4 wrapper.as
 
 # Running the uninstalled scripts.
@@ -84,7 +84,7 @@ TESTSUITE = ./testsuite
 # we are allowed to use it (since we ship it).
 AUTOTEST = ./autom4te --language=autotest
 $(TESTSUITE): $(srcdir)/package.m4 \
-             atspecific.m4 \
+             local.at \
              $(TESTSUITE_AT) \
              $(autotest_m4f_dependencies)
        $(AUTOTEST) -I $(srcdir) suite.at -o $@.tmp

diff --git a/tests/Makefile.in b/tests/Makefile.in
index c27d578206ee2f295e4058c744b2749c8b77b0b2..0a94c5a4bdc500dc2ecc30b718a1b1196308b6da 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -105,7 +105,7 @@ target_alias = @target_alias@
 
 # We don't actually distribute the testsuite, since one only
 # needs m4 to build it, m4 being required anyway to install Autoconf.
-EXTRA_DIST = $(TESTSUITE_AT) atspecific.m4 mktests.sh \
+EXTRA_DIST = $(TESTSUITE_AT) local.at mktests.sh \
             atlocal.in package.m4 wrapper.as
 
 
@@ -441,7 +441,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
 $(srcdir)/wrapper.in: $(srcdir)/wrapper.as
        ./autom4te --language=M4sh $(srcdir)/wrapper.as -o $@
 $(TESTSUITE): $(srcdir)/package.m4 \
-             atspecific.m4 \
+             local.at \
              $(TESTSUITE_AT) \
              $(autotest_m4f_dependencies)
        $(AUTOTEST) -I $(srcdir) suite.at -o $@.tmp

diff --git a/tests/acc.at b/tests/acc.at
index 15571904069685cbaa81677ec088fc685173e9ca..38b1d2a9782edc42a6a264144d5f9f0d87243877 100644 (file)
--- a/tests/acc.at
+++ b/tests/acc.at
@@ -1,5 +1,5 @@
 # Generated by mktests.sh, do not edit by hand.        -*- Autotest -*-
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
 
 AT_BANNER([Testing autoconf/c macros.])
 

diff --git a/tests/acfortran.at b/tests/acfortran.at
index e8dbcab36d4bf5651707750c16da935318ab53a3..0e82c6c7cbe0507ce51985b02c69f5a4c2dc66d9 100644 (file)
--- a/tests/acfortran.at
+++ b/tests/acfortran.at
@@ -1,5 +1,5 @@
 # Generated by mktests.sh, do not edit by hand.        -*- Autotest -*-
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
 
 AT_BANNER([Testing autoconf/fortran macros.])
 

diff --git a/tests/acfunctions.at b/tests/acfunctions.at
index 2d2e46263edfc6819a2f5c29acfe16ac097ace45..c02b2cf6db4d85bd137da9c2525fb67cdb40ef96 100644 (file)
--- a/tests/acfunctions.at
+++ b/tests/acfunctions.at
@@ -1,5 +1,5 @@
 # Generated by mktests.sh, do not edit by hand.        -*- Autotest -*-
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
 
 AT_BANNER([Testing autoconf/functions macros.])
 

diff --git a/tests/acgeneral.at b/tests/acgeneral.at
index e70f6aa5631aed1b36b4bbcef05433b572a0e3e4..7aa818e4055e810540d42487f497726693a695c2 100644 (file)
--- a/tests/acgeneral.at
+++ b/tests/acgeneral.at
@@ -1,5 +1,5 @@
 # Generated by mktests.sh, do not edit by hand.        -*- Autotest -*-
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
 
 AT_BANNER([Testing autoconf/general macros.])
 

diff --git a/tests/acheaders.at b/tests/acheaders.at
index c0b72489ba420acbfe5c653b65f0b330c30c725f..905a4c6d409e71ac529135087d8fef3c3652e7ef 100644 (file)
--- a/tests/acheaders.at
+++ b/tests/acheaders.at
@@ -1,5 +1,5 @@
 # Generated by mktests.sh, do not edit by hand.        -*- Autotest -*-
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
 
 AT_BANNER([Testing autoconf/headers macros.])
 

diff --git a/tests/aclang.at b/tests/aclang.at
index 4c39e7caa4166c20b6619c10bb261aca7cf86302..f2e236a4ff122fe626292ea5152e292f940da1d4 100644 (file)
--- a/tests/aclang.at
+++ b/tests/aclang.at
@@ -1,5 +1,5 @@
 # Generated by mktests.sh, do not edit by hand.        -*- Autotest -*-
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
 
 AT_BANNER([Testing autoconf/lang macros.])
 

diff --git a/tests/aclibs.at b/tests/aclibs.at
index 0ba2665bef4926c1a8e9ffc4fd1bc6e07428b457..4ebbbcca2005584d48421c80a2bc561c01db1d51 100644 (file)
--- a/tests/aclibs.at
+++ b/tests/aclibs.at
@@ -1,5 +1,5 @@
 # Generated by mktests.sh, do not edit by hand.        -*- Autotest -*-
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
 
 AT_BANNER([Testing autoconf/libs macros.])
 

diff --git a/tests/acprograms.at b/tests/acprograms.at
index df8c1e93defcdf1c12e6ea467859400aefecb40b..cbd8d949bd47f6385929c8fe0c07721bb6d9712b 100644 (file)
--- a/tests/acprograms.at
+++ b/tests/acprograms.at
@@ -1,5 +1,5 @@
 # Generated by mktests.sh, do not edit by hand.        -*- Autotest -*-
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
 
 AT_BANNER([Testing autoconf/programs macros.])
 

diff --git a/tests/acspecific.at b/tests/acspecific.at
index 8e914e7fcb715cfe77983c68eca2568322694500..86aa1b5b4546cb259479a54536aa58c4cd0fc560 100644 (file)
--- a/tests/acspecific.at
+++ b/tests/acspecific.at
@@ -1,5 +1,5 @@
 # Generated by mktests.sh, do not edit by hand.        -*- Autotest -*-
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
 
 AT_BANNER([Testing autoconf/specific macros.])
 

diff --git a/tests/acstatus.at b/tests/acstatus.at
index cc868346f0cfac0c2f649aa9f1de9c580e62b297..7769d8aeb772b3250d964c58fa43902bda2627fd 100644 (file)
--- a/tests/acstatus.at
+++ b/tests/acstatus.at
@@ -1,5 +1,5 @@
 # Generated by mktests.sh, do not edit by hand.        -*- Autotest -*-
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
 
 AT_BANNER([Testing autoconf/status macros.])
 

diff --git a/tests/actypes.at b/tests/actypes.at
index 4ce22af07679974ab67cf76d7e1a6c1b55da3c75..951541b6d2ded116ac2022affe4cda3519cc9c7a 100644 (file)
--- a/tests/actypes.at
+++ b/tests/actypes.at
@@ -1,5 +1,5 @@
 # Generated by mktests.sh, do not edit by hand.        -*- Autotest -*-
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
 
 AT_BANNER([Testing autoconf/types macros.])
 

diff --git a/tests/base.at b/tests/base.at
index 6967ee3790777bcbc961206fda20a5f97a25f324..2c8ea5ffb26fa8c8b372d2d05777d05032ebf0ed 100644 (file)
--- a/tests/base.at
+++ b/tests/base.at
@@ -2,7 +2,7 @@
 
 AT_BANNER([Autoconf base layer.])
 
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003 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

diff --git a/tests/compile.at b/tests/compile.at
index cf168c45350db113c0ce141499780f7d5450834d..797245bb6834d09ab55d799773f9e8e9d0c96db2 100644 (file)
--- a/tests/compile.at
+++ b/tests/compile.at
@@ -2,7 +2,7 @@
 
 AT_BANNER([Low level compiling/preprocessing macros.])
 
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003 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

diff --git a/tests/fortran.at b/tests/fortran.at
index 8178ebae9acb3b0326e2afb3b0635acdaa09c784..963acc62024624b9837130f66fc68f6338dc5ca2 100644 (file)
--- a/tests/fortran.at
+++ b/tests/fortran.at
@@ -2,7 +2,7 @@
 
 AT_BANNER([Fortran low level compiling/preprocessing macros.])
 
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003 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

diff --git a/tests/atspecific.m4 b/tests/local.at
similarity index 96%
rename from tests/atspecific.m4
rename to tests/local.at
index cc70c366417adfe07967b6e69a5d7c78ae293774..3336f6ea98c8496ebffe48484c0fc089a03ae872 100644 (file)
--- a/tests/atspecific.m4
+++ b/tests/local.at
@@ -17,6 +17,14 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
+# We need a very up to date version of Autotest.
+m4_version_prereq([2.53])
+
+# Used in many tests.
+m4_pattern_allow([^AS_EXIT$])
+m4_pattern_allow([^m4_(define|shift)$])
+
+AT_TESTED([autom4te autoconf autoheader autoupdate autoreconf ifnames])
 
 ## ------------------ ##
 ## Testing autom4te.  ##
@@ -352,3 +360,12 @@ AT_CHECK_ENV
 
 AT_CLEANUP()dnl
 ])# AT_CHECK_UPDATE
+
+
+
+## ----------------------- ##
+## Launch the test suite.  ##
+## ----------------------- ##
+
+AT_INIT
+

diff --git a/tests/m4sh.at b/tests/m4sh.at
index 7fbce65037729251fb2432a87fbfafcb0b32282f..fd578d0399fdd33e6588820b3a6fc89789f59b6d 100644 (file)
--- a/tests/m4sh.at
+++ b/tests/m4sh.at
@@ -2,7 +2,7 @@
 
 AT_BANNER([M4sh.])
 
-# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003 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
@@ -19,9 +19,6 @@ AT_BANNER([M4sh.])
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# Used in many tests.
-m4_pattern_allow([^AS_EXIT$])
-
 ## ---------------- ##
 ## LINENO support.  ##
 ## ---------------- ##

diff --git a/tests/mktests.sh b/tests/mktests.sh
index b0f551be1e78e8fab4c1b38ca780cabb95945e76..db09225eff74cb4e1d5a9082d9cb50c8a561d29a 100755 (executable)
--- a/tests/mktests.sh
+++ b/tests/mktests.sh
@@ -219,7 +219,7 @@ do
   {
     sed 's/^ *//' <<MK_EOF
     # Generated by $as_me, do not edit by hand.        -*- Autotest -*-
-    # Copyright 2000, 2001 Free Software Foundation, Inc.
+    # Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
 
     AT_BANNER([Testing autoconf/$base macros.])
 

diff --git a/tests/suite.at b/tests/suite.at
index 4a60201ffa7f48286529fe990d1369f1b8d9636d..e0ca44c339e1935f88d22f8cf1da71120c38f1ba 100644 (file)
--- a/tests/suite.at
+++ b/tests/suite.at
@@ -1,6 +1,6 @@
 # Validation suite for Autoconf                           -*- Autotest -*-
 
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003 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
@@ -17,21 +17,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# We need a very up to date version of Autotest.
-m4_version_prereq([2.53])
-
-# Macros specialized for Autoconf testing.
-m4_include([atspecific.m4])
-
-AT_TESTED([autom4te autoconf autoheader autoupdate autoreconf ifnames])
-
-# Still many parts of `autoconf' are not exercised by the test suite.  A few
-# FIXME's, below, are used to list tests that we would need.  Do you feel
-# like contributing new tests?  If you do, you may tell your intent to
-# `autoconf@gnu.org', so no two people work at the same thing.
-
-AT_INIT
-
 # Run the tests from the lowest level to the highest level, and from
 # the most selective to the easiest.
 

diff --git a/tests/tools.at b/tests/tools.at
index e851331c60fef0cb7bc302b7bbfde209cbf4666b..6516af1723de79c64f4bc4f7b659f3d8eb07db1e 100644 (file)
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -2,7 +2,7 @@
 
 AT_BANNER([Executables (autoheader, autoupdate...).])
 
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003 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
@@ -154,8 +154,6 @@ AT_CLEANUP
 # -----------------------------
 AT_SETUP([autoconf --trace: user macros])
 
-
-m4_pattern_allow([^m4_(define|shift)$])
 AT_DATA([configure.ac],
 [[m4_define([active], [ACTIVE])
 m4_define([TRACE1], [TRACE2(m4_shift($@))])