diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-10-07 09:32:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-10-07 09:32:51 -0400 |
| commit | cec2bc435ed252389d80d77ab17ba4de33ae3153 (patch) | |
| tree | 6fe1defb670a0a5e3bd5d29d46f2941703b4f99d /src/test/test.c | |
| parent | 15bfdbeb9db2bc3585ba623851ed2ee2a0dd0a80 (diff) | |
| parent | ca927b7f637551746220bea118c036825d440679 (diff) | |
| download | tor-cec2bc435ed252389d80d77ab17ba4de33ae3153.tar.gz tor-cec2bc435ed252389d80d77ab17ba4de33ae3153.zip | |
Merge remote-tracking branch 'twstrike/procmon_tests'
Conflicts:
src/test/include.am
src/test/log_test_helpers.c
src/test/log_test_helpers.h
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 fd0f3aff1a..33a1e57092 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1151,6 +1151,7 @@ extern struct testcase_t nodelist_tests[]; extern struct testcase_t oom_tests[]; extern struct testcase_t options_tests[]; extern struct testcase_t policy_tests[]; +extern struct testcase_t procmon_tests[]; extern struct testcase_t pt_tests[]; extern struct testcase_t relay_tests[]; extern struct testcase_t relaycell_tests[]; @@ -1203,6 +1204,7 @@ struct testgroup_t testgroups[] = { { "oom/", oom_tests }, { "options/", options_tests }, { "policy/" , policy_tests }, + { "procmon/", procmon_tests }, { "pt/", pt_tests }, { "relay/" , relay_tests }, { "relaycell/", relaycell_tests }, @@ -1222,4 +1224,3 @@ struct testgroup_t testgroups[] = { { "dns/", dns_tests }, END_OF_GROUPS }; - |