Message ID | 20220208114541.2046909-2-ribalda@chromium.org (mailing list archive) |
---|---|
State | Accepted |
Commit | de82c15dc0a2d007b0aa02b832eef926d7135eb7 |
Delegated to: | Brendan Higgins |
Headers | show |
Series | [v4,1/6] kunit: Introduce _NULL and _NOT_NULL macros | expand |
On Tue, Feb 8, 2022 at 6:45 AM Ricardo Ribalda <ribalda@chromium.org> wrote: > > Replace the NULL checks with the more specific and idiomatic NULL macros. > > Reviewed-by: Daniel Latypov <dlatypov@google.com> > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
diff --git a/lib/kunit/kunit-example-test.c b/lib/kunit/kunit-example-test.c index 4bbf37c04eba..91b1df7f59ed 100644 --- a/lib/kunit/kunit-example-test.c +++ b/lib/kunit/kunit-example-test.c @@ -91,6 +91,8 @@ static void example_all_expect_macros_test(struct kunit *test) KUNIT_EXPECT_NOT_ERR_OR_NULL(test, test); KUNIT_EXPECT_PTR_EQ(test, NULL, NULL); KUNIT_EXPECT_PTR_NE(test, test, NULL); + KUNIT_EXPECT_NULL(test, NULL); + KUNIT_EXPECT_NOT_NULL(test, test); /* String assertions */ KUNIT_EXPECT_STREQ(test, "hi", "hi"); diff --git a/lib/kunit/kunit-test.c b/lib/kunit/kunit-test.c index 555601d17f79..8e2fe083a549 100644 --- a/lib/kunit/kunit-test.c +++ b/lib/kunit/kunit-test.c @@ -435,7 +435,7 @@ static void kunit_log_test(struct kunit *test) KUNIT_EXPECT_NOT_ERR_OR_NULL(test, strstr(suite.log, "along with this.")); #else - KUNIT_EXPECT_PTR_EQ(test, test->log, (char *)NULL); + KUNIT_EXPECT_NULL(test, test->log); #endif }