summaryrefslogtreecommitdiff
path: root/src/test/test.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-11-05 14:11:47 -0500
committerNick Mathewson <nickm@torproject.org>2014-11-05 14:11:47 -0500
commit4df419a4b19c3b4033b964ec73e82aa988034c81 (patch)
treec9067b2662db7966201101b7e5afe41d99fdb432 /src/test/test.c
parent3d8cb107323fa5d9cc375087e69a9940b947d0e3 (diff)
parent3d0d49be230a8720ebdadf668b993f8ba2c5b2ca (diff)
downloadtor-4df419a4b19c3b4033b964ec73e82aa988034c81.tar.gz
tor-4df419a4b19c3b4033b964ec73e82aa988034c81.zip
Merge remote-tracking branch 'meejah/ticket-11291-extra-utests'
Conflicts: src/or/config.c
Diffstat (limited to 'src/test/test.c')
-rw-r--r--src/test/test.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/test.c b/src/test/test.c
index 0511eb4054..203b7489df 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -1279,6 +1279,7 @@ extern struct testcase_t crypto_tests[];
extern struct testcase_t container_tests[];
extern struct testcase_t util_tests[];
extern struct testcase_t dir_tests[];
+extern struct testcase_t checkdir_tests[];
extern struct testcase_t microdesc_tests[];
extern struct testcase_t pt_tests[];
extern struct testcase_t config_tests[];
@@ -1316,6 +1317,7 @@ static struct testgroup_t testgroups[] = {
{ "cellfmt/", cell_format_tests },
{ "cellqueue/", cell_queue_tests },
{ "dir/", dir_tests },
+ { "checkdir/", checkdir_tests },
{ "dir/md/", microdesc_tests },
{ "pt/", pt_tests },
{ "config/", config_tests },