[tor-commits] [tor/master] Initialise logging before trying to use it in unit tests

[nickm@xxxxxxxxxxxxxx]

commit a7a98e27eadff634655a7845976adc7a23dcdc3f
Author: teor (Tim Wilson-Brown) <teor2345@xxxxxxxxx>
Date:   Fri Feb 5 14:28:53 2016 +1100

    Initialise logging before trying to use it in unit tests
---
 src/test/testing_common.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/test/testing_common.c b/src/test/testing_common.c
index e20e9e6..fc4e05c 100644
--- a/src/test/testing_common.c
+++ b/src/test/testing_common.c
@@ -228,6 +228,9 @@ main(int c, const char **v)
   int loglevel = LOG_ERR;
   int accel_crypto = 0;
 
+  /* We must initialise logs before we call tor_assert() */
+  init_logging(1);
+
 #ifdef USE_DMALLOC
   {
     int r = CRYPTO_set_mem_ex_functions(tor_malloc_, tor_realloc_, tor_free_);
@@ -239,7 +242,6 @@ main(int c, const char **v)
   options = options_new();
   tor_threads_init();
   control_initialize_event_queue();
-  init_logging(1);
   configure_backtrace_handler(get_version());
 
   for (i_out = i = 1; i < c; ++i) {



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