From: Weijun Pan <wpan3636@gmail.com>
Cc: dev@dpdk.org, Weijun Pan <wpan36@wisc.edu>
Subject: [PATCH] test: parenthesize assertion macro parameters
Date: Sun, 19 Apr 2026 11:48:18 -0500 [thread overview]
Message-ID: <20260419164818.20609-1-wpan36@wisc.edu> (raw)
Some test assertion macros use parameters directly in expressions,
which can lead to unexpected evaluation due to operator precedence
after macro substitution.
Fix this by parenthesizing macro parameters and the resulting
expressions in rte_test.h and app/test/test.h.
Bugzilla ID: 1925
Signed-off-by: Weijun Pan <wpan36@wisc.edu>
---
app/test/test.h | 34 +++++++++++++++++-----------------
lib/eal/include/rte_test.h | 12 ++++++------
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/app/test/test.h b/app/test/test.h
index 1f12fc5397..b1174e4973 100644
--- a/app/test/test.h
+++ b/app/test/test.h
@@ -34,7 +34,7 @@
/* Compare two buffers (length in bytes) */
#define TEST_ASSERT_BUFFERS_ARE_EQUAL(a, b, len, msg, ...) do { \
- if (memcmp(a, b, len)) { \
+ if (memcmp((a), (b), (len))) { \
printf("TestCase %s() line %d failed: " \
msg "\n", __func__, __LINE__, ##__VA_ARGS__); \
TEST_TRACE_FAILURE(__FILE__, __LINE__, __func__); \
@@ -44,21 +44,21 @@
/* 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); \
+ 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; \
+ 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 = ((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) { \
@@ -74,16 +74,16 @@
#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; \
+ 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); \
+ 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); \
diff --git a/lib/eal/include/rte_test.h b/lib/eal/include/rte_test.h
index 62c8f165af..b73d4e75c2 100644
--- a/lib/eal/include/rte_test.h
+++ b/lib/eal/include/rte_test.h
@@ -26,21 +26,21 @@
} while (0)
#define RTE_TEST_ASSERT_EQUAL(a, b, msg, ...) \
- RTE_TEST_ASSERT(a == b, msg, ##__VA_ARGS__)
+ RTE_TEST_ASSERT(((a) == (b)), msg, ##__VA_ARGS__)
#define RTE_TEST_ASSERT_NOT_EQUAL(a, b, msg, ...) \
- RTE_TEST_ASSERT(a != b, msg, ##__VA_ARGS__)
+ RTE_TEST_ASSERT(((a) != (b)), msg, ##__VA_ARGS__)
#define RTE_TEST_ASSERT_SUCCESS(val, msg, ...) \
- RTE_TEST_ASSERT(val == 0, msg, ##__VA_ARGS__)
+ RTE_TEST_ASSERT(((val) == 0), msg, ##__VA_ARGS__)
#define RTE_TEST_ASSERT_FAIL(val, msg, ...) \
- RTE_TEST_ASSERT(val != 0, msg, ##__VA_ARGS__)
+ RTE_TEST_ASSERT(((val) != 0), msg, ##__VA_ARGS__)
#define RTE_TEST_ASSERT_NULL(val, msg, ...) \
- RTE_TEST_ASSERT(val == NULL, msg, ##__VA_ARGS__)
+ RTE_TEST_ASSERT(((val) == NULL), msg, ##__VA_ARGS__)
#define RTE_TEST_ASSERT_NOT_NULL(val, msg, ...) \
- RTE_TEST_ASSERT(val != NULL, msg, ##__VA_ARGS__)
+ RTE_TEST_ASSERT(((val) != NULL), msg, ##__VA_ARGS__)
#endif /* _RTE_TEST_H_ */
--
2.34.1
next reply other threads:[~2026-04-24 7:06 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-19 16:48 Weijun Pan [this message]
2026-04-24 9:48 ` [PATCH] test: parenthesize assertion macro parameters Marat Khalili
2026-04-24 11:12 ` Marat Khalili
2026-04-27 17:17 ` [PATCH v2] " Weijun Pan
2026-04-29 12:31 ` Marat Khalili
2026-04-29 14:26 ` Stephen Hemminger
2026-04-29 14:42 ` [PATCH 0/2] test: clean up assertion macros Stephen Hemminger
2026-04-29 14:42 ` [PATCH 1/2] test: use inline helpers in buffer comparison macros Stephen Hemminger
2026-04-30 12:33 ` Marat Khalili
2026-04-29 14:42 ` [PATCH 2/2] test: parenthesize assertion macro parameters Stephen Hemminger
2026-04-30 11:53 ` Marat Khalili
2026-05-01 16:34 ` [PATCH v2 0/2] test: cleanup assertion macros Stephen Hemminger
2026-05-01 16:34 ` [PATCH v2 1/2] test: use inline helpers in buffer comparison macros Stephen Hemminger
2026-05-01 16:34 ` [PATCH v2 2/2] test: parenthesize assertion macro parameters Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260419164818.20609-1-wpan36@wisc.edu \
--to=wpan3636@gmail.com \
--cc=dev@dpdk.org \
--cc=wpan36@wisc.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox