diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-16 07:57:37 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-16 07:57:37 -0500 |
| commit | 3c89622e39d964b731a40c6a705327d5caa07be4 (patch) | |
| tree | fd7e30579398838eea9a58eb48964c95f7298099 /src/core/include.am | |
| parent | 5e70c27e8560ac1885ae9d9e1b79d3838b49cc09 (diff) | |
| parent | efb301c86c288c01e21dfb5da9f685f33341b2c2 (diff) | |
| download | tor-3c89622e39d964b731a40c6a705327d5caa07be4.tar.gz tor-3c89622e39d964b731a40c6a705327d5caa07be4.zip | |
Merge branch 'ticket32487_squashed' into ticket32487_squashed_and_merged
Resolved conflicts in src/core/include.am
Diffstat (limited to 'src/core/include.am')
| -rw-r--r-- | src/core/include.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/include.am b/src/core/include.am index 41347ed64a..7752a7974b 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -7,7 +7,6 @@ # LIBTOR_APP_TESTING_A_SOURCES = $(LIBTOR_APP_A_SOURCES) - src_core_libtor_app_a_SOURCES = \ $(LIBTOR_APP_A_SOURCES) \ $(LIBTOR_APP_A_STUB_SOURCES) @@ -16,6 +15,7 @@ if UNITTESTS_ENABLED # Add the sources of the modules that are needed for tests to work here. LIBTOR_APP_TESTING_A_SOURCES += $(MODULE_RELAY_SOURCES) +LIBTOR_APP_TESTING_A_SOURCES += $(MODULE_DIRCACHE_SOURCES) LIBTOR_APP_TESTING_A_SOURCES += $(MODULE_DIRAUTH_SOURCES) src_core_libtor_app_testing_a_SOURCES = $(LIBTOR_APP_TESTING_A_SOURCES) |