expr: Add additional invariant check in test.

[ovs.git] / tests / test-odp.c

diff --git a/tests/test-odp.c b/tests/test-odp.c
index 31699a590ae107d7f1fca822a3f2d4104f63ea3e..1f1ff9ad630f7d00652a9f2517b206bc190b6666 100644 (file)
--- a/tests/test-odp.c
+++ b/tests/test-odp.c
@@ -62,6 +62,7 @@ parse_keys(bool wc_keys)
                     .ct_zone = true,
                     .ct_mark = true,
                     .ct_label = true,
+                    .max_vlan_headers = SIZE_MAX,
                 },
             };
 
@@ -137,7 +138,7 @@ parse_actions(void)
 
         /* Convert odp_actions back to string. */
         ds_init(&out);
-        format_odp_actions(&out, odp_actions.data, odp_actions.size);
+        format_odp_actions(&out, odp_actions.data, odp_actions.size, NULL);
         puts(ds_cstr(&out));
         ds_destroy(&out);
 
@@ -177,14 +178,11 @@ parse_filter(char *filter_parse)
         struct ofpbuf odp_key;
         struct ofpbuf odp_mask;
         struct ds out;
-        int error;
 
         /* Convert string to OVS DP key. */
         ofpbuf_init(&odp_key, 0);
         ofpbuf_init(&odp_mask, 0);
-        error = odp_flow_from_string(ds_cstr(&in), NULL,
-                                     &odp_key, &odp_mask);
-        if (error) {
+        if (odp_flow_from_string(ds_cstr(&in), NULL, &odp_key, &odp_mask)) {
             printf("odp_flow_from_string: error\n");
             goto next;
         }