diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-18 09:17:02 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-18 09:17:02 -0500 |
| commit | 96211bcf714ac739f605dc0b5b8754418080591f (patch) | |
| tree | 7c677d7993a65df2df28171dc7695a4dbab80937 /src/test/include.am | |
| parent | 164eeefb9360e20d358f3a08157c5b6227d98ac7 (diff) | |
| parent | 5c34a53068f5556f5648dfe522030983f552a1fd (diff) | |
| download | tor-96211bcf714ac739f605dc0b5b8754418080591f.tar.gz tor-96211bcf714ac739f605dc0b5b8754418080591f.zip | |
Merge branch 'bug9321_rerebase'
Conflicts:
src/or/dirvote.h
src/test/include.am
src/test/test_entrynodes.c
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/test/include.am b/src/test/include.am index 71041b1237..1c44ff135f 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -40,6 +40,7 @@ src_test_test_SOURCES = \ src/test/test_dir.c \ src/test/test_entryconn.c \ src/test/test_entrynodes.c \ + src/test/test_guardfraction.c \ src/test/test_extorport.c \ src/test/test_hs.c \ src/test/test_introduce.c \ @@ -61,6 +62,7 @@ src_test_test_SOURCES = \ src/test/test_status.c \ src/test/test_threads.c \ src/test/test_util.c \ + src/test/test_helpers.c \ src/test/testing_common.c \ src/test/testhelper.c \ src/ext/tinytest.c @@ -121,6 +123,7 @@ noinst_HEADERS+= \ src/test/fakechans.h \ src/test/test.h \ src/test/testhelper.h \ + src/test/test_helpers.h \ src/test/test_descriptors.inc \ src/test/example_extrainfo.inc \ src/test/failing_routerdescs.inc \ |