Fix `EXPECT !name WITH-VALUE ...` tests.

diff --git a/CHANGES.md b/CHANGES.md
index 397dca5bc02796962b162c5e53e53a7e02e49f31..92775846a70736d68c4bbcb3ded736c6d4eb43bc 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,11 @@
-CHANGES - 2.3rc1 - 2019-05-21
-=============================
+CHANGES - 2.3.0 - 2019-05-23
+============================
+
+
+Changes in CUPS v2.3.0
+----------------------
+
+- Fixed an issue with `EXPECT !name WITH-VALUE ...` tests.
 
 
 Changes in CUPS v2.3rc1

diff --git a/tools/ipptool.c b/tools/ipptool.c
index aca6d24cb79a1d45c3da949ab044eb5a1077a813..e54b78ad38a257e4db6a1147798a56dbb3f9a26e 100644 (file)
--- a/tools/ipptool.c
+++ b/tools/ipptool.c
@@ -1448,7 +1448,7 @@ do_test(_ipp_file_t      *f,              /* I - IPP data file */
              _ippVarsSet(vars, expect->define_no_match, "1");
            else if (!expect->define_match && !expect->define_value)
            {
-             if (found && expect->not_expect)
+             if (found && expect->not_expect && !expect->with_value && !expect->with_value_from)
                add_stringf(data->errors, "NOT EXPECTED: %s", expect->name);
              else if (!found && !(expect->not_expect || expect->optional))
                add_stringf(data->errors, "EXPECTED: %s", expect->name);