From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 26 Oct 2022 16:28:26 +0000 (-0400)
Subject: manually enable / disable new conditions for tests
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77524190c43a1d6844ca396c0c082276fdfe3442;p=thirdparty%2Ffreeradius-server.git

manually enable / disable new conditions for tests
---

diff --git a/src/tests/keywords/all.mk b/src/tests/keywords/all.mk
index 416da560347..2847cb4f0c6 100644
--- a/src/tests/keywords/all.mk
+++ b/src/tests/keywords/all.mk
@@ -43,10 +43,10 @@ test.keywords.help: TEST_KEYWORDS_HELP += test.keywords.${1}
 #  Migration support.  Some of the tests don't run under the new
 #  conditions, so we don't run them under the new conditions.
 #
-ifeq "$(findstring ${1}, paircmp)" ""
-$(OUTPUT)/${1}: NEW_COND=-S parse_new_conditions=yes -S use_new_conditions=yes
-else
+ifneq "$(findstring ${1}, paircmp)" ""
 $(OUTPUT)/${1}: NEW_COND=-S parse_new_conditions=no -S use_new_conditions=no
+else
+$(OUTPUT)/${1}: NEW_COND=-S parse_new_conditions=yes -S use_new_conditions=yes
 endif
 
 endef
diff --git a/src/tests/modules/all.mk b/src/tests/modules/all.mk
index 5f5e7cf0c9e..e58f7481c06 100644
--- a/src/tests/modules/all.mk
+++ b/src/tests/modules/all.mk
@@ -79,8 +79,8 @@ $(foreach x, $(filter sql_%,$(FILES)), $(eval $$(OUTPUT.$(TEST))/$x: $(patsubst
 #  Migration support.  Some of the tests don't run under the new
 #  conditions, so we don't run them under the new conditions.
 #
-$(foreach x, $(filter ldap%,$(FILES)), $(eval $$(OUTPUT.$(TEST))/$x: NEW_COND=-S parse_new_conditions=no -S use_new_conditions=no))
-$(foreach x, $(filter sql_%,$(FILES)), $(eval $$(OUTPUT.$(TEST))/$x: NEW_COND=-S parse_new_conditions=no -S use_new_conditions=no))
+$(foreach x, $(filter ldap% sql_%,$(FILES)), $(eval $$(OUTPUT.$(TEST))/$x: NEW_COND=-S parse_new_conditions=no -S use_new_conditions=no))
+$(foreach x, $(filter-out ldap% sql_%,$(FILES)), $(eval $$(OUTPUT.$(TEST))/$x: NEW_COND=-S parse_new_conditions=yes -S use_new_conditions=yes))
 
 #
 #  Files in the output dir depend on the unit tests