diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-10-06 11:32:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-10-06 11:32:06 -0400 |
| commit | f179abdca935d6d119f66e469232b36955a292b4 (patch) | |
| tree | f00e05fced86c7f6ad77d03fb0bdaa2961597ae8 /src/test/include.am | |
| parent | 2592d537f95173083e397d19e182346955741221 (diff) | |
| parent | 70de8d4bf86c430969bb314ba8590c00ce4dd374 (diff) | |
| download | tor-f179abdca935d6d119f66e469232b36955a292b4.tar.gz tor-f179abdca935d6d119f66e469232b36955a292b4.zip | |
Merge remote-tracking branch 'twstrike/rendcache_tests'
Conflicts:
src/test/include.am
src/test/rend_test_helpers.c
src/test/rend_test_helpers.h
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/include.am b/src/test/include.am index e056138b48..67bc600911 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -50,6 +50,7 @@ src_test_AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ src_test_test_SOURCES = \ src/test/log_test_helpers.c \ + src/test/rend_test_helpers.c \ src/test/test.c \ src/test/test_accounting.c \ src/test/test_addr.c \ @@ -88,6 +89,7 @@ src_test_test_SOURCES = \ src/test/test_pt.c \ src/test/test_relay.c \ src/test/test_relaycell.c \ + src/test/test_rendcache.c \ src/test/test_replay.c \ src/test/test_routerkeys.c \ src/test/test_routerlist.c \ @@ -100,7 +102,6 @@ src_test_test_SOURCES = \ src/test/test_util.c \ src/test/test_util_format.c \ src/test/test_helpers.c \ - src/test/rend_test_helpers.c \ src/test/test_dns.c \ src/test/testing_common.c \ src/ext/tinytest.c |