Commit 61888776 authored by Dan Carpenter's avatar Dan Carpenter Committed by Shuah Khan
Browse files

kunit: update NULL vs IS_ERR() tests 



The alloc_string_stream() functions were changed from returning NULL on
error to returning error pointers so these caller needs to be updated
as well.

Fixes: 78b1c658 ("kunit: string-stream: Simplify resource use")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarDaniel Latypov <dlatypov@google.com>
Reviewed-by: default avatarDavid Gow <davidgow@google.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 9abf2313

lib/kunit/string-stream.c

+2 −2
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ int string_stream_vadd(struct string_stream *stream, 
	frag_container = alloc_string_stream_fragment(stream->test,

						      len,

						      stream->gfp);

	if (!frag_container)

		return -ENOMEM;

	if (IS_ERR(frag_container))

		return PTR_ERR(frag_container);



	len = vsnprintf(frag_container->fragment, len, fmt, args);

	spin_lock(&stream->lock);

lib/kunit/test.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static void kunit_fail(struct kunit *test, const struct kunit_loc *loc, 
	kunit_set_failure(test);



	stream = alloc_string_stream(test, GFP_KERNEL);

	if (!stream) {

	if (IS_ERR(stream)) {

		WARN(true,

		     "Could not allocate stream to print failed assertion in %s:%d\n",

		     loc->file,