lkml.org 
[lkml]   [2020]   [Dec]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 049/152] kunit: fix display of failed expectations for strings
    Date
    From: Daniel Latypov <dlatypov@google.com>

    [ Upstream commit 3084db0e0d5076cd48408274ab0911cd3ccdae88 ]

    Currently the following expectation
    KUNIT_EXPECT_STREQ(test, "hi", "bye");
    will produce:
    Expected "hi" == "bye", but
    "hi" == 1625079497
    "bye" == 1625079500

    After this patch:
    Expected "hi" == "bye", but
    "hi" == hi
    "bye" == bye

    KUNIT_INIT_BINARY_STR_ASSERT_STRUCT() was written but just mistakenly
    not actually used by KUNIT_EXPECT_STREQ() and friends.

    Signed-off-by: Daniel Latypov <dlatypov@google.com>
    Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
    Tested-by: Brendan Higgins <brendanhiggins@google.com>
    Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/kunit/test.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/include/kunit/test.h b/include/kunit/test.h
    index 59f3144f009a5..b68ba33c16937 100644
    --- a/include/kunit/test.h
    +++ b/include/kunit/test.h
    @@ -1064,7 +1064,7 @@ do { \
    KUNIT_ASSERTION(test, \
    strcmp(__left, __right) op 0, \
    kunit_binary_str_assert, \
    - KUNIT_INIT_BINARY_ASSERT_STRUCT(test, \
    + KUNIT_INIT_BINARY_STR_ASSERT_STRUCT(test, \
    assert_type, \
    #op, \
    #left, \
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-01 10:40    [W:4.060 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site