Maintenance: Detect mismatching .instructions files (#1661)

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index 3f4bc4cd2afaa3bbee77918014302a15343906dd..3ca55d18c3d18f0ae07c07030343fd1cb147a4ae 100644 (file)
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -135,7 +135,18 @@ VirtualDeleteOperator_SOURCES = \
 installcheck-local: squid-conf-tests
 
 squid-conf-tests: $(srcdir)/test-squid-conf.sh $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/*
-       @failed=0; cfglist="$(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/*.conf"; rm -f $@ || $(TRUE); \
+       @instructionFiles="$(srcdir)/squidconf/*.conf.instructions"; \
+       for instructionFile in $$instructionFiles; do \
+               cfgBasename=`basename $$instructionFile .instructions`; \
+               cfg=$(srcdir)/squidconf/$$cfgBasename; \
+               if ! test -f $$cfg; then \
+                       echo "FAIL: $$instructionFile has no matching $$cfg"; \
+                       exit 1; \
+               fi; \
+       done; \
+       failed=0; \
+       cfglist="$(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/*.conf"; \
+       rm -f $@ || $(TRUE); \
        for cfg in $$cfglist ; do \
                $(srcdir)/test-squid-conf.sh $(top_builddir) $(sbindir) $$cfg || \
                        { echo "FAIL: squid.conf test: $$cfg" | \