2023-01-31 02:36:52

by David Gow

Subject: [PATCH] kunit: fix kunit_test_init_section_suites(...)

From: Brendan Higgins <[email protected]>

Looks like kunit_test_init_section_suites(...) was messed up in a merge
conflict. This fixes it.

kunit_test_init_section_suites(...) was not updated to avoid the extra
level of indirection when .kunit_test_suites was flattened. Given no-one
was actively using it, this went unnoticed for a long period of time.

Fixes: e5857d396f35 ("kunit: flatten kunit_suite*** to kunit_suite** in .kunit_test_suites")
Signed-off-by: Brendan Higgins <[email protected]>
Signed-off-by: David Gow <[email protected]>
---
include/kunit/test.h | 1 -
1 file changed, 1 deletion(-)

diff --git a/include/kunit/test.h b/include/kunit/test.h
index 87ea90576b50..716deaeef3dd 100644
--- a/include/kunit/test.h
+++ b/include/kunit/test.h
@@ -303,7 +303,6 @@ static inline int kunit_run_all_tests(void)
*/
#define kunit_test_init_section_suites(__suites...) \
__kunit_test_suites(CONCATENATE(__UNIQUE_ID(array), _probe), \
- CONCATENATE(__UNIQUE_ID(suites), _probe), \
##__suites)

#define kunit_test_init_section_suite(suite) \
--
2.39.1.456.gfc5497dd1b-goog

2023-01-31 13:27:12

by Martin Fernandez

Subject: Re: [PATCH] kunit: fix kunit_test_init_section_suites(...)

On 1/30/23, David Gow <[email protected]> wrote:
> From: Brendan Higgins <[email protected]>
>
> Looks like kunit_test_init_section_suites(...) was messed up in a merge
> conflict. This fixes it.
>
> kunit_test_init_section_suites(...) was not updated to avoid the extra
> level of indirection when .kunit_test_suites was flattened. Given no-one
> was actively using it, this went unnoticed for a long period of time.
>
> Fixes: e5857d396f35 ("kunit: flatten kunit_suite*** to kunit_suite** in
> .kunit_test_suites")
> Signed-off-by: Brendan Higgins <[email protected]>
> Signed-off-by: David Gow <[email protected]>
> ---
> include/kunit/test.h | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/include/kunit/test.h b/include/kunit/test.h
> index 87ea90576b50..716deaeef3dd 100644
> --- a/include/kunit/test.h
> +++ b/include/kunit/test.h
> @@ -303,7 +303,6 @@ static inline int kunit_run_all_tests(void)
> */
> #define kunit_test_init_section_suites(__suites...) \
> __kunit_test_suites(CONCATENATE(__UNIQUE_ID(array), _probe), \
> - CONCATENATE(__UNIQUE_ID(suites), _probe), \
> ##__suites)
>
> #define kunit_test_init_section_suite(suite) \
> --
> 2.39.1.456.gfc5497dd1b-goog
>
>

Tested-by: Martin Fernandez <[email protected]>

Thanks!