subsys/testsuite/ztest: change zassert_mem_equal to macro

This commit changes zassert_mem_equal as a macro instead
of a function implementation.
In the previous implementation when an assertion fails
the location inside ztest_assert.h file was displayed.
This modification displays the location where zassert_mem_equal
was used.

Signed-off-by: Radoslaw Koppel <radoslaw.koppel@nordicsemi.no>

subsys/testsuite/ztest/include/ztest_assert.h

@@ -164,8 +164,8 @@ static inline void z_zassert(int cond,
  * @param b Value to compare
  * @param msg Optional message to print if the assertion fails
  */
-#define zassert_equal_ptr(a, b, msg, ...)			     \
+#define zassert_equal_ptr(a, b, msg, ...)			    \
-	zassert((void *)(a) == (void *)(b), #a " not equal to  " #b, \
+	zassert((void *)(a) == (void *)(b), #a " not equal to " #b, \
 		msg, ##__VA_ARGS__)
 
 /**
@@ -184,16 +184,31 @@ static inline void z_zassert(int cond,
 /**
  * @brief Assert that 2 memory buffers have the same contents
  *
+ * This macro calls the final memory comparison assertion macro.
+ * Using double expansion allows providing some arguments by macros that
+ * would expand to more than one values (ANSI-C99 defines that all the macro
+ * arguments have to be expanded before macro call).
+ *
+ * @param ... Arguments, see @ref zassert_mem_equal__
+ *            for real arguments accepted.
+ */
+#define zassert_mem_equal(...) \
+	zassert_mem_equal__(__VA_ARGS__)
+
+/**
+ * @brief Internal assert that 2 memory buffers have the same contents
+ *
+ * @note This is internal macro, to be used as a second expansion.
+ *       See @ref zassert_mem_equal.
+ *
  * @param buf Buffer to compare
  * @param exp Buffer with expected contents
  * @param size Size of buffers
  * @param msg Optional message to print if the assertion fails
  */
-static inline void zassert_mem_equal(void *buf, void *exp, size_t size,
+#define zassert_mem_equal__(buf, exp, size, msg, ...)                        \
-				     const char *msg)
+	zassert_equal(memcmp(buf, exp, size), 0, #buf " not equal to " #exp, \
-{
+	msg, ##__VA_ARGS__)
-	zassert_equal(memcmp(buf, exp, size), 0, msg);
-}
 
 /**
  * @}

tests/ztest/base/src/main.c

@@ -20,11 +20,25 @@ static void test_assert_tests(void)
 	zassert_equal_ptr(NULL, NULL, NULL);
 }
 
+static void test_assert_mem_equal(void)
+{
+	static const uint32_t expected[4] = {
+		0x1234,
+		0x5678,
+		0x9ABC,
+		0xDEF0
+	};
+	uint32_t actual[4] = {0};
+	memcpy(actual, expected, sizeof(actual));
+	zassert_mem_equal(actual, expected, sizeof(expected), NULL);
+}
+
 void test_main(void)
 {
 	ztest_test_suite(framework_tests,
 			 ztest_unit_test(test_empty_test),
-			 ztest_unit_test(test_assert_tests)
+			 ztest_unit_test(test_assert_tests),
+			 ztest_unit_test(test_assert_mem_equal)
 			 );
 
 	ztest_run_test_suite(framework_tests);