nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

test_options: Use 64-bit comparisons when checking domain masks.

Browse Source 
This prevents a warning when building for 32-bit targets.

Fixes bug 32269; bug not in any released Tor.
This commit is contained in:
Nick Mathewson 2019-10-24 12:37:27 -04:00
parent 9a66b33229
commit 7bf4220a1b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/test/test_options.c
View File

@ -4006,9 +4006,9 @@ test_options_init_logs_quiet(void *arg)
tt_assert(a); tt_assert(a);
tt_assert(a->stream); tt_assert(a->stream);
tt_int_op(a->fd, OP_EQ, fileno(stdout)); tt_int_op(a->fd, OP_EQ, fileno(stdout));
tt_int_op(a->sev.masks[LOG_INFO-LOG_ERR], OP_EQ, 0); tt_u64_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_u64_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_WARN-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
clear_added_logs(); clear_added_logs();
quiet_level = QUIET_NONE; quiet_level = QUIET_NONE;
@ -4019,9 +4019,9 @@ test_options_init_logs_quiet(void *arg)
tt_assert(a); tt_assert(a);
tt_assert(a->stream); tt_assert(a->stream);
tt_int_op(a->fd, OP_EQ, fileno(stdout)); tt_int_op(a->fd, OP_EQ, fileno(stdout));
tt_int_op(a->sev.masks[LOG_INFO-LOG_ERR], OP_EQ, 0); tt_u64_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_u64_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_WARN-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
clear_added_logs(); clear_added_logs();
/* Make sure that adding a configured log makes the default logs go away. */ /* 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);
tt_assert(! a->stream); tt_assert(! a->stream);
tt_int_op(a->fd, OP_NE, fileno(stdout)); 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_u64_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_u64_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_WARN-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
done: done:
free_options_test_data(tdata); free_options_test_data(tdata);