remove migration use_new_conditions

diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
index d1809cbcb496f5085b9723d2a2e2023eac8cbf96..fc706f97284b92d5a3b259a94fb14578c43ae09e 100644 (file)
--- a/raddb/radiusd.conf.in
+++ b/raddb/radiusd.conf.in
@@ -637,12 +637,6 @@ migrate {
        #
        tmpl_tokenize_all_nested = false
 
-       #
-       #  use_new_conditions:: Use the new condition code based on
-       #  xlats, instead of the old condition code.
-       #
-#      use_new_conditions = false
-
        #
        #  pair_legacy_nested: make legacy APIs return nested attributes
        #

diff --git a/src/tests/keywords/all.mk b/src/tests/keywords/all.mk
index 8f621ea99b8e455e0e12d4b20475b90016a8c655..4ee5a441aff85a5b0c42f951d812af33e1fefa98 100644 (file)
--- a/src/tests/keywords/all.mk
+++ b/src/tests/keywords/all.mk
@@ -78,16 +78,16 @@ KEYWORD_UPDATE_TMPL_TESTS   := xlat-dhcpv4
 #  conditions, so we don't run them under the new conditions.
 #
 ifneq "$(findstring ${1}, update-to-edit $(KEYWORD_UPDATE_TESTS) xlat-unknown )" ""
-$(OUTPUT)/${1}: NEW_COND=-S use_new_conditions=yes
+$(OUTPUT)/${1}: NEW_COND=
 
 else ifneq "$(findstring ${1}, $(KEYWORD_UPDATE_REWRITE_TESTS))" ""
-$(OUTPUT)/${1}: NEW_COND=-S use_new_conditions=yes -S rewrite_update=yes -S tmpl_tokenize_all_nested=yes
+$(OUTPUT)/${1}: NEW_COND=-S rewrite_update=yes -S tmpl_tokenize_all_nested=yes
 
 else ifneq "$(findstring ${1}, $(KEYWORD_UPDATE_TMPL_TESTS))" ""
-$(OUTPUT)/${1}: NEW_COND=-S use_new_conditions=yes -S forbid_update=yes
+$(OUTPUT)/${1}: NEW_COND=-S forbid_update=yes
 
 else
-$(OUTPUT)/${1}: NEW_COND=-S use_new_conditions=yes -S forbid_update=yes -S tmpl_tokenize_all_nested=yes -S pair_legacy_nested=true
+$(OUTPUT)/${1}: NEW_COND=-S forbid_update=yes -S tmpl_tokenize_all_nested=yes -S pair_legacy_nested=true
 
 ifeq "${1}" "mschap"
 $(OUTPUT)/${1}: $(BUILD_DIR)/lib/rlm_mschap.la

diff --git a/src/tests/modules/all.mk b/src/tests/modules/all.mk
index deae7edcf6fb3450771407a931d8c24a2308d47a..71fe6177c89bfb2b1afbedbbb11831c4e7889eee 100644 (file)
--- a/src/tests/modules/all.mk
+++ b/src/tests/modules/all.mk
@@ -74,11 +74,6 @@ $(foreach x, $(FILES), $(eval $$(OUTPUT.$(TEST))/$x: $(patsubst %,$(BUILD_DIR)/l
 #
 $(foreach x, $(filter sql_%,$(FILES)), $(eval $$(OUTPUT.$(TEST))/$x: $(patsubst %,$(BUILD_DIR)/lib/rlm_sql.la,$(patsubst %/,%,$(firstword $(subst /, ,$(dir $x)))))))
 
-#
-#  Migration support.  Everything supports the new conditions.
-#
-$(foreach x, $(FILES),$(eval $$(OUTPUT.$(TEST))/$x: NEW_COND=-S use_new_conditions=yes))
-
 #
 #  Files in the output dir depend on the unit tests
 #
@@ -99,11 +94,11 @@ $(OUTPUT)/%: $(DIR)/%.unlang $(TEST_BIN_DIR)/unit_test_module | build.raddb
        @echo "MODULE-TEST $(TEST)"
        ${Q}mkdir -p $(dir $@)
        ${Q}cp $(if $(wildcard $(basename $<).attrs),$(basename $<).attrs,src/tests/modules/default-input.attrs) $@.attrs
-       ${Q}if ! MODULE_TEST_DIR=$(dir $<) MODULE_TEST_UNLANG=$< TEST="$(TEST)" $(TEST_BIN)/unit_test_module $(NEW_COND) -D share/dictionary -d src/tests/modules/ -i "$@.attrs" -f "$@.attrs" -r "$@" -xxx > "$@.log" 2>&1 || ! test -f "$@"; then \
+       ${Q}if ! MODULE_TEST_DIR=$(dir $<) MODULE_TEST_UNLANG=$< TEST="$(TEST)" $(TEST_BIN)/unit_test_module -D share/dictionary -d src/tests/modules/ -i "$@.attrs" -f "$@.attrs" -r "$@" -xxx > "$@.log" 2>&1 || ! test -f "$@"; then \
                if ! grep ERROR $< 2>&1 > /dev/null; then \
                        cat "$@.log"; \
                        echo "# $@.log"; \
-                       echo "MODULE_TEST_DIR=$(dir $<) MODULE_TEST_UNLANG=$< $(TEST_BIN)/unit_test_module $(NEW_COND) -D share/dictionary -d src/tests/modules/ -i \"$@.attrs\" -f \"$@.attrs\" -r \"$@\" -xx"; \
+                       echo "MODULE_TEST_DIR=$(dir $<) MODULE_TEST_UNLANG=$< $(TEST_BIN)/unit_test_module -D share/dictionary -d src/tests/modules/ -i \"$@.attrs\" -f \"$@.attrs\" -r \"$@\" -xx"; \
                        exit 1; \
                fi; \
                FOUND=$$(grep -E 'Error : $<' $@.log | head -1 | sed 's/.*\[//;s/\].*//'); \

diff --git a/src/tests/modules/unit_test_module.conf b/src/tests/modules/unit_test_module.conf
index 5c029d55fa119e51e5244aa2d3de5344d698ec0a..d266fa9e42a3971a278a16ef7b894ad3da6a3a43 100644 (file)
--- a/src/tests/modules/unit_test_module.conf
+++ b/src/tests/modules/unit_test_module.conf
@@ -16,7 +16,6 @@ security {
 #  @todo - set all of these flags!
 #
 #migrate {
-#      use_new_conditions = true
 #      tmpl_tokenize_all_nested = true
 #      pair_legacy_nested = true
 #      forbid_update = true

diff --git a/src/tests/process/all.mk b/src/tests/process/all.mk
index d96d682b29bd5f236fd689d6c56708eecc210c45..47505c10cf975310034059f45bb606bbfe8fc1af 100644 (file)
--- a/src/tests/process/all.mk
+++ b/src/tests/process/all.mk
@@ -29,8 +29,6 @@ FILES := $(filter-out %.ignore %.conf %.md %.attrs %.mk %~ %.rej,$(subst $(DIR)/
 
 $(eval $(call TEST_BOOTSTRAP))
 
-# -S use_new_conditions=yes -S forbid_update=yes
-
 #
 #  The dictionaries are in "share", because the server tries to load
 #  local dictionaries from "./dictionary".
@@ -91,7 +89,7 @@ $(foreach x,$(FILES),$(eval $(call PROCESS_TEST,$x)))
 #
 PROCESS_ARGS := -p test
 PROCESS_ARGS += -D $(DIR)/share -d $(DIR)/
-PROCESS_ARGS += -S use_new_conditions=yes -S forbid_update=yes
+PROCESS_ARGS += -S forbid_update=yes
 PROCESS_ARGS += -i $(DIR)/test.attrs -f $(DIR)/test.attrs
 
 $(OUTPUT)/%: $(DIR)/% $(PROCESS_DICT) $(TEST_BIN_DIR)/unit_test_module $(DIR)/unit_test_module.conf