summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-01-31 14:37:48 -0500
committerNick Mathewson <nickm@torproject.org>2018-01-31 14:37:48 -0500
commita846fd267edf5a457d6647b37ad7ef2ac62a1612 (patch)
tree4860fc3edebeef732bc8c7fbf936527dbf10a1b0 /src/test
parentd44080a09da4cf05c6b2895ef7ac97c65acdd8b8 (diff)
parentda778f2921d0ae49c47abb4ba4ebe5f92a999ae2 (diff)
downloadtor-a846fd267edf5a457d6647b37ad7ef2ac62a1612.tar.gz
tor-a846fd267edf5a457d6647b37ad7ef2ac62a1612.zip
Merge branch 'bug23954_squashed'
Diffstat (limited to 'src/test')
-rw-r--r--src/test/fuzz/fuzzing_common.c2
-rw-r--r--src/test/testing_common.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/test/fuzz/fuzzing_common.c b/src/test/fuzz/fuzzing_common.c
index 1d54e41dbd..7c9fac748b 100644
--- a/src/test/fuzz/fuzzing_common.c
+++ b/src/test/fuzz/fuzzing_common.c
@@ -152,6 +152,8 @@ main(int argc, char **argv)
}
}
+ init_protocol_warning_severity_level();
+
{
log_severity_list_t s;
memset(&s, 0, sizeof(s));
diff --git a/src/test/testing_common.c b/src/test/testing_common.c
index 142c681079..52729147b2 100644
--- a/src/test/testing_common.c
+++ b/src/test/testing_common.c
@@ -278,6 +278,7 @@ main(int c, const char **v)
s.masks[LOG_WARN-LOG_ERR] |= LD_BUG;
add_stream_log(&s, "", fileno(stdout));
}
+ init_protocol_warning_severity_level();
options->command = CMD_RUN_UNITTESTS;
if (crypto_global_init(accel_crypto, NULL, NULL)) {