]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Initialise logging before trying to use it in unit tests
authorteor (Tim Wilson-Brown) <teor2345@gmail.com>
Fri, 5 Feb 2016 03:28:53 +0000 (14:28 +1100)
committerNick Mathewson <nickm@torproject.org>
Thu, 11 Feb 2016 18:41:25 +0000 (13:41 -0500)
src/test/testing_common.c

index e20e9e6095542692c020a06f2b7e91b74ac46754..fc4e05c4e89ebe754a1715bc9dba4c3a2af8c259 100644 (file)
@@ -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) {