From 92fcf10f6c8b1dd5405f8e71e70d916fda1be81a Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sat, 1 Oct 2022 14:59:51 -0700
Subject: maintcheck: placate maintainer-check and grep 3.8.

* maintainer/syntax-checks.mk (sc_rm_minus_f): no \ before -
(diagnosed by grep 3.8).
* t/comment12.sh: use $(...) instead of `...`.
* t/comments-escaped-in-var.sh: use AUTOMAKE_fails and grep
for expected warning message.
* t/list-of-tests.mk (handwritten_TESTS): add t/py-compile-files.sh.
* t/subdir-add2-pr46.sh (.NOTPARALLEL): add; showed up with
parallelized internal make. Seems unreproducible.
---
 maintainer/syntax-checks.mk  | 2 +-
 t/comment12.sh               | 2 +-
 t/comments-escaped-in-var.sh | 7 +++++--
 t/list-of-tests.mk           | 1 +
 t/subdir-add2-pr46.sh        | 4 ++++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/maintainer/syntax-checks.mk b/maintainer/syntax-checks.mk
index e071451c8..7cd6d198a 100644
--- a/maintainer/syntax-checks.mk
+++ b/maintainer/syntax-checks.mk
@@ -150,7 +150,7 @@ sc_no_brace_variable_expansions:
 sc_rm_minus_f:
 	@if grep -v '^#' $(ams) $(xtests) \
 	   | grep -vE '/(rm-f-probe\.sh|spy-rm\.tap|subobj-clean.*-pr10697\.sh):' \
-	   | grep -E '\<rm ([^-]|\-[^f ]*\>)'; \
+	   | grep -E '\<rm ([^-]|-[^f ]*\>)'; \
 	then \
 	  echo "Suspicious 'rm' invocation." 1>&2; \
 	  exit 1; \
diff --git a/t/comment12.sh b/t/comment12.sh
index e98159e40..3653126f4 100644
--- a/t/comment12.sh
+++ b/t/comment12.sh
@@ -40,5 +40,5 @@ $AUTOMAKE
 # For debugging.
 grep '^VAR' Makefile.in
 
-count=`grep '^VAR. = val$' Makefile.in | wc -l`
+count=$(grep '^VAR. = val$' Makefile.in | wc -l)
 [ $count -eq 6 ]
diff --git a/t/comments-escaped-in-var.sh b/t/comments-escaped-in-var.sh
index e06c3f359..75c01a702 100644
--- a/t/comments-escaped-in-var.sh
+++ b/t/comments-escaped-in-var.sh
@@ -30,8 +30,11 @@ END
 
 $ACLOCAL
 
-# This should fail due to -Werror.
-$AUTOMAKE && exit 1
+# This should fail due to -Werror, as in:
+#   automake-1.16: warnings are treated as errors
+#   Makefile.am:2: warning: escaping \# comment markers is not portable
+AUTOMAKE_fails
+grep 'escaping.*comment markers.*portable' stderr
 
 # This should pass though.
 $AUTOMAKE -Wno-portability
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 0af117a5a..d82cf9c4d 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -921,6 +921,7 @@ t/py-compile-basic.sh \
 t/py-compile-basedir.sh \
 t/py-compile-destdir.sh \
 t/py-compile-env.sh \
+t/py-compile-files.sh \
 t/py-compile-option-terminate.sh \
 t/py-compile-usage.sh \
 t/python.sh \
diff --git a/t/subdir-add2-pr46.sh b/t/subdir-add2-pr46.sh
index 813868ac7..749aa186a 100644
--- a/t/subdir-add2-pr46.sh
+++ b/t/subdir-add2-pr46.sh
@@ -32,6 +32,10 @@ echo 'AC_CONFIG_FILES([sub/Makefile])' > confiles.m4
 
 cat > Makefile.am << 'END'
 SUBDIRS = sub
+
+# The test can fail under a parallel make, so disable.
+# No evident way to debug or reliably reproduce.
+.NOTPARALLEL:
 END
 
 mkdir sub
-- 
cgit v1.2.1