aboutsummaryrefslogtreecommitdiff
path: root/src/test/testing_common.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-05-16 14:30:04 -0400
committerNick Mathewson <nickm@torproject.org>2016-05-16 14:30:04 -0400
commit0f9b0b8bfeb861d95c3872525c4a03e77675ccbd (patch)
tree949652e61b19ed14dd3037593b176d9bc89db671 /src/test/testing_common.c
parent6cc3397e26ff37d6f01471b83e0e5bb1b5aa8eee (diff)
downloadtor-0f9b0b8bfeb861d95c3872525c4a03e77675ccbd.tar.gz
tor-0f9b0b8bfeb861d95c3872525c4a03e77675ccbd.zip
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.
Diffstat (limited to 'src/test/testing_common.c')
-rw-r--r--src/test/testing_common.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/testing_common.c b/src/test/testing_common.c
index aeb1fa794d..39c3d02ab1 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);