diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-11 15:06:04 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-11 15:06:04 -0500 |
| commit | caf28519d9a4f7f0a5fa36a0cd94fe9c0ee292dc (patch) | |
| tree | db5e6003cc8cec5f27ba0e91449348518ea98455 /src/test/include.am | |
| parent | 0c81dfa848da160b02818771626a425cd27b86bc (diff) | |
| parent | 0899f51bc6abf535c6c55b81b98b959235b0f7c7 (diff) | |
| download | tor-caf28519d9a4f7f0a5fa36a0cd94fe9c0ee292dc.tar.gz tor-caf28519d9a4f7f0a5fa36a0cd94fe9c0ee292dc.zip | |
Merge branch 'bug12844'
Conflicts:
src/or/circuituse.c
src/test/include.am
src/test/test_entrynodes.c
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/test/include.am b/src/test/include.am index 595be0b7c2..71041b1237 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -62,6 +62,7 @@ src_test_test_SOURCES = \ src/test/test_threads.c \ src/test/test_util.c \ src/test/testing_common.c \ + src/test/testhelper.c \ src/ext/tinytest.c src_test_test_slow_SOURCES = \ @@ -119,10 +120,12 @@ src_test_test_workqueue_LDADD = src/or/libtor-testing.a \ noinst_HEADERS+= \ src/test/fakechans.h \ src/test/test.h \ + src/test/testhelper.h \ src/test/test_descriptors.inc \ src/test/example_extrainfo.inc \ src/test/failing_routerdescs.inc \ - src/test/ed25519_vectors.inc + src/test/ed25519_vectors.inc \ + src/test/test_descriptors.inc noinst_PROGRAMS+= src/test/test-ntor-cl src_test_test_ntor_cl_SOURCES = src/test/test_ntor_cl.c |