nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make not even macros use test_fail_msg.

Browse Source
This commit is contained in:
Nick Mathewson 2014-09-15 21:22:36 -04:00
parent 0243895792
commit 5253ba3184
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/test.h
View File

@ -22,10 +22,6 @@
#define PRETTY_FUNCTION "" #define PRETTY_FUNCTION ""
#endif #endif
#define test_fail_msg(msg) TT_DIE((msg))
#define test_fail() test_fail_msg("Assertion failed.")
#define test_assert(expr) tt_assert(expr) #define test_assert(expr) tt_assert(expr)
#define test_eq(expr1, expr2) tt_int_op((expr1), ==, (expr2)) #define test_eq(expr1, expr2) tt_int_op((expr1), ==, (expr2))

8
src/test/test_addr.c
View File

@ -123,7 +123,7 @@ test_addr_basic(void)
test_eq(tor_inet_pton(AF_INET6, a, &t1.addr.in6_addr), 1); \ test_eq(tor_inet_pton(AF_INET6, a, &t1.addr.in6_addr), 1); \
t1.family = AF_INET6; \ t1.family = AF_INET6; \
if (!tor_addr_is_internal(&t1, for_listening)) \ if (!tor_addr_is_internal(&t1, for_listening)) \
test_fail_msg( a "was not internal."); \ TT_DIE(("%s was not internal", a)); \
STMT_END STMT_END
/** Helper: assert that <b>a</b> parses by tor_inet_pton() into a address that /** Helper: assert that <b>a</b> parses by tor_inet_pton() into a address that
@ -132,7 +132,7 @@ test_addr_basic(void)
test_eq(tor_inet_pton(AF_INET6, a, &t1.addr.in6_addr), 1); \ test_eq(tor_inet_pton(AF_INET6, a, &t1.addr.in6_addr), 1); \
t1.family = AF_INET6; \ t1.family = AF_INET6; \
if (tor_addr_is_internal(&t1, for_listening)) \ if (tor_addr_is_internal(&t1, for_listening)) \
test_fail_msg(a "was not external."); \ TT_DIE(("%s was not internal", a)); \
STMT_END STMT_END
/** Helper: Assert that <b>a</b> and <b>b</b>, when parsed by /** Helper: Assert that <b>a</b> and <b>b</b>, when parsed by
@ -144,7 +144,7 @@ test_addr_basic(void)
t1.family = t2.family = AF_INET6; \ t1.family = t2.family = AF_INET6; \
r = tor_addr_compare(&t1,&t2,CMP_SEMANTIC); \ r = tor_addr_compare(&t1,&t2,CMP_SEMANTIC); \
if (!(r op 0)) \ if (!(r op 0)) \
test_fail_msg("failed: tor_addr_compare("a","b") "#op" 0"); \ TT_DIE(("Failed: tor_addr_compare(%s,%s) %s 0", a, b, #op));\
STMT_END STMT_END
/** Helper: Assert that <b>a</b> and <b>b</b>, when parsed by /** Helper: Assert that <b>a</b> and <b>b</b>, when parsed by
@ -156,7 +156,7 @@ test_addr_basic(void)
t1.family = t2.family = AF_INET6; \ t1.family = t2.family = AF_INET6; \
r = tor_addr_compare_masked(&t1,&t2,m,CMP_SEMANTIC); \ r = tor_addr_compare_masked(&t1,&t2,m,CMP_SEMANTIC); \
if (!(r op 0)) \ if (!(r op 0)) \
test_fail_msg("failed: tor_addr_compare_masked("a","b","#m") "#op" 0"); \ TT_DIE(("Failed: tor_addr_compare_masked(%s,%s,%d) %s 0", a, b, m, #op)); \
STMT_END STMT_END
/** Helper: assert that <b>xx</b> is parseable as a masked IPv6 address with /** Helper: assert that <b>xx</b> is parseable as a masked IPv6 address with