paircmp works with new conditions

diff --git a/src/tests/keywords/all.mk b/src/tests/keywords/all.mk
index b423519e7e6e6a82d388e87703b8ae058471b590..8f621ea99b8e455e0e12d4b20475b90016a8c655 100644 (file)
--- a/src/tests/keywords/all.mk
+++ b/src/tests/keywords/all.mk
@@ -77,10 +77,7 @@ KEYWORD_UPDATE_TMPL_TESTS    := xlat-dhcpv4
 #  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}, paircmp)" ""
-$(OUTPUT)/${1}: NEW_COND=-S use_new_conditions=no
-
-else ifneq "$(findstring ${1}, update-to-edit $(KEYWORD_UPDATE_TESTS) xlat-unknown )" ""
+ifneq "$(findstring ${1}, update-to-edit $(KEYWORD_UPDATE_TESTS) xlat-unknown )" ""
 $(OUTPUT)/${1}: NEW_COND=-S use_new_conditions=yes
 
 else ifneq "$(findstring ${1}, $(KEYWORD_UPDATE_REWRITE_TESTS))" ""

diff --git a/src/tests/keywords/paircmp b/src/tests/keywords/paircmp
index ab8e67ef737859ff6ede9f731b84b4b1da9aa0fb..3966524730ac464a2e786bc8df0b17d83723ad84 100644 (file)
--- a/src/tests/keywords/paircmp
+++ b/src/tests/keywords/paircmp
@@ -1,9 +1,7 @@
 #
-#  PRE: if update
+#  PRE: if
 #
-update request {
-       &NAS-IP-Address := 127.0.0.1
-}
+&NAS-IP-Address := 127.0.0.1
 
 #
 #  test raw values