[tor-commits] [tor/master] Merge branch 'ticket28668_035' into ticket28668_040

[dgoulet at torproject.org]

commit 3baf99e81bcded352b8e8a3416148e53a4801a11
Merge: 16430fdaf f684cd800
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 16 15:54:31 2019 -0500

    Merge branch 'ticket28668_035' into ticket28668_040

 changes/ticket28668       |  3 +++
 src/test/testing_common.c | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --cc src/test/testing_common.c
index 4e603b529,62d40a42f..8fc8ef783
--- a/src/test/testing_common.c
+++ b/src/test/testing_common.c
@@@ -287,7 -304,14 +297,15 @@@ main(int c, const char **v
      s.masks[LOG_WARN-LOG_ERR] |= LD_BUG;
      add_stream_log(&s, "", fileno(stdout));
    }
+   {
+     /* Setup logs that cause failure. */
+     log_severity_list_t s;
+     memset(&s, 0, sizeof(s));
+     set_log_severity_config(LOG_ERR, LOG_ERR, &s);
+     s.masks[LOG_WARN-LOG_ERR] |= LD_BUG;
+     add_callback_log(&s, log_callback_failure);
+   }
 +  flush_log_messages_from_startup();
    init_protocol_warning_severity_level();
  
    options->command = CMD_RUN_UNITTESTS;