kunit: fix assert_type for comparison macros
PATCH v2 1/1 kunit: fix assert_type for comparison macros
When replacing KUNIT_BINARY_*_MSG_ASSERTION() macros with KUNIT_BINARY_INT_ASSERTION(), the assert_type parameter was not always correctly transferred. Specifically, the following errors were introduced:
- KUNIT_EXPECT_LE_MSG() uses KUNIT_ASSERTION
- KUNIT_ASSERT_LT_MSG() uses KUNIT_EXPECTATION
- KUNIT_ASSERT_GT_MSG() uses KUNIT_EXPECTATION
A failing KUNIT_EXPECT_LE_MSG() test thus prevents further tests from running, while failing KUNIT_ASSERT_{LT,GT}_MSG() tests do not prevent further tests from running. This is contrary to the documentation, which states that failing KUNIT_EXPECT_* macros allow further tests to run, while failing KUNIT_ASSERT_* macros should prevent this.
Revert the KUNIT_{ASSERTION,EXPECTATION} switches to fix the behaviour for the affected macros.
--- include/kunit/test.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/kunit/test.h +3 -3
@@ -826,7 +826,7 @@ do { \#define KUNIT_EXPECT_LE_MSG (test, left, right, fmt, ...) \ KUNIT_BINARY_INT_ASSERTION(test, \ - KUNIT_ASSERTION, \ + KUNIT_EXPECTATION, \ left, <=, right, \ fmt, \ ##__VA_ARGS__)
@@ -1116,7 +1116,7 @@ do { \#define KUNIT_ASSERT_LT_MSG (test, left, right, fmt, ...) \ KUNIT_BINARY_INT_ASSERTION(test, \ - KUNIT_EXPECTATION, \ + KUNIT_ASSERTION, \ left, <, right, \ fmt, \ ##__VA_ARGS__)
@@ -1157,7 +1157,7 @@ do { \#define KUNIT_ASSERT_GT_MSG (test, left, right, fmt, ...) \ KUNIT_BINARY_INT_ASSERTION(test, \ - KUNIT_EXPECTATION, \ + KUNIT_ASSERTION, \ left, >, right, \ fmt, \ ##__VA_ARGS__)
Signature · 1 line
2.37.2
Quoted 15 lines · Sander Vanheule
When replacing KUNIT_BINARY_*_MSG_ASSERTION() macros with
KUNIT_BINARY_INT_ASSERTION(), theassert_typeparameter was not always correctly transferred. Specifically, the following errors were introduced:
-KUNIT_EXPECT_LE_MSG()usesKUNIT_ASSERTION
-KUNIT_ASSERT_LT_MSG()usesKUNIT_EXPECTATION
-KUNIT_ASSERT_GT_MSG()usesKUNIT_EXPECTATIONA failing
KUNIT_EXPECT_LE_MSG()test thus prevents further tests from running, while failing KUNIT_ASSERT_{LT,GT}_MSG() tests do not prevent further tests from running. This is contrary to the documentation, which states that failing KUNIT_EXPECT_* macros allow further tests to run, while failing KUNIT_ASSERT_* macros should prevent this.
Quoted 5 lines
Revert the KUNIT_{ASSERTION,EXPECTATION} switches to fix the behaviour for the affected macros.
Fixes 40f39777ce4f ("kunit: decrease macro layering for integer asserts")Signed-off-by Sander Vanheule <[email protected]>
Thanks for catching this!
I scanned over the file again looking for other errors. I think this patch fixes all of them.
Quoted 15 lines · Sander Vanheule
When replacing KUNIT_BINARY_*_MSG_ASSERTION() macros with
KUNIT_BINARY_INT_ASSERTION(), theassert_typeparameter was not always correctly transferred. Specifically, the following errors were introduced:
-KUNIT_EXPECT_LE_MSG()usesKUNIT_ASSERTION
-KUNIT_ASSERT_LT_MSG()usesKUNIT_EXPECTATION
-KUNIT_ASSERT_GT_MSG()usesKUNIT_EXPECTATIONA failing
KUNIT_EXPECT_LE_MSG()test thus prevents further tests from running, while failing KUNIT_ASSERT_{LT,GT}_MSG() tests do not prevent further tests from running. This is contrary to the documentation, which states that failing KUNIT_EXPECT_* macros allow further tests to run, while failing KUNIT_ASSERT_* macros should prevent this.
Quoted 5 lines
Revert the KUNIT_{ASSERTION,EXPECTATION} switches to fix the behaviour for the affected macros.
Fixes 40f39777ce4f ("kunit: decrease macro layering for integer asserts")Signed-off-by Sander Vanheule <[email protected]>
Thanks for fixing this!