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/include.am | |
| 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/include.am')
| -rw-r--r-- | src/test/include.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/include.am b/src/test/include.am index 67bc600911..5b3c045de1 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -86,6 +86,7 @@ src_test_test_SOURCES = \ src/test/test_oom.c \ src/test/test_options.c \ src/test/test_policy.c \ + src/test/test_procmon.c \ src/test/test_pt.c \ src/test/test_relay.c \ src/test/test_relaycell.c \ |