summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorCorey Farrell <git@cfware.com>2017-12-12 13:55:12 -0500
committerCorey Farrell <git@cfware.com>2017-12-15 10:20:51 -0500
commit501f4dcdd8790283e1db809e23133dbeb3a1f27c (patch)
tree32837e36ec0a183f2045b4877c3a8ad817aece01 /tests
parent7413bcbeb5fc0eaa22de91e8d69714b725567efa (diff)
aco: Minimize use of regex.
Remove nearly all use of regex from ACO users. Still remaining: * app_confbridge has a legitamate use of option name regex. * ast_sorcery_object_fields_register is implemented with regex, all callers use simple prefix based regex. I haven't decided the best way to fix this in both 13/15 and master. Change-Id: Ib5ed478218d8a661ace4d2eaaea98b59a897974b
Diffstat (limited to 'tests')
-rw-r--r--tests/test_config.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/tests/test_config.c b/tests/test_config.c
index c58bdc70d..a2ff328ff 100644
--- a/tests/test_config.c
+++ b/tests/test_config.c
@@ -1458,13 +1458,19 @@ static struct aco_type global = {
static struct aco_type global_defaults = {
.type = ACO_GLOBAL,
.item_offset = offsetof(struct test_config, global_defaults),
- .category_match = ACO_WHITELIST,
- .category = "^global_defaults$",
+ .category_match = ACO_WHITELIST_EXACT,
+ .category = "global_defaults",
+};
+static const char *item_blacklist[] = {
+ "global",
+ "global_defaults",
+ NULL,
};
+
static struct aco_type item = {
.type = ACO_ITEM,
- .category_match = ACO_BLACKLIST,
- .category = "^(global|global_defaults)$",
+ .category_match = ACO_BLACKLIST_ARRAY,
+ .category = (const char *)item_blacklist,
.item_alloc = test_item_alloc,
.item_find = test_item_find,
.item_offset = offsetof(struct test_config, items),