From 92cc0ba4d640a496300ea1cbad42d32b451ec834 Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Mon, 23 Oct 2023 16:48:28 -0400 Subject: [PATCH] more notes on what we don't want to convert --- src/tests/keywords/all.mk | 12 +++++++----- src/tests/keywords/update-group | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/tests/keywords/all.mk b/src/tests/keywords/all.mk index 74cafdb8473d..8bb48ca59c34 100644 --- a/src/tests/keywords/all.mk +++ b/src/tests/keywords/all.mk @@ -54,23 +54,25 @@ endif @cp $$< $$@ # -# All of the "update" tests which should also be run with "-S rewrite_update=yes" +# Tests which don't work in the update -> edit conversion # +# update-to-edit Conversion doesn't parse &request.[*]. # update-remove-index Remove by index _and_ value. Not implemented in edit code -# update-group-* subsections are not implemented in compile_update_to_edit() +# update-error-* the errors are different, and we don't really care. +# vendor-specific-error tries to parse RHS string as pair list. Which is OK in the new code # # Tests for the "update" keyword -#KEYWORD_UPDATE_TESTS := update-remove-index +KEYWORD_UPDATE_TESTS := update-remove-index update-to-edit vendor-specific-error # Tests for rewriting "update" -KEYWORD_UPDATE_REWRITE_TESTS := update-all update-array update-delete update-remove-any update-group update-hex update-remove-value update-index update-list-error update-remove-list update-prepend unknown-update update-error update-error-2 update-exec-error update-list-null-rhs update-exec update-error-3 update-group-error update-null-value-assign vendor-specific-error update-filter +KEYWORD_UPDATE_REWRITE_TESTS := update-all update-array update-delete update-remove-any update-group update-hex update-remove-value update-index update-list-error update-remove-list update-prepend unknown-update update-error update-error-2 update-exec-error update-list-null-rhs update-exec update-error-3 update-group-error update-null-value-assign update-filter xlat-unknown # # Migration support. Some of the tests don't run under the new # conditions, so we don't run them under the new conditions. # -ifneq "$(findstring ${1}, update-to-edit $(KEYWORD_UPDATE_TESTS) xlat-unknown )" "" +ifneq "$(findstring ${1}, $(KEYWORD_UPDATE_TESTS) )" "" $(OUTPUT)/${1}: NEW_COND= else ifneq "$(findstring ${1}, $(KEYWORD_UPDATE_REWRITE_TESTS))" "" diff --git a/src/tests/keywords/update-group b/src/tests/keywords/update-group index 11923202d757..4299cf70c1fe 100644 --- a/src/tests/keywords/update-group +++ b/src/tests/keywords/update-group @@ -5,6 +5,8 @@ update reply { # # Update the contents of a group # + # This was parsed in the old edit code, but never did anything! + # &Tmp-Group-0 := { # ERROR Tmp-String-0 = "foo" }