Re: [PATCH v9 1/2] kunit: Support for Parameterized Testing
On 12/1/20 4:31 PM, Marco Elver wrote: On Tue, 1 Dec 2020 at 23:28, Shuah Khan wrote: On 11/30/20 3:22 PM, Brendan Higgins wrote: On Mon, Nov 23, 2020 at 11:25 PM David Gow wrote: On Mon, Nov 23, 2020 at 9:08 PM Marco Elver wrote: On Tue, 17 Nov 2020 at 08:21, David Gow wrote: On Mon, Nov 16, 2020 at 1:41 PM Arpitha Raghunandan <98.a...@gmail.com> wrote: Implementation of support for parameterized testing in KUnit. This approach requires the creation of a test case using the KUNIT_CASE_PARAM() macro that accepts a generator function as input. This generator function should return the next parameter given the previous parameter in parameterized tests. It also provides a macro to generate common-case generators based on arrays. Generators may also optionally provide a human-readable description of parameters, which is displayed where available. Note, currently the result of each parameter run is displayed in diagnostic lines, and only the overall test case output summarizes TAP-compliant success or failure of all parameter runs. In future, when supported by kunit-tool, these can be turned into subsubtest outputs. Signed-off-by: Arpitha Raghunandan <98.a...@gmail.com> Co-developed-by: Marco Elver Signed-off-by: Marco Elver --- [Resending this because my email client re-defaulted to HTML! Aarrgh!] This looks good to me! I tested it in UML and x86-64 w/ KASAN, and both worked fine. Reviewed-by: David Gow Tested-by: David Gow Thank you! Thanks for sticking with this! Will these patches be landing in 5.11 or 5.12? I can't think of any reason not to have these in 5.11. We haven't started staging things in the kselftest/kunit branch for 5.11 yet, though. Patch 2 will probably need to be acked by Ted for ext4 first. Brendan, Shuah: can you make sure this doesn't get lost in patchwork? Looks good to me. I would definitely like to pick this up. But yeah, in order to pick up 2/2 we will need an ack from either Ted or Iurii. Ted seems to be busy right now, so I think I will just ask Shuah to go ahead and pick this patch up by itself and we or Ted can pick up patch 2/2 later. Cheers I am seeing ERROR: need consistent spacing around '*' (ctx:WxV) #272: FILE: include/kunit/test.h:1786: + typeof((array)[0]) *__next = prev ? ((typeof(__next)) prev) + 1 : (array);\ ^ Can you look into this and send v10? This is a false positive. I pointed this out here before: https://lkml.kernel.org/r/canpmjnnhpe6tyt0kmbccr-wfz1bxd8qnhiwegwndqsxrawm...@mail.gmail.com checkpatch.pl thinks this is a multiplication, but this is a pointer, so the spacing here is correct. Thank you for confirming. I will apply this. thanks, -- Shuah
Re: [PATCH v9 1/2] kunit: Support for Parameterized Testing
On Mon, Nov 30, 2020 at 02:22:22PM -0800, 'Brendan Higgins' via KUnit Development wrote: > > Looks good to me. I would definitely like to pick this up. But yeah, > in order to pick up 2/2 we will need an ack from either Ted or Iurii. > > Ted seems to be busy right now, so I think I will just ask Shuah to go > ahead and pick this patch up by itself and we or Ted can pick up patch > 2/2 later. I have been paying attention to this patch series, but I had presumed that this was much more of a kunit change than an ext4 change, and the critical bits was a review of the kunit infrastructure. I certainly have no objection to changing the ext4 test to use the new parameterized testing, and if you'd like me to give a quick review, I'll take a quick look. I assume, Brendan, that you've already tried doing a compile and run test of the patch series, so I'm not going to do that? - Ted
Re: [PATCH v9 1/2] kunit: Support for Parameterized Testing
On Tue, 1 Dec 2020 at 23:28, Shuah Khan wrote: > > On 11/30/20 3:22 PM, Brendan Higgins wrote: > > On Mon, Nov 23, 2020 at 11:25 PM David Gow wrote: > >> > >> On Mon, Nov 23, 2020 at 9:08 PM Marco Elver wrote: > >>> > >>> On Tue, 17 Nov 2020 at 08:21, David Gow wrote: > On Mon, Nov 16, 2020 at 1:41 PM Arpitha Raghunandan <98.a...@gmail.com> > wrote: > > > > Implementation of support for parameterized testing in KUnit. This > > approach requires the creation of a test case using the > > KUNIT_CASE_PARAM() macro that accepts a generator function as input. > > > > This generator function should return the next parameter given the > > previous parameter in parameterized tests. It also provides a macro to > > generate common-case generators based on arrays. Generators may also > > optionally provide a human-readable description of parameters, which is > > displayed where available. > > > > Note, currently the result of each parameter run is displayed in > > diagnostic lines, and only the overall test case output summarizes > > TAP-compliant success or failure of all parameter runs. In future, when > > supported by kunit-tool, these can be turned into subsubtest outputs. > > > > Signed-off-by: Arpitha Raghunandan <98.a...@gmail.com> > > Co-developed-by: Marco Elver > > Signed-off-by: Marco Elver > > --- > [Resending this because my email client re-defaulted to HTML! Aarrgh!] > > This looks good to me! I tested it in UML and x86-64 w/ KASAN, and > both worked fine. > > Reviewed-by: David Gow > Tested-by: David Gow > >>> > >>> Thank you! > >>> > Thanks for sticking with this! > >>> > >>> Will these patches be landing in 5.11 or 5.12? > >>> > >> > >> I can't think of any reason not to have these in 5.11. We haven't > >> started staging things in the kselftest/kunit branch for 5.11 yet, > >> though. > >> > >> Patch 2 will probably need to be acked by Ted for ext4 first. > >> > >> Brendan, Shuah: can you make sure this doesn't get lost in patchwork? > > > > Looks good to me. I would definitely like to pick this up. But yeah, > > in order to pick up 2/2 we will need an ack from either Ted or Iurii. > > > > Ted seems to be busy right now, so I think I will just ask Shuah to go > > ahead and pick this patch up by itself and we or Ted can pick up patch > > 2/2 later. > > > > Cheers > > > > I am seeing > > ERROR: need consistent spacing around '*' (ctx:WxV) > #272: FILE: include/kunit/test.h:1786: > + typeof((array)[0]) *__next = prev ? ((typeof(__next)) prev) + > 1 : > (array);\ >^ > > Can you look into this and send v10? This is a false positive. I pointed this out here before: https://lkml.kernel.org/r/canpmjnnhpe6tyt0kmbccr-wfz1bxd8qnhiwegwndqsxrawm...@mail.gmail.com checkpatch.pl thinks this is a multiplication, but this is a pointer, so the spacing here is correct. Thanks, -- Marco > thanks, > -- Shuah
Re: [PATCH v9 1/2] kunit: Support for Parameterized Testing
On 11/30/20 3:22 PM, Brendan Higgins wrote: On Mon, Nov 23, 2020 at 11:25 PM David Gow wrote: On Mon, Nov 23, 2020 at 9:08 PM Marco Elver wrote: On Tue, 17 Nov 2020 at 08:21, David Gow wrote: On Mon, Nov 16, 2020 at 1:41 PM Arpitha Raghunandan <98.a...@gmail.com> wrote: Implementation of support for parameterized testing in KUnit. This approach requires the creation of a test case using the KUNIT_CASE_PARAM() macro that accepts a generator function as input. This generator function should return the next parameter given the previous parameter in parameterized tests. It also provides a macro to generate common-case generators based on arrays. Generators may also optionally provide a human-readable description of parameters, which is displayed where available. Note, currently the result of each parameter run is displayed in diagnostic lines, and only the overall test case output summarizes TAP-compliant success or failure of all parameter runs. In future, when supported by kunit-tool, these can be turned into subsubtest outputs. Signed-off-by: Arpitha Raghunandan <98.a...@gmail.com> Co-developed-by: Marco Elver Signed-off-by: Marco Elver --- [Resending this because my email client re-defaulted to HTML! Aarrgh!] This looks good to me! I tested it in UML and x86-64 w/ KASAN, and both worked fine. Reviewed-by: David Gow Tested-by: David Gow Thank you! Thanks for sticking with this! Will these patches be landing in 5.11 or 5.12? I can't think of any reason not to have these in 5.11. We haven't started staging things in the kselftest/kunit branch for 5.11 yet, though. Patch 2 will probably need to be acked by Ted for ext4 first. Brendan, Shuah: can you make sure this doesn't get lost in patchwork? Looks good to me. I would definitely like to pick this up. But yeah, in order to pick up 2/2 we will need an ack from either Ted or Iurii. Ted seems to be busy right now, so I think I will just ask Shuah to go ahead and pick this patch up by itself and we or Ted can pick up patch 2/2 later. Cheers I am seeing ERROR: need consistent spacing around '*' (ctx:WxV) #272: FILE: include/kunit/test.h:1786: + typeof((array)[0]) *__next = prev ? ((typeof(__next)) prev) + 1 : (array); \ ^ Can you look into this and send v10? thanks, -- Shuah
Re: [PATCH v9 1/2] kunit: Support for Parameterized Testing
On Mon, Nov 23, 2020 at 11:25 PM David Gow wrote: > > On Mon, Nov 23, 2020 at 9:08 PM Marco Elver wrote: > > > > On Tue, 17 Nov 2020 at 08:21, David Gow wrote: > > > On Mon, Nov 16, 2020 at 1:41 PM Arpitha Raghunandan <98.a...@gmail.com> > > > wrote: > > > > > > > > Implementation of support for parameterized testing in KUnit. This > > > > approach requires the creation of a test case using the > > > > KUNIT_CASE_PARAM() macro that accepts a generator function as input. > > > > > > > > This generator function should return the next parameter given the > > > > previous parameter in parameterized tests. It also provides a macro to > > > > generate common-case generators based on arrays. Generators may also > > > > optionally provide a human-readable description of parameters, which is > > > > displayed where available. > > > > > > > > Note, currently the result of each parameter run is displayed in > > > > diagnostic lines, and only the overall test case output summarizes > > > > TAP-compliant success or failure of all parameter runs. In future, when > > > > supported by kunit-tool, these can be turned into subsubtest outputs. > > > > > > > > Signed-off-by: Arpitha Raghunandan <98.a...@gmail.com> > > > > Co-developed-by: Marco Elver > > > > Signed-off-by: Marco Elver > > > > --- > > > [Resending this because my email client re-defaulted to HTML! Aarrgh!] > > > > > > This looks good to me! I tested it in UML and x86-64 w/ KASAN, and > > > both worked fine. > > > > > > Reviewed-by: David Gow > > > Tested-by: David Gow > > > > Thank you! > > > > > Thanks for sticking with this! > > > > Will these patches be landing in 5.11 or 5.12? > > > > I can't think of any reason not to have these in 5.11. We haven't > started staging things in the kselftest/kunit branch for 5.11 yet, > though. > > Patch 2 will probably need to be acked by Ted for ext4 first. > > Brendan, Shuah: can you make sure this doesn't get lost in patchwork? Looks good to me. I would definitely like to pick this up. But yeah, in order to pick up 2/2 we will need an ack from either Ted or Iurii. Ted seems to be busy right now, so I think I will just ask Shuah to go ahead and pick this patch up by itself and we or Ted can pick up patch 2/2 later. Cheers
Re: [PATCH v9 1/2] kunit: Support for Parameterized Testing
On Tue, 24 Nov 2020 at 08:25, David Gow wrote: > > On Mon, Nov 23, 2020 at 9:08 PM Marco Elver wrote: > > > > On Tue, 17 Nov 2020 at 08:21, David Gow wrote: > > > On Mon, Nov 16, 2020 at 1:41 PM Arpitha Raghunandan <98.a...@gmail.com> > > > wrote: > > > > > > > > Implementation of support for parameterized testing in KUnit. This > > > > approach requires the creation of a test case using the > > > > KUNIT_CASE_PARAM() macro that accepts a generator function as input. > > > > > > > > This generator function should return the next parameter given the > > > > previous parameter in parameterized tests. It also provides a macro to > > > > generate common-case generators based on arrays. Generators may also > > > > optionally provide a human-readable description of parameters, which is > > > > displayed where available. > > > > > > > > Note, currently the result of each parameter run is displayed in > > > > diagnostic lines, and only the overall test case output summarizes > > > > TAP-compliant success or failure of all parameter runs. In future, when > > > > supported by kunit-tool, these can be turned into subsubtest outputs. > > > > > > > > Signed-off-by: Arpitha Raghunandan <98.a...@gmail.com> > > > > Co-developed-by: Marco Elver > > > > Signed-off-by: Marco Elver > > > > --- > > > [Resending this because my email client re-defaulted to HTML! Aarrgh!] > > > > > > This looks good to me! I tested it in UML and x86-64 w/ KASAN, and > > > both worked fine. > > > > > > Reviewed-by: David Gow > > > Tested-by: David Gow > > > > Thank you! > > > > > Thanks for sticking with this! > > > > Will these patches be landing in 5.11 or 5.12? > > > > I can't think of any reason not to have these in 5.11. We haven't > started staging things in the kselftest/kunit branch for 5.11 yet, > though. > > Patch 2 will probably need to be acked by Ted for ext4 first. Patch 2 had already had 1 Reviewed-by on v3 that got lost. The core bits of that test haven't changed since then, but I can't tell if it needs a re-review. https://lkml.kernel.org/r/caaxuy3o9xe-atk0mja6qxlncuhmmvf4pr7hsansqaoux71r...@mail.gmail.com Thanks, -- Marco > Brendan, Shuah: can you make sure this doesn't get lost in patchwork? > > Cheers, > -- David > > > > -- David > > > > Thanks, > > -- Marco
Re: [PATCH v9 1/2] kunit: Support for Parameterized Testing
On Mon, Nov 23, 2020 at 9:08 PM Marco Elver wrote: > > On Tue, 17 Nov 2020 at 08:21, David Gow wrote: > > On Mon, Nov 16, 2020 at 1:41 PM Arpitha Raghunandan <98.a...@gmail.com> > > wrote: > > > > > > Implementation of support for parameterized testing in KUnit. This > > > approach requires the creation of a test case using the > > > KUNIT_CASE_PARAM() macro that accepts a generator function as input. > > > > > > This generator function should return the next parameter given the > > > previous parameter in parameterized tests. It also provides a macro to > > > generate common-case generators based on arrays. Generators may also > > > optionally provide a human-readable description of parameters, which is > > > displayed where available. > > > > > > Note, currently the result of each parameter run is displayed in > > > diagnostic lines, and only the overall test case output summarizes > > > TAP-compliant success or failure of all parameter runs. In future, when > > > supported by kunit-tool, these can be turned into subsubtest outputs. > > > > > > Signed-off-by: Arpitha Raghunandan <98.a...@gmail.com> > > > Co-developed-by: Marco Elver > > > Signed-off-by: Marco Elver > > > --- > > [Resending this because my email client re-defaulted to HTML! Aarrgh!] > > > > This looks good to me! I tested it in UML and x86-64 w/ KASAN, and > > both worked fine. > > > > Reviewed-by: David Gow > > Tested-by: David Gow > > Thank you! > > > Thanks for sticking with this! > > Will these patches be landing in 5.11 or 5.12? > I can't think of any reason not to have these in 5.11. We haven't started staging things in the kselftest/kunit branch for 5.11 yet, though. Patch 2 will probably need to be acked by Ted for ext4 first. Brendan, Shuah: can you make sure this doesn't get lost in patchwork? Cheers, -- David > > -- David > > Thanks, > -- Marco
Re: [PATCH v9 1/2] kunit: Support for Parameterized Testing
On Tue, 17 Nov 2020 at 08:21, David Gow wrote: > On Mon, Nov 16, 2020 at 1:41 PM Arpitha Raghunandan <98.a...@gmail.com> wrote: > > > > Implementation of support for parameterized testing in KUnit. This > > approach requires the creation of a test case using the > > KUNIT_CASE_PARAM() macro that accepts a generator function as input. > > > > This generator function should return the next parameter given the > > previous parameter in parameterized tests. It also provides a macro to > > generate common-case generators based on arrays. Generators may also > > optionally provide a human-readable description of parameters, which is > > displayed where available. > > > > Note, currently the result of each parameter run is displayed in > > diagnostic lines, and only the overall test case output summarizes > > TAP-compliant success or failure of all parameter runs. In future, when > > supported by kunit-tool, these can be turned into subsubtest outputs. > > > > Signed-off-by: Arpitha Raghunandan <98.a...@gmail.com> > > Co-developed-by: Marco Elver > > Signed-off-by: Marco Elver > > --- > [Resending this because my email client re-defaulted to HTML! Aarrgh!] > > This looks good to me! I tested it in UML and x86-64 w/ KASAN, and > both worked fine. > > Reviewed-by: David Gow > Tested-by: David Gow Thank you! > Thanks for sticking with this! Will these patches be landing in 5.11 or 5.12? > -- David Thanks, -- Marco
Re: [PATCH v9 1/2] kunit: Support for Parameterized Testing
On Mon, Nov 16, 2020 at 1:41 PM Arpitha Raghunandan <98.a...@gmail.com> wrote: > > Implementation of support for parameterized testing in KUnit. This > approach requires the creation of a test case using the > KUNIT_CASE_PARAM() macro that accepts a generator function as input. > > This generator function should return the next parameter given the > previous parameter in parameterized tests. It also provides a macro to > generate common-case generators based on arrays. Generators may also > optionally provide a human-readable description of parameters, which is > displayed where available. > > Note, currently the result of each parameter run is displayed in > diagnostic lines, and only the overall test case output summarizes > TAP-compliant success or failure of all parameter runs. In future, when > supported by kunit-tool, these can be turned into subsubtest outputs. > > Signed-off-by: Arpitha Raghunandan <98.a...@gmail.com> > Co-developed-by: Marco Elver > Signed-off-by: Marco Elver > --- [Resending this because my email client re-defaulted to HTML! Aarrgh!] This looks good to me! I tested it in UML and x86-64 w/ KASAN, and both worked fine. Reviewed-by: David Gow Tested-by: David Gow Thanks for sticking with this! -- David
Re: [PATCH v9 1/2] kunit: Support for Parameterized Testing
On Mon, 16 Nov 2020 at 06:41, Arpitha Raghunandan <98.a...@gmail.com> wrote: > > Implementation of support for parameterized testing in KUnit. This > approach requires the creation of a test case using the > KUNIT_CASE_PARAM() macro that accepts a generator function as input. > > This generator function should return the next parameter given the > previous parameter in parameterized tests. It also provides a macro to > generate common-case generators based on arrays. Generators may also > optionally provide a human-readable description of parameters, which is > displayed where available. > > Note, currently the result of each parameter run is displayed in > diagnostic lines, and only the overall test case output summarizes > TAP-compliant success or failure of all parameter runs. In future, when > supported by kunit-tool, these can be turned into subsubtest outputs. > > Signed-off-by: Arpitha Raghunandan <98.a...@gmail.com> > Co-developed-by: Marco Elver > Signed-off-by: Marco Elver This and patch 2/2 look good to me. Thank you! -- Marco > --- > Changes v8->v9: > - No change to this patch of the patch series > > Changes v7->v8: > - Increase KUNIT_PARAM_DESC_SIZE to 128 > - Format pointer style appropriately > > Changes v6->v7: > - Clarify commit message. > - Introduce ability to optionally generate descriptions for parameters; > if no description is provided, we'll still print 'param-N'. > - Change diagnostic line format to: > # : N - [] > > Changes v5->v6: > - Fix alignment to maintain consistency > > Changes v4->v5: > - Update kernel-doc comments. > - Use const void* for generator return and prev value types. > - Add kernel-doc comment for KUNIT_ARRAY_PARAM. > - Rework parameterized test case execution strategy: each parameter is > executed > as if it was its own test case, with its own test initialization and cleanup > (init and exit are called, etc.). However, we cannot add new test cases per > TAP > protocol once we have already started execution. Instead, log the result of > each parameter run as a diagnostic comment. > > Changes v3->v4: > - Rename kunit variables > - Rename generator function helper macro > - Add documentation for generator approach > - Display test case name in case of failure along with param index > > Changes v2->v3: > - Modifictaion of generator macro and method > > Changes v1->v2: > - Use of a generator method to access test case parameters > Changes v6->v7: > - Clarify commit message. > - Introduce ability to optionally generate descriptions for parameters; > if no description is provided, we'll still print 'param-N'. > - Change diagnostic line format to: > # : N - [] > - Before execution of parameterized test case, count number of > parameters and display number of parameters. Currently also as a > diagnostic line, but this may be used in future to generate a subsubtest > plan. A requirement of this change is that generators must generate a > deterministic number of parameters. > > Changes v5->v6: > - Fix alignment to maintain consistency > > Changes v4->v5: > - Update kernel-doc comments. > - Use const void* for generator return and prev value types. > - Add kernel-doc comment for KUNIT_ARRAY_PARAM. > - Rework parameterized test case execution strategy: each parameter is > executed > as if it was its own test case, with its own test initialization and cleanup > (init and exit are called, etc.). However, we cannot add new test cases per > TAP > protocol once we have already started execution. Instead, log the result of > each parameter run as a diagnostic comment. > > Changes v3->v4: > - Rename kunit variables > - Rename generator function helper macro > - Add documentation for generator approach > - Display test case name in case of failure along with param index > > Changes v2->v3: > - Modifictaion of generator macro and method > > Changes v1->v2: > - Use of a generator method to access test case parameters > > include/kunit/test.h | 51 ++ > lib/kunit/test.c | 59 ++-- > 2 files changed, 97 insertions(+), 13 deletions(-) > > diff --git a/include/kunit/test.h b/include/kunit/test.h > index db1b0ae666c4..27b42a008c7a 100644 > --- a/include/kunit/test.h > +++ b/include/kunit/test.h > @@ -94,6 +94,9 @@ struct kunit; > /* Size of log associated with test. */ > #define KUNIT_LOG_SIZE 512 > > +/* Maximum size of parameter description string. */ > +#define KUNIT_PARAM_DESC_SIZE 128 > + > /* > * TAP specifies subtest stream indentation of 4 spaces, 8 spaces for a > * sub-subtest. See the "Subtests" section in > @@ -107,6 +110,7 @@ struct kunit; > * > * @run_case: the function representing the actual test case. > * @name: the name of the test case. > + * @generate_params: the generator function for parameterized tests. > * > * A test case is a function with the signature, > * ``void (*)(struct kunit *)`` > @@ -141,6 +145,7
[PATCH v9 1/2] kunit: Support for Parameterized Testing
Implementation of support for parameterized testing in KUnit. This
approach requires the creation of a test case using the
KUNIT_CASE_PARAM() macro that accepts a generator function as input.
This generator function should return the next parameter given the
previous parameter in parameterized tests. It also provides a macro to
generate common-case generators based on arrays. Generators may also
optionally provide a human-readable description of parameters, which is
displayed where available.
Note, currently the result of each parameter run is displayed in
diagnostic lines, and only the overall test case output summarizes
TAP-compliant success or failure of all parameter runs. In future, when
supported by kunit-tool, these can be turned into subsubtest outputs.
Signed-off-by: Arpitha Raghunandan <98.a...@gmail.com>
Co-developed-by: Marco Elver
Signed-off-by: Marco Elver
---
Changes v8->v9:
- No change to this patch of the patch series
Changes v7->v8:
- Increase KUNIT_PARAM_DESC_SIZE to 128
- Format pointer style appropriately
Changes v6->v7:
- Clarify commit message.
- Introduce ability to optionally generate descriptions for parameters;
if no description is provided, we'll still print 'param-N'.
- Change diagnostic line format to:
# : N - []
Changes v5->v6:
- Fix alignment to maintain consistency
Changes v4->v5:
- Update kernel-doc comments.
- Use const void* for generator return and prev value types.
- Add kernel-doc comment for KUNIT_ARRAY_PARAM.
- Rework parameterized test case execution strategy: each parameter is executed
as if it was its own test case, with its own test initialization and cleanup
(init and exit are called, etc.). However, we cannot add new test cases per
TAP
protocol once we have already started execution. Instead, log the result of
each parameter run as a diagnostic comment.
Changes v3->v4:
- Rename kunit variables
- Rename generator function helper macro
- Add documentation for generator approach
- Display test case name in case of failure along with param index
Changes v2->v3:
- Modifictaion of generator macro and method
Changes v1->v2:
- Use of a generator method to access test case parameters
Changes v6->v7:
- Clarify commit message.
- Introduce ability to optionally generate descriptions for parameters;
if no description is provided, we'll still print 'param-N'.
- Change diagnostic line format to:
# : N - []
- Before execution of parameterized test case, count number of
parameters and display number of parameters. Currently also as a
diagnostic line, but this may be used in future to generate a subsubtest
plan. A requirement of this change is that generators must generate a
deterministic number of parameters.
Changes v5->v6:
- Fix alignment to maintain consistency
Changes v4->v5:
- Update kernel-doc comments.
- Use const void* for generator return and prev value types.
- Add kernel-doc comment for KUNIT_ARRAY_PARAM.
- Rework parameterized test case execution strategy: each parameter is executed
as if it was its own test case, with its own test initialization and cleanup
(init and exit are called, etc.). However, we cannot add new test cases per
TAP
protocol once we have already started execution. Instead, log the result of
each parameter run as a diagnostic comment.
Changes v3->v4:
- Rename kunit variables
- Rename generator function helper macro
- Add documentation for generator approach
- Display test case name in case of failure along with param index
Changes v2->v3:
- Modifictaion of generator macro and method
Changes v1->v2:
- Use of a generator method to access test case parameters
include/kunit/test.h | 51 ++
lib/kunit/test.c | 59 ++--
2 files changed, 97 insertions(+), 13 deletions(-)
diff --git a/include/kunit/test.h b/include/kunit/test.h
index db1b0ae666c4..27b42a008c7a 100644
--- a/include/kunit/test.h
+++ b/include/kunit/test.h
@@ -94,6 +94,9 @@ struct kunit;
/* Size of log associated with test. */
#define KUNIT_LOG_SIZE 512
+/* Maximum size of parameter description string. */
+#define KUNIT_PARAM_DESC_SIZE 128
+
/*
* TAP specifies subtest stream indentation of 4 spaces, 8 spaces for a
* sub-subtest. See the "Subtests" section in
@@ -107,6 +110,7 @@ struct kunit;
*
* @run_case: the function representing the actual test case.
* @name: the name of the test case.
+ * @generate_params: the generator function for parameterized tests.
*
* A test case is a function with the signature,
* ``void (*)(struct kunit *)``
@@ -141,6 +145,7 @@ struct kunit;
struct kunit_case {
void (*run_case)(struct kunit *test);
const char *name;
+ const void* (*generate_params)(const void *prev, char *desc);
/* private: internal use only. */
bool success;
@@ -163,6 +168,27 @@ static inline char *kunit_status_to_string(bool status)
*/
#define KUNIT_CASE(test_name) { .run_case
