aboutsummaryrefslogtreecommitdiff
path: root/src/test/test.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-03-06 18:06:08 -0500
committerNick Mathewson <nickm@torproject.org>2014-03-06 18:06:08 -0500
commit1365ff5b9a04a7da2acc2e52df18a61b6cb39fe6 (patch)
tree0ada1a483eab86cdda00ea3728394a5482376b60 /src/test/test.h
parent065097b81bad3326a9bd536fbdf646f408638a94 (diff)
downloadtor-1365ff5b9a04a7da2acc2e52df18a61b6cb39fe6.tar.gz
tor-1365ff5b9a04a7da2acc2e52df18a61b6cb39fe6.zip
Upgrade to the latest version of tinytest.
This brings us to tinytest commit 709a36ba63ff16d8. The only big change tor-side is that we don't need our own test_mem_op operation any longer.
Diffstat (limited to 'src/test/test.h')
-rw-r--r--src/test/test.h17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/test/test.h b/src/test/test.h
index b902c6e478..ba82f52add 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -36,22 +36,7 @@
#define test_strneq(expr1, expr2) tt_str_op((expr1), !=, (expr2))
#define test_mem_op(expr1, op, expr2, len) \
- tt_assert_test_fmt_type(expr1,expr2,#expr1" "#op" "#expr2, \
- const char *, \
- (val1_ && val2_ && memcmp(val1_, val2_, len) op 0), \
- char *, "%s", \
- { size_t printlen = (len)*2+1; \
- if (value_) { \
- print_ = tor_malloc(printlen); \
- base16_encode(print_, printlen, value_, \
- (len)); \
- } else { \
- print_ = tor_strdup("null"); \
- } \
- }, \
- { tor_free(print_); }, \
- TT_EXIT_TEST_FUNCTION \
- );
+ 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)