| Message ID | 20231121162457.17703-1-rf@opensource.cirrus.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 37f0d37ffce1d162bfaf7f426afca38f6fe15472 |
| Delegated to: | Brendan Higgins |
| Headers | show |
| Series | kunit: string-stream-test: Avoid cast warning when testing gfp_t flags | expand |
On Tue, Nov 21, 2023 at 11:25 AM Richard Fitzgerald <rf@opensource.cirrus.com> wrote: > > Passing a gfp_t to KUNIT_EXPECT_EQ() causes a cast warning: > > lib/kunit/string-stream-test.c:73:9: sparse: sparse: incorrect type in > initializer (different base types) expected long long right_value > got restricted gfp_t const __right > > Avoid this by testing stream->gfp for the expected value and passing the > boolean result of this comparison to KUNIT_EXPECT_TRUE(), as was already > done a few lines above in string_stream_managed_init_test(). > > Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> > Fixes: d1a0d699bfc0 ("kunit: string-stream: Add tests for freeing resource-managed string_stream") > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202311181918.0mpCu2Xh-lkp@intel.com/ Hello! This looks good to me. Thanks for fixing this! Reviewed-by: Rae Moar <rmoar@google.com> -Rae > --- > lib/kunit/string-stream-test.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lib/kunit/string-stream-test.c b/lib/kunit/string-stream-test.c > index 06822766f29a..03fb511826f7 100644 > --- a/lib/kunit/string-stream-test.c > +++ b/lib/kunit/string-stream-test.c > @@ -72,7 +72,7 @@ static void string_stream_unmanaged_init_test(struct kunit *test) > > KUNIT_EXPECT_EQ(test, stream->length, 0); > KUNIT_EXPECT_TRUE(test, list_empty(&stream->fragments)); > - KUNIT_EXPECT_EQ(test, stream->gfp, GFP_KERNEL); > + KUNIT_EXPECT_TRUE(test, (stream->gfp == GFP_KERNEL)); > KUNIT_EXPECT_FALSE(test, stream->append_newlines); > > KUNIT_EXPECT_TRUE(test, string_stream_is_empty(stream)); > -- > 2.30.2 >
On Wed, 22 Nov 2023 at 00:25, Richard Fitzgerald <rf@opensource.cirrus.com> wrote: > > Passing a gfp_t to KUNIT_EXPECT_EQ() causes a cast warning: > > lib/kunit/string-stream-test.c:73:9: sparse: sparse: incorrect type in > initializer (different base types) expected long long right_value > got restricted gfp_t const __right > > Avoid this by testing stream->gfp for the expected value and passing the > boolean result of this comparison to KUNIT_EXPECT_TRUE(), as was already > done a few lines above in string_stream_managed_init_test(). > > Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> > Fixes: d1a0d699bfc0 ("kunit: string-stream: Add tests for freeing resource-managed string_stream") > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202311181918.0mpCu2Xh-lkp@intel.com/ > --- Looks good to me. Reviewed-by: David Gow <davidgow@google.com> Cheers, -- David > lib/kunit/string-stream-test.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lib/kunit/string-stream-test.c b/lib/kunit/string-stream-test.c > index 06822766f29a..03fb511826f7 100644 > --- a/lib/kunit/string-stream-test.c > +++ b/lib/kunit/string-stream-test.c > @@ -72,7 +72,7 @@ static void string_stream_unmanaged_init_test(struct kunit *test) > > KUNIT_EXPECT_EQ(test, stream->length, 0); > KUNIT_EXPECT_TRUE(test, list_empty(&stream->fragments)); > - KUNIT_EXPECT_EQ(test, stream->gfp, GFP_KERNEL); > + KUNIT_EXPECT_TRUE(test, (stream->gfp == GFP_KERNEL)); > KUNIT_EXPECT_FALSE(test, stream->append_newlines); > > KUNIT_EXPECT_TRUE(test, string_stream_is_empty(stream)); > -- > 2.30.2 >
diff --git a/lib/kunit/string-stream-test.c b/lib/kunit/string-stream-test.c index 06822766f29a..03fb511826f7 100644 --- a/lib/kunit/string-stream-test.c +++ b/lib/kunit/string-stream-test.c @@ -72,7 +72,7 @@ static void string_stream_unmanaged_init_test(struct kunit *test) KUNIT_EXPECT_EQ(test, stream->length, 0); KUNIT_EXPECT_TRUE(test, list_empty(&stream->fragments)); - KUNIT_EXPECT_EQ(test, stream->gfp, GFP_KERNEL); + KUNIT_EXPECT_TRUE(test, (stream->gfp == GFP_KERNEL)); KUNIT_EXPECT_FALSE(test, stream->append_newlines); KUNIT_EXPECT_TRUE(test, string_stream_is_empty(stream));
Passing a gfp_t to KUNIT_EXPECT_EQ() causes a cast warning: lib/kunit/string-stream-test.c:73:9: sparse: sparse: incorrect type in initializer (different base types) expected long long right_value got restricted gfp_t const __right Avoid this by testing stream->gfp for the expected value and passing the boolean result of this comparison to KUNIT_EXPECT_TRUE(), as was already done a few lines above in string_stream_managed_init_test(). Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> Fixes: d1a0d699bfc0 ("kunit: string-stream: Add tests for freeing resource-managed string_stream") Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202311181918.0mpCu2Xh-lkp@intel.com/ --- lib/kunit/string-stream-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)