commit 0f9b0b8bfeb861d95c3872525c4a03e77675ccbd Author: Nick Mathewson nickm@torproject.org Date: Mon May 16 14:30:04 2016 -0400
Initialize networking _before_ initializing libevent in the tests
This prevents WSANOTINITIALISED errors and fixes bug 18668. Bugfix on 0.2.8.1-alpha -- 1bac468882fd732460d8a25735131 specifically. --- changes/bug18668 | 3 +++ src/test/testing_common.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/bug18668 b/changes/bug18668 new file mode 100644 index 0000000..4b186b5 --- /dev/null +++ b/changes/bug18668 @@ -0,0 +1,3 @@ + o Minor bugfixes (tests): + - Avoid "WSANOTINITIALISED" warnings in the unit tests. Fixes bug 18668; + bugfix on 0.2.8.1-alpha. diff --git a/src/test/testing_common.c b/src/test/testing_common.c index aeb1fa7..39c3d02 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -242,6 +242,8 @@ main(int c, const char **v) options = options_new(); tor_threads_init();
+ network_init(); + struct tor_libevent_cfg cfg; memset(&cfg, 0, sizeof(cfg)); tor_libevent_initialize(&cfg); @@ -284,7 +286,6 @@ main(int c, const char **v) return 1; } rep_hist_init(); - network_init(); setup_directory(); options_init(options); options->DataDirectory = tor_strdup(temp_dir);