diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-30 14:10:22 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-30 14:10:22 -0500 |
| commit | 3b88b638264011158d27d5b451fd07d16f60e16b (patch) | |
| tree | 3af8591550471211fd0ee0a20f9602c4d761a7ce /src/test/test.c | |
| parent | 60b41cd435c0acef274209a2a9b494b5f42964f6 (diff) | |
| parent | e8d598c4acc55b655f2e49566bf8802d7d6524ba (diff) | |
| download | tor-3b88b638264011158d27d5b451fd07d16f60e16b.tar.gz tor-3b88b638264011158d27d5b451fd07d16f60e16b.zip | |
Merge branch 'bug933_nm_rebased_v2'
Conflicts:
src/test/test.c
Diffstat (limited to 'src/test/test.c')
| -rw-r--r-- | src/test/test.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/test.c b/src/test/test.c index 092b2c3780..5fcc31c470 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1844,6 +1844,7 @@ extern struct testcase_t util_tests[]; extern struct testcase_t dir_tests[]; extern struct testcase_t microdesc_tests[]; extern struct testcase_t pt_tests[]; +extern struct testcase_t config_tests[]; static struct testgroup_t testgroups[] = { { "", test_array }, @@ -1855,6 +1856,7 @@ static struct testgroup_t testgroups[] = { { "dir/", dir_tests }, { "dir/md/", microdesc_tests }, { "pt/", pt_tests }, + { "config/", config_tests }, END_OF_GROUPS }; |