diff options
author | Nick Mathewson <nickm@torproject.org> | 2015-10-02 14:12:27 +0200 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2015-10-02 14:12:27 +0200 |
commit | 086c33ea61644a27816a62f77c1629390e03d893 (patch) | |
tree | 1ecb80f590c94f177ef7865743620cae04a05476 /src/test/test.c | |
parent | 67182226f10fde686f7d541cad3c608f74415205 (diff) | |
parent | 94e5db3dca3abfc93a57287516177f14d395ae3f (diff) | |
download | tor-086c33ea61644a27816a62f77c1629390e03d893.tar.gz tor-086c33ea61644a27816a62f77c1629390e03d893.zip |
Merge remote-tracking branch 'twstrike/tortls_tests'
Diffstat (limited to 'src/test/test.c')
-rw-r--r-- | src/test/test.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/test.c b/src/test/test.c index 1ab94fd9b4..26c27a8ea5 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1162,6 +1162,7 @@ extern struct testcase_t scheduler_tests[]; extern struct testcase_t socks_tests[]; extern struct testcase_t status_tests[]; extern struct testcase_t thread_tests[]; +extern struct testcase_t tortls_tests[]; extern struct testcase_t util_tests[]; extern struct testcase_t util_format_tests[]; extern struct testcase_t dns_tests[]; @@ -1209,6 +1210,7 @@ struct testgroup_t testgroups[] = { { "scheduler/", scheduler_tests }, { "socks/", socks_tests }, { "status/" , status_tests }, + { "tortls/", tortls_tests }, { "util/", util_tests }, { "util/format/", util_format_tests }, { "util/logging/", logging_tests }, @@ -1216,4 +1218,3 @@ struct testgroup_t testgroups[] = { { "dns/", dns_tests }, END_OF_GROUPS }; - |