diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-18 09:17:02 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-18 09:17:02 -0500 |
| commit | 96211bcf714ac739f605dc0b5b8754418080591f (patch) | |
| tree | 7c677d7993a65df2df28171dc7695a4dbab80937 /src/test/test.c | |
| parent | 164eeefb9360e20d358f3a08157c5b6227d98ac7 (diff) | |
| parent | 5c34a53068f5556f5648dfe522030983f552a1fd (diff) | |
| download | tor-96211bcf714ac739f605dc0b5b8754418080591f.tar.gz tor-96211bcf714ac739f605dc0b5b8754418080591f.zip | |
Merge branch 'bug9321_rerebase'
Conflicts:
src/or/dirvote.h
src/test/include.am
src/test/test_entrynodes.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 78932a4b7a..6c7db4e2c9 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1135,6 +1135,7 @@ extern struct testcase_t crypto_tests[]; extern struct testcase_t dir_tests[]; extern struct testcase_t entryconn_tests[]; extern struct testcase_t entrynodes_tests[]; +extern struct testcase_t guardfraction_tests[]; extern struct testcase_t extorport_tests[]; extern struct testcase_t hs_tests[]; extern struct testcase_t introduce_tests[]; @@ -1179,6 +1180,7 @@ struct testgroup_t testgroups[] = { { "dir/md/", microdesc_tests }, { "entryconn/", entryconn_tests }, { "entrynodes/", entrynodes_tests }, + { "guardfraction/", guardfraction_tests }, { "extorport/", extorport_tests }, { "hs/", hs_tests }, { "introduce/", introduce_tests }, |