diff options
Diffstat (limited to 'tests/test-classifier.c')
| -rw-r--r-- | tests/test-classifier.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/tests/test-classifier.c b/tests/test-classifier.c index ee7e76cbd..7555feba9 100644 --- a/tests/test-classifier.c +++ b/tests/test-classifier.c @@ -609,6 +609,10 @@ shuffle_u32s(uint32_t *p, size_t n) /* Classifier tests. */ +static enum mf_field_id trie_fields[2] = { + MFF_IPV4_DST, MFF_IPV4_SRC +}; + /* Tests an empty classifier. */ static void test_empty(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) @@ -617,7 +621,8 @@ test_empty(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) struct tcls tcls; classifier_init(&cls, flow_segment_u32s); - ovs_rwlock_rdlock(&cls.rwlock); + ovs_rwlock_wrlock(&cls.rwlock); + classifier_set_prefix_fields(&cls, trie_fields, ARRAY_SIZE(trie_fields)); tcls_init(&tcls); assert(classifier_is_empty(&cls)); assert(tcls_is_empty(&tcls)); @@ -650,6 +655,8 @@ test_single_rule(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) classifier_init(&cls, flow_segment_u32s); ovs_rwlock_wrlock(&cls.rwlock); + classifier_set_prefix_fields(&cls, trie_fields, + ARRAY_SIZE(trie_fields)); tcls_init(&tcls); tcls_rule = tcls_insert(&tcls, rule); @@ -689,6 +696,8 @@ test_rule_replacement(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) classifier_init(&cls, flow_segment_u32s); ovs_rwlock_wrlock(&cls.rwlock); + classifier_set_prefix_fields(&cls, trie_fields, + ARRAY_SIZE(trie_fields)); tcls_init(&tcls); tcls_insert(&tcls, rule1); classifier_insert(&cls, &rule1->cls_rule); @@ -801,6 +810,8 @@ test_many_rules_in_one_list (int argc OVS_UNUSED, char *argv[] OVS_UNUSED) classifier_init(&cls, flow_segment_u32s); ovs_rwlock_wrlock(&cls.rwlock); + classifier_set_prefix_fields(&cls, trie_fields, + ARRAY_SIZE(trie_fields)); tcls_init(&tcls); for (i = 0; i < ARRAY_SIZE(ops); i++) { @@ -903,6 +914,8 @@ test_many_rules_in_one_table(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) classifier_init(&cls, flow_segment_u32s); ovs_rwlock_wrlock(&cls.rwlock); + classifier_set_prefix_fields(&cls, trie_fields, + ARRAY_SIZE(trie_fields)); tcls_init(&tcls); for (i = 0; i < N_RULES; i++) { @@ -965,6 +978,8 @@ test_many_rules_in_n_tables(int n_tables) classifier_init(&cls, flow_segment_u32s); ovs_rwlock_wrlock(&cls.rwlock); + classifier_set_prefix_fields(&cls, trie_fields, + ARRAY_SIZE(trie_fields)); tcls_init(&tcls); for (i = 0; i < MAX_RULES; i++) { |