Commit 34c68f43 authored by Daniel Latypov's avatar Daniel Latypov Committed by Shuah Khan
Browse files

kunit: remove KUNIT_INIT_MEM_ASSERTION macro 



Commit 870f63b7cd78 ("kunit: eliminate KUNIT_INIT_*_ASSERT_STRUCT
macros") removed all the other macros of this type.

But it raced with commit b8a926be ("kunit: Introduce
KUNIT_EXPECT_MEMEQ and KUNIT_EXPECT_MEMNEQ macros"), which added another
instance.

Remove KUNIT_INIT_MEM_ASSERTION and just use the generic
KUNIT_INIT_ASSERT macro instead.
Rename the `size` arg to avoid conflicts by appending a "_" (like we did
in the previous commit).

Signed-off-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 a5b9abaa

include/kunit/assert.h

+0 −7
Original line number Diff line number Diff line
@@ -192,13 +192,6 @@ void kunit_binary_str_assert_format(const struct kunit_assert *assert, 
				    const struct va_format *message,

				    struct string_stream *stream);



#define KUNIT_INIT_MEM_ASSERT_STRUCT(text_, left_val, right_val, size_) {      \

	.text = text_,							       \

	.left_value = left_val,						       \

	.right_value = right_val,				       	       \

	.size = size_						       	       \

}



/**

 * struct kunit_mem_assert - An expectation/assertion that compares two

 *	memory blocks.

include/kunit/test.h

+6 −6
Original line number Diff line number Diff line
@@ -666,13 +666,13 @@ do { \ 
			    left,					       \

			    op,						       \

			    right,					       \

			    size,					       \

			    size_,					       \

			    fmt,					       \

			    ...)					       \

do {									       \

	const void *__left = (left);					       \

	const void *__right = (right);					       \

	const size_t __size = (size);					       \

	const size_t __size = (size_);					       \

	static const struct kunit_binary_assert_text __text = {		       \

		.operation = #op,					       \

		.left_text = #left,					       \
@@ -686,10 +686,10 @@ do { \ 
		      assert_type,					       \

		      kunit_mem_assert,					       \

		      kunit_mem_assert_format,				       \

		      KUNIT_INIT_MEM_ASSERT_STRUCT(&__text,		       \

						   __left,		       \

						   __right,		       \

						   __size),		       \

		      KUNIT_INIT_ASSERT(.text = &__text,		       \

					.left_value = __left,		       \

					.right_value = __right,		       \

					.size = __size),		       \

		      fmt,						       \

		      ##__VA_ARGS__);					       \

} while (0)