selftests/harness: pass variant to teardown
Subsystems (2)
PATCH 1/1 selftests/harness: pass variant to teardown
From: Willem de Bruijn <[email protected]>
FIXTURE_VARIANT data is passed to FIXTURE_SETUP and TEST_F as variant.
In some cases, the variant will change the setup, such that expections also change on teardown. Also pass variant to FIXTURE_TEARDOWN.
The new FIXTURE_TEARDOWN logic is identical to that in FIXTURE_SETUP, right above.
---
For one use of this see tentative tools/testing/selftests/filesystems/selectpoll.c kselftest at
https://github.com/wdebruij/linux-next-mirror/commit/12b4d183ac9140c13606376bb5c6714673daf754
--- tools/testing/selftests/kselftest_harness.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
tools/testing/selftests/kselftest_harness.h +7 -5
@@ -283,7 +283,9 @@#define FIXTURE_TEARDOWN (fixture_name) \ void fixture_name##_teardown( \ struct __test_metadata __attribute__((unused)) *_metadata, \ - FIXTURE_DATA(fixture_name) __attribute__((unused)) *self) + FIXTURE_DATA(fixture_name) __attribute__((unused)) *self, \ + const FIXTURE_VARIANT(fixture_name) \ + __attribute__((unused)) *variant)/** * FIXTURE_VARIANT(fixture_name) - Optionally called once per fixture
@@ -298,9 +300,9 @@* ... * }; * -* Defines type of constant parameters provided to FIXTURE_SETUP() and TEST_F() -* as *variant*. Variants allow the same tests to be run with different -* arguments. +* Defines type of constant parameters provided to FIXTURE_SETUP(), TEST_F() and +* FIXTURE_TEARDOWN as *variant*. Variants allow the same tests to be run with +* different arguments. */ #define FIXTURE_VARIANT (fixture_name) struct _fixture_variant_##fixture_name
@@ -382,7 +384,7 @@if (!_metadata->passed) \return ; \ fixture_name##_##test_name(_metadata, &self, variant->data); \ - fixture_name##_teardown(_metadata, &self); \ + fixture_name##_teardown(_metadata, &self, variant->data); \ } \ static struct __test_metadata \ _##fixture_name##_##test_name##_object = { \
Signature · 1 line
2.29.2.576.ga3fc446d84-goog
Quoted 11 lines · On Thu, 10 Dec 2020 18:10:10 -0500 Willem de Bruijn wrote:
From: Willem de Bruijn <[email protected]>
FIXTURE_VARIANTdata is passed toFIXTURE_SETUPandTEST_Fas variant.In some cases, the variant will change the setup, such that expections also change on teardown. Also pass variant to
FIXTURE_TEARDOWN.The new
FIXTURE_TEARDOWNlogic is identical to that inFIXTURE_SETUP, right above.Signed-off-by Willem de Bruijn <[email protected]>
IDK where we want to draw the line between reusing fixtures creating separate ones, some test cases are completely skipped in the example you provide. But in principle the harness change is fine by me:
Quoted 11 lines · Willem de Bruijn
From: Willem de Bruijn <[email protected]>
FIXTURE_VARIANTdata is passed toFIXTURE_SETUPandTEST_Fas variant.In some cases, the variant will change the setup, such that expections also change on teardown. Also pass variant to
FIXTURE_TEARDOWN.The new
FIXTURE_TEARDOWNlogic is identical to that inFIXTURE_SETUP, right above.Signed-off-by Willem de Bruijn <[email protected]>
Thanks! This was on my TODO list. :)
Signature · 1 line
Kees Cook
Quoted 9 lines · Kees Cook
Quoted 7 lines · Willem de Bruijn
From: Willem de Bruijn <[email protected]>
FIXTURE_VARIANTdata is passed toFIXTURE_SETUPandTEST_Fas variant.In some cases, the variant will change the setup, such that expections also change on teardown. Also pass variant to
FIXTURE_TEARDOWN.
Quoted 8 lines
Quoted 4 lines
The new
FIXTURE_TEARDOWNlogic is identical to that inFIXTURE_SETUP, right above.Signed-off-by Willem de Bruijn <[email protected]>Thanks! This was on my TODO list. :)
Acked-by Kees Cook <[email protected]>
Is this patch staged to be merged as is? Should I resubmit it?
Same question for another slightly older (2020-11-23) kselftest patch:
tools/testing: add kselftest shell helper library
https://patchwork.kernel.org/project/linux-kselftest/patch/[email protected]/
Thanks,
Willem
Hi Shuah,
Any news on these? I'd like to see them.
-Kees
Quoted 29 lines · Willem de Bruijn
Quoted 9 lines · Kees Cook
Quoted 7 lines · Willem de Bruijn
From: Willem de Bruijn <[email protected]>
FIXTURE_VARIANTdata is passed toFIXTURE_SETUPandTEST_Fas variant.In some cases, the variant will change the setup, such that expections also change on teardown. Also pass variant to
FIXTURE_TEARDOWN.Quoted 8 lines
Quoted 4 lines
The new
FIXTURE_TEARDOWNlogic is identical to that inFIXTURE_SETUP, right above.Signed-off-by Willem de Bruijn <[email protected]>Thanks! This was on my TODO list. :)
Acked-by Kees Cook <[email protected]>Is this patch staged to be merged as is? Should I resubmit it?
Same question for another slightly older (2020-11-23) kselftest patch:
tools/testing: add kselftest shell helper library
https://patchwork.kernel.org/project/linux-kselftest/patch/[email protected]/Thanks,
Willem
Signature · 1 line
Kees Cook