diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-23 09:36:00 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-23 09:36:00 -0500 |
| commit | 5d4bb6f61f360ddcbee83476ff2f93a13f3a19c0 (patch) | |
| tree | b863aa88f8810c86e56f711fe1e032585f80e579 /src/test/include.am | |
| parent | bd22ad12bd84019d00bcd92e2e2390cd910908ce (diff) | |
| parent | ac9b0a3110ea4eea63133c6d2e3572b2cfd22bd6 (diff) | |
| download | tor-5d4bb6f61f360ddcbee83476ff2f93a13f3a19c0.tar.gz tor-5d4bb6f61f360ddcbee83476ff2f93a13f3a19c0.zip | |
Merge remote-tracking branch 'public/ticket9969'
Conflicts:
src/or/directory.c
src/or/routerlist.c
src/or/routerlist.h
src/test/include.am
src/test/test.c
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/test/include.am b/src/test/include.am index 3c59a8b3c7..f07c78b95c 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -17,44 +17,45 @@ src_test_AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ src_test_test_SOURCES = \ src/test/test.c \ + src/test/test_accounting.c \ src/test/test_addr.c \ src/test/test_buffers.c \ src/test/test_cell_formats.c \ + src/test/test_cell_queue.c \ src/test/test_channel.c \ src/test/test_channeltls.c \ + src/test/test_checkdir.c \ src/test/test_circuitlist.c \ src/test/test_circuitmux.c \ + src/test/test_config.c \ src/test/test_containers.c \ src/test/test_controller_events.c \ src/test/test_crypto.c \ - src/test/test_cell_queue.c \ src/test/test_data.c \ src/test/test_dir.c \ - src/test/test_checkdir.c \ src/test/test_entryconn.c \ src/test/test_entrynodes.c \ src/test/test_extorport.c \ + src/test/test_hs.c \ src/test/test_introduce.c \ src/test/test_logging.c \ src/test/test_microdesc.c \ + src/test/test_nodelist.c \ src/test/test_oom.c \ - src/test/test_accounting.c \ src/test/test_options.c \ + src/test/test_policy.c \ src/test/test_pt.c \ - src/test/test_relaycell.c \ src/test/test_relay.c \ + src/test/test_relaycell.c \ src/test/test_replay.c \ src/test/test_routerkeys.c \ + src/test/test_routerlist.c \ + src/test/test_routerset.c \ src/test/test_scheduler.c \ src/test/test_socks.c \ + src/test/test_status.c \ src/test/test_threads.c \ src/test/test_util.c \ - src/test/test_config.c \ - src/test/test_hs.c \ - src/test/test_nodelist.c \ - src/test/test_policy.c \ - src/test/test_status.c \ - src/test/test_routerset.c \ src/ext/tinytest.c src_test_test_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) |