diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-04 11:03:30 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-04 11:03:30 -0500 |
| commit | ab225aaf28d7a25a58b5f11f1c59ded80570b594 (patch) | |
| tree | 2cef1ba108879d507296d6a089f9cebc5237fad8 /src/test/test.c | |
| parent | bfa0e022bc6ec629473d3dfb598cad698ceee256 (diff) | |
| parent | bb375442141b4a5b301212394ce3e106cb34daf2 (diff) | |
| download | tor-ab225aaf28d7a25a58b5f11f1c59ded80570b594.tar tor-ab225aaf28d7a25a58b5f11f1c59ded80570b594.tar.gz | |
Merge branch 'bug10169_025_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 2529e2902..9ca3f29a3 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1630,6 +1630,7 @@ extern struct testcase_t backtrace_tests[]; extern struct testcase_t hs_tests[]; extern struct testcase_t nodelist_tests[]; extern struct testcase_t routerkeys_tests[]; +extern struct testcase_t oom_tests[]; static struct testgroup_t testgroups[] = { { "", test_array }, @@ -1656,6 +1657,7 @@ static struct testgroup_t testgroups[] = { { "hs/", hs_tests }, { "nodelist/", nodelist_tests }, { "routerkeys/", routerkeys_tests }, + { "oom/", oom_tests }, END_OF_GROUPS }; |