From: Eduard Bagdasaryan <eduard.bagdasaryan@measurement-factory.com>
Date: Sun, 4 Feb 2024 03:20:04 +0000 (+0000)
Subject: Maintenance: Detect mismatching .instructions files (#1661)
X-Git-Tag: SQUID_7_0_1~218
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=222c8c0135102f83c3862c7cd26ab724e3a46f2c;p=thirdparty%2Fsquid.git

Maintenance: Detect mismatching .instructions files (#1661)
---

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index 3f4bc4cd2a..3ca55d18c3 100644
--- 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" | \