From 796a2aa51cd2f78a3e122cba62749b9751dafd3a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 12 Mar 2020 18:01:56 -0700 Subject: maint: do not descend into unreadable test directories. * maintainer/syntax-checks.mk (sc_tests_makefile_variable_order): find t ! -perm o+r -prune, since some test directories are intentionally unreadable. --- maintainer/syntax-checks.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'maintainer') diff --git a/maintainer/syntax-checks.mk b/maintainer/syntax-checks.mk index 3b32950e4..a28158dc3 100644 --- a/maintainer/syntax-checks.mk +++ b/maintainer/syntax-checks.mk @@ -36,9 +36,10 @@ xdefs = \ $(srcdir)/t/ax/test-lib.sh \ $(srcdir)/t/ax/test-defs.in +# Must prune test dirs since some are intentionally unreadable. ams := $(shell find $(srcdir) -name '*.dir' -prune -o -name '*.am' -print) -# Some simple checks, and then ordinary check. These are only really +# Some simple checks, and then ordinary checks. These are only really # guaranteed to work on my machine. syntax_check_rules = \ $(sc_tests_plain_check_rules) \ @@ -105,7 +106,7 @@ sc_sanity_gnu_grep: $(syntax_check_rules): sc_sanity_gnu_grep # Check that every subroutine in perl scripts has a corresponding -# prototype +# prototype. sc_perl_protos: $(AM_V_GEN)$(srcdir)/maintainer/check-perl-protos \ <$(srcdir)/bin/aclocal.in && \ @@ -489,9 +490,11 @@ sc_tests_logs_duplicate_prefixes: sc_ensure_testsuite_has_run fi # Ensure variables are listed before rules in Makefile.in files we generate. +# (Do not descend into test dirs that are unreadable.) sc_tests_makefile_variable_order: sc_ensure_testsuite_has_run @st=0; \ - for file in `find t -name Makefile.in -print`; do \ + for file in `find t ! -perm -o+r -prune -o -name Makefile.in -print`; \ + do \ latevars=`sed -n \ -e :x -e 's/#.*//' \ -e '/\\\\$$/{' -e N -e 'b x' -e '}' \ -- cgit v1.2.1