diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-05-26 10:24:21 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-05-26 10:34:07 -0400 |
| commit | 8ca3773f686c43328f3c05a35d4d0e61a30b980c (patch) | |
| tree | bff454e5ccd728139b7b1c8932fb0c86f240a7bd | |
| parent | 08e8c21b1f0acac5e023d05d59f175f2f5716288 (diff) | |
| download | tor-8ca3773f686c43328f3c05a35d4d0e61a30b980c.tar.gz tor-8ca3773f686c43328f3c05a35d4d0e61a30b980c.zip | |
Fix unit tests on MSVC2013.
Patch from "NewEraCracker." Fixes bug16030; bugfix on 0.2.6.2-alpha.
| -rw-r--r-- | changes/bug16030 | 3 | ||||
| -rw-r--r-- | src/test/test_channel.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug16030 b/changes/bug16030 new file mode 100644 index 0000000000..c14fd62303 --- /dev/null +++ b/changes/bug16030 @@ -0,0 +1,3 @@ + o Minor bugfixes (tests): + - Fix a crash in the unit tests on MSVC2013. Fixes bug 16030; bugfix on + 0.2.6.2-alpha. Patch from "NewEraCracker".
\ No newline at end of file diff --git a/src/test/test_channel.c b/src/test/test_channel.c index 6cf66493a8..e11ac3f3cc 100644 --- a/src/test/test_channel.c +++ b/src/test/test_channel.c @@ -420,6 +420,7 @@ new_fake_channel(void) chan->close = chan_test_close; chan->get_overhead_estimate = chan_test_get_overhead_estimate; + chan->get_remote_descr = chan_test_get_remote_descr; chan->num_bytes_queued = chan_test_num_bytes_queued; chan->num_cells_writeable = chan_test_num_cells_writeable; chan->write_cell = chan_test_write_cell; @@ -615,7 +616,6 @@ test_channel_dumpstats(void *arg) /* Test channel_dump_statistics */ ch->describe_transport = chan_test_describe_transport; ch->dumpstats = chan_test_dumpstats; - ch->get_remote_descr = chan_test_get_remote_descr; ch->is_canonical = chan_test_is_canonical; old_count = test_dumpstats_calls; channel_dump_statistics(ch, LOG_DEBUG); |