commit 50d5fb87bd6e763895eb0a784e4dbb40a132b759 Author: Andrea Shepard andrea@torproject.org Date: Wed Jan 22 16:51:44 2014 -0800

Initial test_channeltls.c --- src/test/Makefile.nmake | 6 +++--- src/test/include.am | 1 + src/test/test.c | 2 ++ src/test/test_channeltls.c | 18 ++++++++++++++++++ 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/test/Makefile.nmake b/src/test/Makefile.nmake index 2a347bd..7986eb0 100644 --- a/src/test/Makefile.nmake +++ b/src/test/Makefile.nmake @@ -11,9 +11,9 @@ LIBS = ......\build-alpha\lib\libevent.lib \ ws2_32.lib advapi32.lib shell32.lib \ crypt32.lib gdi32.lib user32.lib

-TEST_OBJECTS = test.obj test_addr.obj test_channel.obj test_containers.obj \ - test_controller_events.ogj test_crypto.obj test_data.obj test_dir.obj \ - test_microdesc.obj test_pt.obj test_util.obj test_config.obj \ +TEST_OBJECTS = test.obj test_addr.obj test_channel.obj test_channeltls.obj \ + test_containers.obj test_controller_events.obj test_crypto.obj test_data.obj \ + test_dir.obj test_microdesc.obj test_pt.obj test_util.obj test_config.obj \ test_cell_formats.obj test_relay.obj test_replay.obj \ test_introduce.obj tinytest.obj test_hs.obj

diff --git a/src/test/include.am b/src/test/include.am index 531b81e..fdd88db 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -21,6 +21,7 @@ src_test_test_SOURCES = \ src/test/test_buffers.c \ src/test/test_cell_formats.c \ src/test/test_channel.c \ + src/test/test_channeltls.c \ src/test/test_circuitlist.c \ src/test/test_circuitmux.c \ src/test/test_containers.c \ diff --git a/src/test/test.c b/src/test/test.c index 7ade83d..d0f0041 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1310,6 +1310,7 @@ extern struct testcase_t status_tests[]; extern struct testcase_t routerset_tests[]; extern struct testcase_t router_tests[]; extern struct testcase_t channel_tests[]; +extern struct testcase_t channeltls_tests[]; extern struct testcase_t relay_tests[];

static struct testgroup_t testgroups[] = { @@ -1344,6 +1345,7 @@ static struct testgroup_t testgroups[] = { { "status/" , status_tests }, { "routerset/" , routerset_tests }, { "channel/", channel_tests }, + { "channeltls/", channeltls_tests }, { "relay/" , relay_tests }, END_OF_GROUPS }; diff --git a/src/test/test_channeltls.c b/src/test/test_channeltls.c new file mode 100644 index 0000000..6284cc0 --- /dev/null +++ b/src/test/test_channeltls.c @@ -0,0 +1,18 @@ +/* Copyright (c) 2013, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#define TOR_CHANNEL_INTERNAL_ +#include "or.h" +#include "channel.h" +#include "channeltls.h" +/* For init/free stuff */ +#include "scheduler.h" + +/* Test suite stuff */ +#include "test.h" +#include "fakechans.h" + +struct testcase_t channeltls_tests[] = { + END_OF_TESTCASES +}; +