From: Alan T. DeKok <aland@freeradius.org>
Date: Sun, 21 Aug 2022 15:39:48 +0000 (-0400)
Subject: temporarily use the old condition code
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56ba7df6534d82fa918fe4cd2a19553b6b41bcb5;p=thirdparty%2Ffreeradius-server.git

temporarily use the old condition code

because the new one (as yet) does not purify complex conditions.

We could call xlat_purify() from compile.c, or just manually
check the || and && when parsing in xlat_expr.c
---

diff --git a/src/tests/keywords/all.mk b/src/tests/keywords/all.mk
index 9174df5a7a0..d5d9391fab6 100644
--- a/src/tests/keywords/all.mk
+++ b/src/tests/keywords/all.mk
@@ -41,7 +41,7 @@ test.keywords.${1}: $(addprefix $(OUTPUT)/,${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 xlat-string xlat-subst)" ""
+ifeq "$(findstring ${1}, paircmp xlat-string xlat-subst if-failed-xlat if-regex-match-comp if-regex-match-named)" ""
 $(OUTPUT)/${1}: NEW_COND=-S parse_new_conditions=yes -S use_new_conditions=yes
 endif