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

Fix obsolete usage of test_{str_},eq macros

Browse Source
This commit is contained in:
Nick Mathewson 2015-01-06 15:25:20 -05:00
parent ae9efa863e
commit 108808e98e
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/test/test_dir.c
View File

@ -845,41 +845,41 @@ test_dir_versions(void *arg)
tt_int_op(VER_RELEASE,OP_EQ, ver1.status); tt_int_op(VER_RELEASE,OP_EQ, ver1.status);
tt_str_op("",OP_EQ, ver1.status_tag); tt_str_op("",OP_EQ, ver1.status_tag);
test_eq(0, tor_version_parse("10.1", &ver1)); tt_int_op(0, OP_EQ, tor_version_parse("10.1", &ver1));
test_eq(10, ver1.major); tt_int_op(10, OP_EQ, ver1.major);
test_eq(1, ver1.minor); tt_int_op(1, OP_EQ, ver1.minor);
test_eq(0, ver1.micro); tt_int_op(0, OP_EQ, ver1.micro);
test_eq(0, ver1.patchlevel); tt_int_op(0, OP_EQ, ver1.patchlevel);
test_eq(VER_RELEASE, ver1.status); tt_int_op(VER_RELEASE, OP_EQ, ver1.status);
test_streq("", ver1.status_tag); tt_str_op("", OP_EQ, ver1.status_tag);
test_eq(0, tor_version_parse("5.99.999", &ver1)); tt_int_op(0, OP_EQ, tor_version_parse("5.99.999", &ver1));
test_eq(5, ver1.major); tt_int_op(5, OP_EQ, ver1.major);
test_eq(99, ver1.minor); tt_int_op(99, OP_EQ, ver1.minor);
test_eq(999, ver1.micro); tt_int_op(999, OP_EQ, ver1.micro);
test_eq(0, ver1.patchlevel); tt_int_op(0, OP_EQ, ver1.patchlevel);
test_eq(VER_RELEASE, ver1.status); tt_int_op(VER_RELEASE, OP_EQ, ver1.status);
test_streq("", ver1.status_tag); tt_str_op("", OP_EQ, ver1.status_tag);
test_eq(0, tor_version_parse("10.1-alpha", &ver1)); tt_int_op(0, OP_EQ, tor_version_parse("10.1-alpha", &ver1));
test_eq(10, ver1.major); tt_int_op(10, OP_EQ, ver1.major);
test_eq(1, ver1.minor); tt_int_op(1, OP_EQ, ver1.minor);
test_eq(0, ver1.micro); tt_int_op(0, OP_EQ, ver1.micro);
test_eq(0, ver1.patchlevel); tt_int_op(0, OP_EQ, ver1.patchlevel);
test_eq(VER_RELEASE, ver1.status); tt_int_op(VER_RELEASE, OP_EQ, ver1.status);
test_streq("alpha", ver1.status_tag); tt_str_op("alpha", OP_EQ, ver1.status_tag);
test_eq(0, tor_version_parse("2.1.700-alpha", &ver1)); tt_int_op(0, OP_EQ, tor_version_parse("2.1.700-alpha", &ver1));
test_eq(2, ver1.major); tt_int_op(2, OP_EQ, ver1.major);
test_eq(1, ver1.minor); tt_int_op(1, OP_EQ, ver1.minor);
test_eq(700, ver1.micro); tt_int_op(700, OP_EQ, ver1.micro);
test_eq(0, ver1.patchlevel); tt_int_op(0, OP_EQ, ver1.patchlevel);
test_eq(VER_RELEASE, ver1.status); tt_int_op(VER_RELEASE, OP_EQ, ver1.status);
test_streq("alpha", ver1.status_tag); tt_str_op("alpha", OP_EQ, ver1.status_tag);
test_eq(0, tor_version_parse("1.6.8-alpha-dev", &ver1)); tt_int_op(0, OP_EQ, tor_version_parse("1.6.8-alpha-dev", &ver1));
test_eq(1, ver1.major); tt_int_op(1, OP_EQ, ver1.major);
test_eq(6, ver1.minor); tt_int_op(6, OP_EQ, ver1.minor);
test_eq(8, ver1.micro); tt_int_op(8, OP_EQ, ver1.micro);
test_eq(0, ver1.patchlevel); tt_int_op(0, OP_EQ, ver1.patchlevel);
test_eq(VER_RELEASE, ver1.status); tt_int_op(VER_RELEASE, OP_EQ, ver1.status);
test_streq("alpha-dev", ver1.status_tag); tt_str_op("alpha-dev", OP_EQ, ver1.status_tag);
#define tt_versionstatus_op(vs1, op, vs2) \ #define tt_versionstatus_op(vs1, op, vs2) \
tt_assert_test_type(vs1,vs2,#vs1" "#op" "#vs2,version_status_t, \ tt_assert_test_type(vs1,vs2,#vs1" "#op" "#vs2,version_status_t, \