From: teor (Tim Wilson-Brown) <teor2345@gmail.com>
Date: Fri, 5 Feb 2016 03:28:53 +0000 (+1100)
Subject: Initialise logging before trying to use it in unit tests
X-Git-Tag: tor-0.2.8.2-alpha~121^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7a98e27eadff634655a7845976adc7a23dcdc3f;p=thirdparty%2Ftor.git

Initialise logging before trying to use it in unit tests
---

diff --git a/src/test/testing_common.c b/src/test/testing_common.c
index e20e9e6095..fc4e05c4e8 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) {