sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.3.1' into release-0.3.1

This commit is contained in:
Nick Mathewson 2017-07-10 15:27:16 -04:00
parent 0be10dde5a 1ff98a7e89
commit 47982cdc09
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket22870 Normal file
View File

@ -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.

16
src/test/test_consdiff.c
View File

@ -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:
;