[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAGS_qxpEJMM5kAMn=+5Y+c2YvOEw_aBEkTW98ncv36gu4L84tQ@mail.gmail.com>
Date: Wed, 26 May 2021 11:58:07 -0700
From: Daniel Latypov <dlatypov@...gle.com>
To: David Gow <davidgow@...gle.com>
Cc: Brendan Higgins <brendanhiggins@...gle.com>,
Alan Maguire <alan.maguire@...cle.com>,
Shuah Khan <skhan@...uxfoundation.org>,
Marco Elver <elver@...gle.com>,
KUnit Development <kunit-dev@...glegroups.com>,
"open list:KERNEL SELFTEST FRAMEWORK"
<linux-kselftest@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 3/3] kunit: test: Add example_skip test suite which is
always skipped
On Wed, May 26, 2021 at 1:11 AM 'David Gow' via KUnit Development
<kunit-dev@...glegroups.com> wrote:
>
> Add a new KUnit test suite which contains tests which are always
> skipped. This is used as an example for how to write tests which are
> skipped, and to demonstrate the difference between kunit_skip() and
> kunit_mark_skipped().
>
> Because these tests do not pass (they're skipped), they are not enabled
> by default, or by the KUNIT_ALL_TESTS config option: they must be
> enabled explicitly by setting CONFIG_KUNIT_EXAMPLE_SKIP_TEST=y in either
> a .config or .kunitconfig file.
>
> Signed-off-by: David Gow <davidgow@...gle.com>
Reviewed-by: Daniel Latypov <dlatypov@...gle.com>
LGTM, two minor nits, and as noted elsewhere, I'd like it if we could
have this be in the normal example test.
But even if that doesn't happen, this seems fine to me.
> ---
> lib/kunit/Kconfig | 15 +++++++++
> lib/kunit/Makefile | 2 ++
> lib/kunit/kunit-example-skip-test.c | 52 +++++++++++++++++++++++++++++
> 3 files changed, 69 insertions(+)
> create mode 100644 lib/kunit/kunit-example-skip-test.c
>
> diff --git a/lib/kunit/Kconfig b/lib/kunit/Kconfig
> index 0b5dfb001bac..399fe5f789f7 100644
> --- a/lib/kunit/Kconfig
> +++ b/lib/kunit/Kconfig
> @@ -45,6 +45,21 @@ config KUNIT_EXAMPLE_TEST
> is intended for curious hackers who would like to understand how to
> use KUnit for kernel development.
>
> +config KUNIT_EXAMPLE_SKIP_TEST
> + tristate "Skipped test example for KUnit"
> + default n
> + help
> + Enables an example unit test that is always skipped.
> +
> + This test only exists to help new users understand what KUnit is and
> + how it is used. Please refer to the example test itself,
> + lib/kunit/example-test.c, for more information. This option is
> + intended for curious hackers who would like to understand how to use
> + KUnit for kernel development.
> +
> + Because this test does not pass, it is not enabled by
> + CONFIG_KUNIT_ALL_TESTS
> +
> config KUNIT_ALL_TESTS
> tristate "All KUnit tests with satisfied dependencies"
> help
> diff --git a/lib/kunit/Makefile b/lib/kunit/Makefile
> index c49f4ffb6273..8a99ff2f83bd 100644
> --- a/lib/kunit/Makefile
> +++ b/lib/kunit/Makefile
> @@ -18,3 +18,5 @@ obj-$(CONFIG_KUNIT_TEST) += string-stream-test.o
> endif
>
> obj-$(CONFIG_KUNIT_EXAMPLE_TEST) += kunit-example-test.o
> +
> +obj-$(CONFIG_KUNIT_EXAMPLE_SKIP_TEST) += kunit-example-skip-test.o
> diff --git a/lib/kunit/kunit-example-skip-test.c b/lib/kunit/kunit-example-skip-test.c
> new file mode 100644
> index 000000000000..5395ee0be485
> --- /dev/null
> +++ b/lib/kunit/kunit-example-skip-test.c
> @@ -0,0 +1,52 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Example KUnit test which is always skipped.
> + *
> + * Copyright (C) 2021, Google LLC.
> + * Author: David Gow <davidgow@...gle.com>
> + */
> +
> +#include <kunit/test.h>
> +
> +/*
> + * This test should always be skipped.
> + */
> +
> +static void example_skip_test(struct kunit *test)
> +{
> + /* This line should run */
> + kunit_log(KERN_INFO, test, "You should not see a line below.");
Btw, why not "kunit_info(test, ...)" ?
> +
> + /* Skip (and abort) the test */
> + kunit_skip(test, "this test should be skipped");
> +
> + /* This line should not execute */
> + kunit_log(KERN_INFO, test, "You should not see this line.");
Would it be more or less confusing to have
KUNIT_FAIL(test, "We should not get to this line")
maybe in addition or instead of this log?
> +}
> +
> +static void example_mark_skipped_test(struct kunit *test)
> +{
> + /* This line should run */
> + kunit_log(KERN_INFO, test, "You should see a line below.");
> +
> + /* Skip (but do not abort) the test */
> + kunit_mark_skipped(test, "this test should be skipped");
> +
> + /* This line should run */
> + kunit_log(KERN_INFO, test, "You should see this line.");
> +}
> +
> +static struct kunit_case example_skip_test_cases[] = {
> + KUNIT_CASE(example_skip_test),
> + KUNIT_CASE(example_mark_skipped_test),
> + {}
> +};
> +
> +static struct kunit_suite example_skip_test_suite = {
> + .name = "example_skip",
> + .test_cases = example_skip_test_cases,
> +};
> +
> +kunit_test_suites(&example_skip_test_suite);
> +
> +MODULE_LICENSE("GPL v2");
> --
> 2.31.1.818.g46aad6cb9e-goog
>
> --
> You received this message because you are subscribed to the Google Groups "KUnit Development" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to kunit-dev+unsubscribe@...glegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/kunit-dev/20210526081112.3652290-3-davidgow%40google.com.
Powered by blists - more mailing lists