diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-06-20 15:55:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-06-25 12:51:25 -0400 |
| commit | c553750e32d1bf669a3e8308fa44319954a627ca (patch) | |
| tree | f6e7ef8bb77e5be7022ddfbb8f348f97ea437fc4 /src/test/test_confparse.c | |
| parent | 4d101b39d74fb467d7fb4ad8ddb27e07c3074a69 (diff) | |
| download | tor-c553750e32d1bf669a3e8308fa44319954a627ca.tar.gz tor-c553750e32d1bf669a3e8308fa44319954a627ca.zip | |
Move responsibility for config var macros
The testing-only parts now live in a conftesting.h; the shared parts
of the macros live in confmacros.h
Diffstat (limited to 'src/test/test_confparse.c')
| -rw-r--r-- | src/test/test_confparse.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/test/test_confparse.c b/src/test/test_confparse.c index d0c33841fe..2f408b5b6e 100644 --- a/src/test/test_confparse.c +++ b/src/test/test_confparse.c @@ -49,13 +49,9 @@ typedef struct test_struct_t { static test_struct_t test_struct_t_dummy; #define VAR(varname,conftype,member,initvalue) \ - { { .name = varname, \ - .type = CONFIG_TYPE_##conftype, \ - .offset = offsetof(test_struct_t, member), }, \ - initvalue CONF_TEST_MEMBERS(test_struct_t, conftype, member) } - -#define V(name,conftype,initvalue) \ - VAR( #name, conftype, name, initvalue ) + CONFIG_VAR_ETYPE(test_struct_t, varname, conftype, member, initvalue) +#define V(member,conftype,initvalue) \ + VAR(#member, conftype, member, initvalue) #define OBSOLETE(varname) \ { { .name=varname, .type=CONFIG_TYPE_OBSOLETE }, NULL, {.INT=NULL} } @@ -83,7 +79,7 @@ static config_var_t test_vars[] = { OBSOLETE("obsolete"), { { .name = "routerset", - .type = CONFIG_TYPE_ROUTERSET, + .type = CONFIG_TYPE_EXTENDED, .type_def = &ROUTERSET_type_defn, .offset = offsetof(test_struct_t, routerset), }, |