From: Akim Demaille Date: Mon, 23 Jun 2003 11:11:41 +0000 (+0000) Subject: * tests/mktests.sh (au_exclude_egrep): Fix output copyright notice. X-Git-Tag: AUTOCONF-2.57b~48 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fbbb4bafe5c61fe0091c66610cf825be5705880;p=thirdparty%2Fautoconf.git * 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 23a54a47..0889cf06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2003-06-23 Akim Demaille + + * 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 * lib/autoconf/c.m4 (_AC_PROG_CC_STDC): Extend test program to get an diff --git a/NEWS b/NEWS index 8ee51edf..30f601da 100644 --- 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 16a02602..ed619241 100644 --- 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 79e704be..cb7c0afd 100644 --- 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 c27d5782..0a94c5a4 100644 --- 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 15571904..38b1d2a9 100644 --- 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 e8dbcab3..0e82c6c7 100644 --- 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 2d2e4626..c02b2cf6 100644 --- 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 e70f6aa5..7aa818e4 100644 --- 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 c0b72489..905a4c6d 100644 --- 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 4c39e7ca..f2e236a4 100644 --- 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 0ba2665b..4ebbbcca 100644 --- 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 df8c1e93..cbd8d949 100644 --- 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 8e914e7f..86aa1b5b 100644 --- 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 cc868346..7769d8ae 100644 --- 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 4ce22af0..951541b6 100644 --- 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 6967ee37..2c8ea5ff 100644 --- 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 cf168c45..797245bb 100644 --- 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 8178ebae..963acc62 100644 --- 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 cc70c366..3336f6ea 100644 --- 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 7fbce650..fd578d03 100644 --- 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 b0f551be..db09225e 100755 --- a/tests/mktests.sh +++ b/tests/mktests.sh @@ -219,7 +219,7 @@ do { sed 's/^ *//' <