On Wed, May 26, 2021 at 5:03 PM Marco Elver <elver@xxxxxxxxxx> wrote: > > On Wed, May 26, 2021 at 01:11AM -0700, David Gow wrote: > > The kunit_mark_skipped() macro marks the current test as "skipped", with > > the provided reason. The kunit_skip() macro will mark the test as > > skipped, and abort the test. > > > > The TAP specification supports this "SKIP directive" as a comment after > > the "ok" / "not ok" for a test. See the "Directives" section of the TAP > > spec for details: > > https://testanything.org/tap-specification.html#directives > > > > The 'success' field for KUnit tests is replaced with a kunit_status > > enum, which can be SUCCESS, FAILURE, or SKIPPED, combined with a > > 'status_comment' containing information on why a test was skipped. > > > > A new 'kunit_status' test suite is added to test this. > > > > Signed-off-by: David Gow <davidgow@xxxxxxxxxx> > [...] > > include/kunit/test.h | 68 ++++++++++++++++++++++++++++++++++++++---- > > lib/kunit/kunit-test.c | 42 +++++++++++++++++++++++++- > > lib/kunit/test.c | 51 ++++++++++++++++++------------- > > 3 files changed, 134 insertions(+), 27 deletions(-) > > Very nice, thank you. > > Tested-by: Marco Elver <elver@xxxxxxxxxx> > > , with the below changes to test_kasan.c. If you would like an immediate > user of kunit_skip(), please feel free to add the below patch to your > series. > > Thanks, > -- Marco > Thanks! I'll add this to the next version. Cheers, -- David > ------ >8 ------ > > From: Marco Elver <elver@xxxxxxxxxx> > Date: Wed, 26 May 2021 10:43:12 +0200 > Subject: [PATCH] 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@xxxxxxxxxx> > --- > lib/test_kasan.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/lib/test_kasan.c b/lib/test_kasan.c > index cacbbbdef768..0a2029d14c91 100644 > --- 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) > -- > 2.31.1.818.g46aad6cb9e-goog >
