summaryrefslogtreecommitdiff
path: root/src/test/include.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-11-05 14:11:47 -0500
committerNick Mathewson <nickm@torproject.org>2014-11-05 14:11:47 -0500
commit4df419a4b19c3b4033b964ec73e82aa988034c81 (patch)
treec9067b2662db7966201101b7e5afe41d99fdb432 /src/test/include.am
parent3d8cb107323fa5d9cc375087e69a9940b947d0e3 (diff)
parent3d0d49be230a8720ebdadf668b993f8ba2c5b2ca (diff)
downloadtor-4df419a4b19c3b4033b964ec73e82aa988034c81.tar.gz
tor-4df419a4b19c3b4033b964ec73e82aa988034c81.zip
Merge remote-tracking branch 'meejah/ticket-11291-extra-utests'
Conflicts: src/or/config.c
Diffstat (limited to 'src/test/include.am')
-rw-r--r--src/test/include.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/include.am b/src/test/include.am
index d0f3224dc5..9abf3094eb 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -28,6 +28,7 @@ src_test_test_SOURCES = \
src/test/test_cell_queue.c \
src/test/test_data.c \
src/test/test_dir.c \
+ src/test/test_checkdir.c \
src/test/test_entrynodes.c \
src/test/test_extorport.c \
src/test/test_introduce.c \