소스 검색

Merge branch 'always_init_base'

Nick Mathewson 8 년 전
부모
커밋
abc9ce324e
4개의 변경된 파일6개의 추가작업 그리고 9개의 파일을 삭제
  1. 0 4
      src/test/test.c
  2. 0 4
      src/test/test_circuitmux.c
  3. 1 1
      src/test/test_dns.c
  4. 5 0
      src/test/testing_common.c

+ 0 - 4
src/test/test.c

@@ -319,11 +319,7 @@ 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);

+ 0 - 4
src/test/test_circuitmux.c

@@ -36,11 +36,7 @@ test_cmux_destroy_cell_queue(void *arg)
   circuit_t *circ = NULL;
   cell_queue_t *cq = NULL;
   packed_cell_t *pc = NULL;
-  tor_libevent_cfg cfg;
 
-  memset(&cfg, 0, sizeof(cfg));
-
-  tor_libevent_initialize(&cfg);
   scheduler_init();
 
   (void) arg;

+ 1 - 1
src/test/test_dns.c

@@ -490,7 +490,7 @@ NS(test_main)(void *arg)
 
   (void)arg;
 
-  TO_CONN(exitconn)->address = tor_strdup("127.0.0.1.in-addr.arpa");
+  TO_CONN(exitconn)->address = tor_strdup("1.0.0.127.in-addr.arpa");
 
   NS_MOCK(router_my_exit_policy_is_reject_star);
 

+ 5 - 0
src/test/testing_common.c

@@ -238,6 +238,11 @@ main(int c, const char **v)
   update_approx_time(time(NULL));
   options = options_new();
   tor_threads_init();
+
+  struct tor_libevent_cfg cfg;
+  memset(&cfg, 0, sizeof(cfg));
+  tor_libevent_initialize(&cfg);
+
   control_initialize_event_queue();
   init_logging(1);
   configure_backtrace_handler(get_version());