diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-10-22 10:14:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-10-22 10:14:03 -0400 |
| commit | 8e4daa7bb0941037b6b5585059e5570267ee6eb9 (patch) | |
| tree | 6e25f987b8db6c6f5e43aef8251e49adb34ae7b7 /src/test/test_logging.c | |
| parent | 71613993e0f9c015d33f1405187a5c5828987ea2 (diff) | |
| parent | 93dfb1203715bd275d0eed6c8cccf6b6db76fd95 (diff) | |
| download | tor-8e4daa7bb0941037b6b5585059e5570267ee6eb9.tar.gz tor-8e4daa7bb0941037b6b5585059e5570267ee6eb9.zip | |
Merge remote-tracking branch 'public/ticket6938'
Conflicts:
src/tools/tor-resolve.c
Diffstat (limited to 'src/test/test_logging.c')
| -rw-r--r-- | src/test/test_logging.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/test_logging.c b/src/test/test_logging.c index 9f57000bea..76cc9e970e 100644 --- a/src/test/test_logging.c +++ b/src/test/test_logging.c @@ -19,7 +19,7 @@ test_get_sigsafe_err_fds(void *arg) int n; log_severity_list_t include_bug, no_bug, no_bug2; (void) arg; - init_logging(); + init_logging(1); n = tor_log_get_sigsafe_err_fds(&fds); tt_int_op(n, ==, 1); @@ -87,7 +87,7 @@ test_sigsafe_err(void *arg) set_log_severity_config(LOG_WARN, LOG_ERR, &include_bug); - init_logging(); + init_logging(1); mark_logs_temp(); add_file_log(&include_bug, fn, 0); tor_log_update_sigsafe_err_fds(); |