From: Jorge Pereira <jpereiran@gmail.com>
Date: Tue, 21 Mar 2023 22:05:12 +0000 (-0300)
Subject: Fix conflict test radiusd instances
X-Git-Tag: release_3_2_3~125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22d33d294980ea7a01dfb9f65563ff19aa38f32f;p=thirdparty%2Ffreeradius-server.git

Fix conflict test radiusd instances

Let's do it separately avoiding to conflict with the task 'radiusd.pid' vs
the other instance called by the same by 'tests.eap'
---

diff --git a/src/tests/Makefile b/src/tests/Makefile
index fe836c6bed..bc15dc8719 100644
--- a/src/tests/Makefile
+++ b/src/tests/Makefile
@@ -300,8 +300,9 @@ endif # there's no "prefix", so we don't run the full EAP tests
 EAPOL_OK_FILES := $(sort $(addprefix $(BUILD_PATH)/tests/eap/,$(patsubst %.conf,%.ok, $(notdir $(EAP_TLS_FILES) $(EAP_FILES)))) $(EAP_TLS_VERSION_FILES))
 
 tests.eap: $(EAPOL_OK_FILES) | radiusd.kill radiusd.pid
-	@$(MAKE) radiusd.kill
-
+else
+tests.eap:
+	@echo "EAPOL Tests is disabled"
 endif # we have eapol_test built
 
 # kill the server (if it's running)
@@ -309,9 +310,8 @@ endif # we have eapol_test built
 # run the tests (ignoring any failures)
 # kill the server
 # remove the changes to raddb/
-tests: test.conf | radiusd.kill radiusd.pid
+tests.runtests:  test.conf | radiusd.kill radiusd.pid
 	@chmod a+x runtests.sh
 	@BIN_PATH="$(BIN_PATH)" PORT="$(PORT)" ./runtests.sh $(TESTS)
-ifneq "$(EAPOL_TEST)" ""
-	@$(MAKE) tests.eap
-endif
+
+tests: tests.runtests tests.eap