app/test: add new buffer comparison macros

In order to compare buffers with length and offset in bits,
new macros have been created, which use the previous compare function
to compare full bytes and then, compare first and last bytes of
each buffer separately.

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Acked-by: Deepak Kumar Jain <deepak.k.jain@intel.com>

diff --git a/app/test/test.h b/app/test/test.h
index 8ddde23..81828be 100644 (file)
--- a/app/test/test.h
+++ b/app/test/test.h
@@ -65,7 +65,7 @@
                }                                                        \
 } while (0)
 
-
+/* Compare two buffers (length in bytes) */
 #define TEST_ASSERT_BUFFERS_ARE_EQUAL(a, b, len,  msg, ...) do {       \
        if (memcmp(a, b, len)) {                                        \
                printf("TestCase %s() line %d failed: "              \
@@ -75,6 +75,61 @@
        }                                                        \
 } while (0)
 
+/* Compare two buffers with offset (length and offset in bytes) */
+#define TEST_ASSERT_BUFFERS_ARE_EQUAL_OFFSET(a, b, len, off, msg, ...) do { \
+       const uint8_t *_a_with_off = (const uint8_t *)a + off;              \
+       const uint8_t *_b_with_off = (const uint8_t *)b + off;              \
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(_a_with_off, _b_with_off, len, msg);  \
+} while (0)
+
+/* Compare two buffers (length in bits) */
+#define TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(a, b, len, msg, ...) do {    \
+       uint8_t _last_byte_a, _last_byte_b;                       \
+       uint8_t _last_byte_mask, _last_byte_bits;                  \
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(a, b, (len >> 3), msg);     \
+       if (len % 8) {                                              \
+               _last_byte_bits = len % 8;                   \
+               _last_byte_mask = ~((1 << (8 - _last_byte_bits)) - 1); \
+               _last_byte_a = ((const uint8_t *)a)[len >> 3];            \
+               _last_byte_b = ((const uint8_t *)b)[len >> 3];            \
+               _last_byte_a &= _last_byte_mask;                     \
+               _last_byte_b &= _last_byte_mask;                    \
+               if (_last_byte_a != _last_byte_b) {                  \
+                       printf("TestCase %s() line %d failed: "              \
+                               msg "\n", __func__, __LINE__, ##__VA_ARGS__);\
+                       TEST_TRACE_FAILURE(__FILE__, __LINE__, __func__);    \
+                       return TEST_FAILED;                                  \
+               }                                                        \
+       }                                                            \
+} while (0)
+
+/* Compare two buffers with offset (length and offset in bits) */
+#define TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(a, b, len, off, msg, ...) do {        \
+       uint8_t _first_byte_a, _first_byte_b;                                 \
+       uint8_t _first_byte_mask, _first_byte_bits;                           \
+       uint32_t _len_without_first_byte = (off % 8) ?                       \
+                               len - (8 - (off % 8)) :                       \
+                               len;                                          \
+       uint32_t _off_in_bytes = (off % 8) ? (off >> 3) + 1 : (off >> 3);     \
+       const uint8_t *_a_with_off = (const uint8_t *)a + _off_in_bytes;      \
+       const uint8_t *_b_with_off = (const uint8_t *)b + _off_in_bytes;      \
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(_a_with_off, _b_with_off,           \
+                               _len_without_first_byte, msg);                \
+       if (off % 8) {                                                        \
+               _first_byte_bits = 8 - (off % 8);                             \
+               _first_byte_mask = (1 << _first_byte_bits) - 1;               \
+               _first_byte_a = *(_a_with_off - 1);                           \
+               _first_byte_b = *(_b_with_off - 1);                           \
+               _first_byte_a &= _first_byte_mask;                            \
+               _first_byte_b &= _first_byte_mask;                            \
+               if (_first_byte_a != _first_byte_b) {                         \
+                       printf("TestCase %s() line %d failed: "               \
+                               msg "\n", __func__, __LINE__, ##__VA_ARGS__); \
+                       TEST_TRACE_FAILURE(__FILE__, __LINE__, __func__);     \
+                       return TEST_FAILED;                                   \
+               }                                                             \
+       }                                                                     \
+} while (0)
 
 #define TEST_ASSERT_NOT_EQUAL(a, b, msg, ...) do {               \
                if (!(a != b)) {                                         \