diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-09-03 13:35:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-09-03 13:35:44 -0400 |
| commit | 37534880113133716b220bf6d5ffaaf910072b30 (patch) | |
| tree | de2870d4a6bac98d57794dc667e0936caf594af0 /src/test | |
| parent | eb5f22eff22745ad85741106215ee0831325c0bf (diff) | |
| download | tor-37534880113133716b220bf6d5ffaaf910072b30.tar tor-37534880113133716b220bf6d5ffaaf910072b30.tar.gz | |
Fix warnings in test_config_fix_my_family
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_config.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/test/test_config.c b/src/test/test_config.c index 911913aa8..6a285db6e 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4,6 +4,8 @@ /* See LICENSE for licensing information */ #include "orconfig.h" + +#define CONFIG_PRIVATE #include "or.h" #include "addressmap.h" #include "config.h" @@ -515,12 +517,14 @@ static void test_config_fix_my_family(void *arg) { char *err = NULL; - char *family = "$1111111111111111111111111111111111111111, " - "1111111111111111111111111111111111111112, " - "$1111111111111111111111111111111111111113"; + const char *family = "$1111111111111111111111111111111111111111, " + "1111111111111111111111111111111111111112, " + "$1111111111111111111111111111111111111113"; or_options_t* options = options_new(); or_options_t* defaults = options_new(); + (void) arg; + options_init(options); options_init(defaults); options->MyFamily = tor_strdup(family); @@ -528,7 +532,7 @@ test_config_fix_my_family(void *arg) options_validate(NULL, options, defaults, 0, &err) ; if (err != NULL) { - test_fail_msg(err); + TT_FAIL(("options_validate failed: %s", err)); } test_streq(options->MyFamily, "$1111111111111111111111111111111111111111, " |