aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-10-25 17:17:39 +1000
committerteor <teor@torproject.org>2019-10-25 17:17:39 +1000
commit60aa6dac342c732269cbeb23c9652e816605387e (patch)
tree1e1dcb42c176682fa7a60c1b4be8f5a93d9c3df1 /src
parent00c3fba61c778981903bd9598d2eaa27f51e51a7 (diff)
parent7bf4220a1b5a669e31309c93bca4fc7a72e61ee4 (diff)
downloadtor-60aa6dac342c732269cbeb23c9652e816605387e.tar.gz
tor-60aa6dac342c732269cbeb23c9652e816605387e.zip
Merge remote-tracking branch 'tor-github/pr/1467'
Diffstat (limited to 'src')
-rw-r--r--src/test/test_options.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/test/test_options.c b/src/test/test_options.c
index 67c0821cfc..9b60bedff6 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -4006,9 +4006,9 @@ test_options_init_logs_quiet(void *arg)
tt_assert(a);
tt_assert(a->stream);
tt_int_op(a->fd, OP_EQ, fileno(stdout));
- tt_int_op(a->sev.masks[LOG_INFO-LOG_ERR], OP_EQ, 0);
- tt_int_op(a->sev.masks[LOG_NOTICE-LOG_ERR], OP_EQ, 0);
- tt_int_op(a->sev.masks[LOG_WARN-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
+ tt_u64_op(a->sev.masks[LOG_INFO-LOG_ERR], OP_EQ, 0);
+ tt_u64_op(a->sev.masks[LOG_NOTICE-LOG_ERR], OP_EQ, 0);
+ tt_u64_op(a->sev.masks[LOG_WARN-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
clear_added_logs();
quiet_level = QUIET_NONE;
@@ -4019,9 +4019,9 @@ test_options_init_logs_quiet(void *arg)
tt_assert(a);
tt_assert(a->stream);
tt_int_op(a->fd, OP_EQ, fileno(stdout));
- tt_int_op(a->sev.masks[LOG_INFO-LOG_ERR], OP_EQ, 0);
- tt_int_op(a->sev.masks[LOG_NOTICE-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
- tt_int_op(a->sev.masks[LOG_WARN-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
+ tt_u64_op(a->sev.masks[LOG_INFO-LOG_ERR], OP_EQ, 0);
+ tt_u64_op(a->sev.masks[LOG_NOTICE-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
+ tt_u64_op(a->sev.masks[LOG_WARN-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
clear_added_logs();
/* Make sure that adding a configured log makes the default logs go away. */
@@ -4035,9 +4035,9 @@ test_options_init_logs_quiet(void *arg)
tt_assert(a);
tt_assert(! a->stream);
tt_int_op(a->fd, OP_NE, fileno(stdout));
- tt_int_op(a->sev.masks[LOG_INFO-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
- tt_int_op(a->sev.masks[LOG_NOTICE-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
- tt_int_op(a->sev.masks[LOG_WARN-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
+ tt_u64_op(a->sev.masks[LOG_INFO-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
+ tt_u64_op(a->sev.masks[LOG_NOTICE-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
+ tt_u64_op(a->sev.masks[LOG_WARN-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
done:
free_options_test_data(tdata);