From: Karl Berry <karl@freefriends.org>
Date: Fri, 31 May 2024 15:55:10 +0000 (-0700)
Subject: maint: prepare for next pretest.
X-Git-Tag: v1.16.90~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=788615aa74e5b113f304b4d51b193b637deb9f87;p=thirdparty%2Fautomake.git

maint: prepare for next pretest.

* HACKING: typo, tweak release info.
* maintainer/maint.mk: typo.
* maintainer/syntax-checks.mk: typo, and exclude test-defs.sh
(actually .in) from the `...` test because I can't figure out how
to get the same results with $(...).
---

diff --git a/HACKING b/HACKING
index c0b7702e9..8ec3fb0dd 100644
--- a/HACKING
+++ b/HACKING
@@ -398,7 +398,7 @@
   Probably useful to run it more verbosely:
     make AM_V_GEN= AM_V_at= VERBOSE=1 maintainer-check
 
-* After "make -j12 check" succeeds. run "make -j12 distcheck" before
+* After "make -j12 check" succeeds. Run "make -j12 distcheck" before
   pushing a commit, since that exercises yet more of the code.
 
 * To un-silence (some) of what make does, use make V=1.
@@ -526,10 +526,10 @@
     make bootstrap
     make -j12 check keep_testdirs=yes
     make maintainer-check
-    make -j12 distcheck                                # regular distcheck
-    make -j12 distcheck AM_TESTSUITE_MAKE="make -j12"  # parallelize makes
     make -j12 check-no-trailing-backslash-in-recipes
     make -j12 check-cc-no-c-o
+    make -j12 distcheck                                # regular distcheck
+    make -j12 distcheck AM_TESTSUITE_MAKE="make -j12"  # parallelize makes
 
   It is also advised to run "git clean -fdx" before invoking the
   bootstrap, to ensure a really clean rebuild.  However, it must
diff --git a/maintainer/maint.mk b/maintainer/maint.mk
index e7e695b63..a995de58e 100644
--- a/maintainer/maint.mk
+++ b/maintainer/maint.mk
@@ -621,7 +621,7 @@ ALL_PACKAGES = \
 
 pkg-targets = check dist
 
-# Note: "ttp" stays for "Third Party Package".
+# Note: "ttp" stands for "Third Party Package".
 
 ttp-check ttp-check-all: do-clone = $(GIT) clone --verbose
 ttp-check: ttp-packages = $(FEW_PACKAGES)
diff --git a/maintainer/syntax-checks.mk b/maintainer/syntax-checks.mk
index 337b6a3ec..97b60e8da 100644
--- a/maintainer/syntax-checks.mk
+++ b/maintainer/syntax-checks.mk
@@ -328,6 +328,10 @@ sc_tests_here_document_format:
 # Makefile.am rules, configure.ac code and helper shell script created and
 # used by out shell scripts, because Autoconf (as of version 2.69) does not
 # yet ensure that $CONFIG_SHELL will be set to a proper POSIX shell.
+# We exclude failure_footer_text_colorized in test-defs.in from the
+# check because the result differs with $(...) and I (Karl) don't know why;
+# the testsuite-summary-color.sh and tap-summary-color tests fail when
+# $(...) is used. Life is too short.
 sc_tests_command_subst:
 	@found=false; \
 	scan () { \
@@ -335,6 +339,7 @@ sc_tests_command_subst:
 	         -e '/<<.*END/,/^END/b' -e '/<<.*EOF/,/^EOF/b' \
 	         -e 's/\\`/\\{backtick}/' \
 	         -e "s/[^\\]'\([^']*\`[^']*\)*'/'{quoted-text}'/g" \
+	         -e /failure_footer_text_colorized=/d \
 	         -e '/`/p' $$*; \
 	}; \
 	for file in $(xtests); do \