commit 1ff98a7e891b7af4e2f4313c360f3cb320e632a7 Author: Matt Traudt <sirmatt@ksu.edu> Date: Mon Jul 10 12:19:33 2017 -0400 Make consdiff tests pass on OS X too --- changes/ticket22870 | 5 +++++ src/test/test_consdiff.c | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/changes/ticket22870 b/changes/ticket22870 new file mode 100644 index 0000000..07cc8a1 --- /dev/null +++ b/changes/ticket22870 @@ -0,0 +1,5 @@ + o Minor bugfixes (consensus diff): + - test_consdiff_base64cmp would fail on OS X because while OS X + follows the standard of (less than zero/zero/greater than zero), + it doesn't follow the convention of (-1/0/+1). Make the test + comply with the standard. Fixes bug 22870; bugfix on 0.3.1.1-alpha. diff --git a/src/test/test_consdiff.c b/src/test/test_consdiff.c index 23948d6..7cf8d6b 100644 --- a/src/test/test_consdiff.c +++ b/src/test/test_consdiff.c @@ -415,18 +415,18 @@ test_consdiff_base64cmp(void *arg) tt_int_op(-1, OP_EQ, base64cmp_wrapper("abcABC/+ ", "abcABC/+a")); /* Comparisons that would return differently with strcmp(). */ - tt_int_op(-1, OP_EQ, strcmp("/foo", "Afoo")); - tt_int_op(1, OP_EQ, base64cmp_wrapper("/foo", "Afoo")); - tt_int_op(1, OP_EQ, strcmp("Afoo", "0foo")); - tt_int_op(-1, OP_EQ, base64cmp_wrapper("Afoo", "0foo")); + tt_int_op(strcmp("/foo", "Afoo"), OP_LT, 0); + tt_int_op(base64cmp_wrapper("/foo", "Afoo"), OP_GT, 0); + tt_int_op(strcmp("Afoo", "0foo"), OP_GT, 0); + tt_int_op(base64cmp_wrapper("Afoo", "0foo"), OP_LT, 0); /* Comparisons that would return the same as with strcmp(). */ - tt_int_op(1, OP_EQ, strcmp("afoo", "Afoo")); - tt_int_op(1, OP_EQ, base64cmp_wrapper("afoo", "Afoo")); + tt_int_op(strcmp("afoo", "Afoo"), OP_GT, 0); + tt_int_op(base64cmp_wrapper("afoo", "Afoo"), OP_GT, 0); /* Different lengths */ - tt_int_op(-1, OP_EQ, base64cmp_wrapper("afoo", "afooo")); - tt_int_op(1, OP_EQ, base64cmp_wrapper("afooo", "afoo")); + tt_int_op(base64cmp_wrapper("afoo", "afooo"), OP_LT, 0); + tt_int_op(base64cmp_wrapper("afooo", "afoo"), OP_GT, 0); done: ;