|
@@ -29,12 +29,6 @@
|
|
#define test_streq(expr1, expr2) tt_str_op((expr1), ==, (expr2))
|
|
#define test_streq(expr1, expr2) tt_str_op((expr1), ==, (expr2))
|
|
#define test_strneq(expr1, expr2) tt_str_op((expr1), !=, (expr2))
|
|
#define test_strneq(expr1, expr2) tt_str_op((expr1), !=, (expr2))
|
|
|
|
|
|
-#define test_mem_op(expr1, op, expr2, len) \
|
|
|
|
- tt_mem_op((expr1), op, (expr2), (len))
|
|
|
|
-
|
|
|
|
-#define test_memeq(expr1, expr2, len) test_mem_op((expr1), ==, (expr2), len)
|
|
|
|
-#define test_memneq(expr1, expr2, len) test_mem_op((expr1), !=, (expr2), len)
|
|
|
|
-
|
|
|
|
/* As test_mem_op, but decodes 'hex' before comparing. There must be a
|
|
/* As test_mem_op, but decodes 'hex' before comparing. There must be a
|
|
* local char* variable called mem_op_hex_tmp for this to work. */
|
|
* local char* variable called mem_op_hex_tmp for this to work. */
|
|
#define test_mem_op_hex(expr1, op, hex) \
|
|
#define test_mem_op_hex(expr1, op, hex) \
|
|
@@ -44,7 +38,7 @@
|
|
mem_op_hex_tmp = tor_malloc(length/2); \
|
|
mem_op_hex_tmp = tor_malloc(length/2); \
|
|
tor_assert((length&1)==0); \
|
|
tor_assert((length&1)==0); \
|
|
base16_decode(mem_op_hex_tmp, length/2, hex, length); \
|
|
base16_decode(mem_op_hex_tmp, length/2, hex, length); \
|
|
- test_mem_op(expr1, op, mem_op_hex_tmp, length/2); \
|
|
|
|
|
|
+ tt_mem_op(expr1, op, mem_op_hex_tmp, length/2); \
|
|
STMT_END
|
|
STMT_END
|
|
|
|
|
|
#define test_memeq_hex(expr1, hex) test_mem_op_hex(expr1, ==, hex)
|
|
#define test_memeq_hex(expr1, hex) test_mem_op_hex(expr1, ==, hex)
|