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.

Fixes: 40f39777ce4f ("kunit: decrease macro layering for integer asserts")
Signed-off-by: Sander Vanheule <sander@svanheule.net>
Reviewed-by: Daniel Latypov <dlatypov@google.com>
Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

diff --git a/include/kunit/test.h b/include/kunit/test.h
index c958855681ccdd205bc8aa358aa0a9829d0cfede..840a2c375065b941a0043a660298102061bf18e7 100644 (file)
--- a/include/kunit/test.h
+++ b/include/kunit/test.h
@@ -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__)