kasan: test: make use of kunit_skip()

Make use of the recently added kunit_skip() to skip tests, as it permits
TAP parsers to recognize if a test was deliberately skipped.

Signed-off-by: Marco Elver <elver@google.com>
Signed-off-by: David Gow <davidgow@google.com>
Reviewed-by: Daniel Latypov <dlatypov@google.com>
Reviewed-by: Andrey Konovalov <andreyknvl@gmail.com>
Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

diff --git a/lib/test_kasan.c b/lib/test_kasan.c
index cacbbbdef768d056d010ebde123353192f502c50..0a2029d14c91af19ad2132aa99c0d6045897402e 100644 (file)
--- a/lib/test_kasan.c
+++ b/lib/test_kasan.c
@@ -111,17 +111,13 @@ static void kasan_test_exit(struct kunit *test)
 } while (0)
 
 #define KASAN_TEST_NEEDS_CONFIG_ON(test, config) do {                  \
-       if (!IS_ENABLED(config)) {                                      \
-               kunit_info((test), "skipping, " #config " required");   \
-               return;                                                 \
-       }                                                               \
+       if (!IS_ENABLED(config))                                        \
+               kunit_skip((test), "Test requires " #config "=y");      \
 } while (0)
 
 #define KASAN_TEST_NEEDS_CONFIG_OFF(test, config) do {                 \
-       if (IS_ENABLED(config)) {                                       \
-               kunit_info((test), "skipping, " #config " enabled");    \
-               return;                                                 \
-       }                                                               \
+       if (IS_ENABLED(config))                                         \
+               kunit_skip((test), "Test requires " #config "=n");      \
 } while (0)
 
 static void kmalloc_oob_right(struct kunit *test)