[tor-commits] [tor/master] Initialize libevent before periodic events

[nickm@xxxxxxxxxxxxxx]

commit c59c622d8590c4abed6b8095a7451e2ba4d9200a
Author: cypherpunks <cypherpunks@xxxxxxxxxxxxxx>
Date:   Wed Nov 25 15:20:07 2015 +0100

    Initialize libevent before periodic events
    
    The initialization of libevent interferes with other tests so we also
    fork the circuit_timeout test.
---
 src/test/test.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/test/test.c b/src/test/test.c
index 0bc6292..1c4c292 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -319,6 +319,11 @@ test_circuit_timeout(void *arg)
   int i, runs;
   double close_ms;
   (void)arg;
+  tor_libevent_cfg cfg;
+
+  memset(&cfg, 0, sizeof(cfg));
+
+  tor_libevent_initialize(&cfg);
   initialize_periodic_events();
 
   circuit_build_times_init(&initial);
@@ -1114,7 +1119,7 @@ static struct testcase_t test_array[] = {
   { "bad_onion_handshake", test_bad_onion_handshake, 0, NULL, NULL },
   ENT(onion_queues),
   { "ntor_handshake", test_ntor_handshake, 0, NULL, NULL },
-  ENT(circuit_timeout),
+  FORK(circuit_timeout),
   FORK(rend_fns),
   ENT(geoip),
   FORK(geoip_with_pt),

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits