Commit 3747b5c0 authored by David Gow's avatar David Gow Committed by Shuah Khan

kunit: Assign strings to 'const char*' in STREQ assertions

Currently, the KUNIT_EXPECT_STREQ() and related macros assign both
string arguments to variables of their own type (via typeof()). This
seems to be to prevent the macro argument from being evaluated multiple
times.

However, this doesn't work if one of these is a fixed-length character
array, rather than a character pointer, as (for example) char[16] will
always allocate a new string.

By always using 'const char*' (the type strcmp expects), we're always
just taking a pointer to the string, which works even with character
arrays.
Signed-off-by: default avatarDavid Gow <davidgow@google.com>
Reviewed-by: default avatarDaniel Latypov <dlatypov@google.com>
Reviewed-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 6e62dfa6
...@@ -1128,8 +1128,8 @@ do { \ ...@@ -1128,8 +1128,8 @@ do { \
fmt, \ fmt, \
...) \ ...) \
do { \ do { \
typeof(left) __left = (left); \ const char *__left = (left); \
typeof(right) __right = (right); \ const char *__right = (right); \
\ \
KUNIT_ASSERTION(test, \ KUNIT_ASSERTION(test, \
strcmp(__left, __right) op 0, \ strcmp(__left, __right) op 0, \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment