diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-12-18 14:41:55 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-12-18 14:41:55 -0600 |
| commit | bac31e55bb85ace72cf27155e84e569f6d7f6ada (patch) | |
| tree | 08ce0b22b12fd558f535c1dd4ab604ba7b5563b7 /tests/test_config.c | |
| parent | a853b3bcffb3eaa771cf6f52e6e2e8893a2c657e (diff) | |
| parent | 957709e1e824e221254599e4ad8445e3839ce535 (diff) | |
Merge changes from topic 'faster-aco' into 15
* changes:
aco: Minimize use of regex.
aco: Create ways to minimize use of regex.
Diffstat (limited to 'tests/test_config.c')
| -rw-r--r-- | tests/test_config.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/tests/test_config.c b/tests/test_config.c index d74726a1a..de85f23b0 100644 --- a/tests/test_config.c +++ b/tests/test_config.c @@ -1456,13 +1456,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), |