if-paircmp uses the old-style conditions

diff --git a/src/tests/keywords/all.mk b/src/tests/keywords/all.mk
index 0f8b296067fb3fe2b2b876e7e7dd10fa695128b4..2c3b9dbeeefe7bdb93cc6adcd77b1040e966d130 100644 (file)
--- a/src/tests/keywords/all.mk
+++ b/src/tests/keywords/all.mk
@@ -58,7 +58,7 @@ KEYWORD_UPDATE_REWRITE_TESTS := update-all update-array update-delete update-rem
 #  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)" ""
+ifneq "$(findstring ${1}, paircmp if-paircmp)" ""
 $(OUTPUT)/${1}: NEW_COND=-S parse_new_conditions=no -S use_new_conditions=no
 else ifneq "$(findstring ${1}, comments update-to-edit if-regex-multivalue smash wimax unknown $(KEYWORD_UPDATE_TESTS) vendor_specific vendor_specific.raw xlat-unknown)" ""
 $(OUTPUT)/${1}: NEW_COND=-S parse_new_conditions=yes -S use_new_conditions=yes

diff --git a/src/tests/keywords/if-paircmp b/src/tests/keywords/if-paircmp
index 6f8d7668d5a23cd818989c25939ff618dd26e376..1a1ede5b405013cb871eeb63222382141d1bc464 100644 (file)
--- a/src/tests/keywords/if-paircmp
+++ b/src/tests/keywords/if-paircmp
@@ -10,7 +10,7 @@
 #  Passing 'yes' causes the test paircmp to return match
 #  Passing 'no' causes the test paircmp to return a non-match
 #
-if (&Test-Paircmp != 'yes') {
+if (!(&Test-Paircmp == 'yes')) {
        test_fail
 }