[automake-commit] branch master updated: Use complete configure.ac’s in testsuite.

[Zack Weinberg]

This is an automated email from the git hooks/post-receive script.

zackw pushed a commit to branch master
in repository automake.

View the commit online:
https://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=9f83372ba3406587100b043f6d6f266eaaeada4f

The following commit(s) were added to refs/heads/master by this push:
     new 9f83372  Use complete configure.ac’s in testsuite.
9f83372 is described below

commit 9f83372ba3406587100b043f6d6f266eaaeada4f
Author: Zack Weinberg <zackw@panix.com>
AuthorDate: Wed Oct 7 09:19:06 2020 -0400

    Use complete configure.ac’s in testsuite.
    
    Autoconf 2.70 will issue warnings if it encounters a configure.ac that 
doesn’t
    call both AC_INIT and AC_OUTPUT.
    
    Automake already issues warnings if it encounters a configure.ac that uses 
an
    AM_ macro but doesn’t call AM_INIT_AUTOMAKE or AC_CONFIG_FILES([Makefile]).
    
    In two places, the testsuite was tripping these warnings, leading to 
spurious
    failures with Autoconf 2.70 betas.
    
    * t/aminit-moreargs-deprecation.sh: Add AC_OUTPUT to test configure.ac.
    * t/mkdirp-deprecation.sh: Use a complete test configure.ac, not a stub
      containing only a use of AM_PROG_MKDIR_P.
---
 t/aminit-moreargs-deprecation.sh |  1 +
 t/mkdirp-deprecation.sh          | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/t/aminit-moreargs-deprecation.sh b/t/aminit-moreargs-deprecation.sh
index c3d49d5..ec9efe0 100644
--- a/t/aminit-moreargs-deprecation.sh
+++ b/t/aminit-moreargs-deprecation.sh
@@ -25,6 +25,7 @@ cat > configure.ac <<'END'
 AC_INIT([Makefile.am])
 AM_INIT_AUTOMAKE([twoargs], [1.0])
 AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
 END
 
 $ACLOCAL
diff --git a/t/mkdirp-deprecation.sh b/t/mkdirp-deprecation.sh
index 337ae30..a356bf1 100644
--- a/t/mkdirp-deprecation.sh
+++ b/t/mkdirp-deprecation.sh
@@ -19,12 +19,19 @@
 
 . test-init.sh
 
-echo AM_PROG_MKDIR_P >> configure.ac
+cat > configure.ac <<'END'
+AC_INIT([test], [1.0])
+AM_INIT_AUTOMAKE
+AM_PROG_MKDIR_P
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
 : > Makefile.am
 
 grep_err ()
 {
-  loc='^configure.ac:4:'
+  loc='^configure.ac:3:'
   grep "$loc.*AM_PROG_MKDIR_P.*deprecated" stderr
   grep "$loc.* use .*AC_PROG_MKDIR_P" stderr
   grep "$loc.* use '\$(MKDIR_P)' instead of '\$(mkdir_p)'.*Makefile" stderr