From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 6 Jul 2017 14:57:15 +0000 (-0400)
Subject: Prevent eapol_test from running repeatedly (again)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97a22d023f33cc5b431fd5d35780172471ded45c;p=thirdparty%2Ffreeradius-server.git

Prevent eapol_test from running repeatedly (again)

This was broken during the conversion to boilermake
---

diff --git a/src/tests/eapol_test/all.mk b/src/tests/eapol_test/all.mk
index 2d399f0c0ef..ca8a6b5450f 100644
--- a/src/tests/eapol_test/all.mk
+++ b/src/tests/eapol_test/all.mk
@@ -167,8 +167,18 @@ $(OUTPUT_DIR)/%.ok: $(DIR)/%.conf | radiusd.kill $(CONFIG_PATH)/radiusd.pid
 tests.eap: $(EAPOL_OK_FILES)
 	${Q}$(MAKE) radiusd.kill
 else
+#
+#  Build rules and the make file get evaluated at different times
+#  if we don't touch the test skipped file immediately, users can
+#  cntrl-c out of the build process, and the skip file never gets
+#  created as the tests.eap target is evaluated much later in the
+#  build process.2
+#
+ifneq (,$(findstring test,$(MAKECMDGOALS)))
+$(shell touch "$(OUTPUT_DIR)/eapol_test.skip")
+endif
+
 tests.eap: $(OUTPUT_DIR)
 	${Q}echo "Skipping EAP tests due to previous build error"
 	${Q}echo "Retry with: $(MAKE) clean.$@ && $(MAKE) $@"
-	${Q}touch "$(OUTPUT_DIR)/eapol_test.skip"
 endif