diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-02-11 13:41:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-02-11 13:41:31 -0500 |
| commit | fed8c5199a9fbc91a7476323c145c59e9e30e30c (patch) | |
| tree | d1d45808191b6a1931eaa7a1b455870e0c34e55e /src/test/testing_common.c | |
| parent | 5a164d50bbfd66ef51408794d03c8db8071ddabb (diff) | |
| parent | a7a98e27eadff634655a7845976adc7a23dcdc3f (diff) | |
| download | tor-fed8c5199a9fbc91a7476323c145c59e9e30e30c.tar.gz tor-fed8c5199a9fbc91a7476323c145c59e9e30e30c.zip | |
Merge branch 'check_log_mutex_uncherrypicked'
Diffstat (limited to 'src/test/testing_common.c')
| -rw-r--r-- | src/test/testing_common.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 9c7fca05a5..da9969d8d9 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_); @@ -244,7 +247,6 @@ main(int c, const char **v) tor_libevent_initialize(&cfg); control_initialize_event_queue(); - init_logging(1); configure_backtrace_handler(get_version()); for (i_out = i = 1; i < c; ++i) { |