The wmfw error suites run wmfw_too_short_for_block_header(), wmfw_too_short_for_block_payload() and wmfw_block_payload_len_garbage() both with valid and with invalid block types by listing each twice with KUNIT_CASE_PARAM(), which names the case after the function. The two cases for each function share a name, so they cannot be told apart in the results.
Use KUNIT_CASE_PARAM_UNIQUE() for these entries so that each case is also named for the parameter generator it is run with, for example wmfw_too_short_for_block_header-wmfw_invalid_block_types_gen_params. Signed-off-by: Mark Brown <[email protected]> --- .../firmware/cirrus/test/cs_dsp_test_wmfw_error.c | 72 ++++++++++++++-------- 1 file changed, 48 insertions(+), 24 deletions(-) diff --git a/drivers/firmware/cirrus/test/cs_dsp_test_wmfw_error.c b/drivers/firmware/cirrus/test/cs_dsp_test_wmfw_error.c index b07978d90fa9..44f9c8d71326 100644 --- a/drivers/firmware/cirrus/test/cs_dsp_test_wmfw_error.c +++ b/drivers/firmware/cirrus/test/cs_dsp_test_wmfw_error.c @@ -1219,12 +1219,18 @@ static struct kunit_case cs_dsp_wmfw_err_test_cases_v0[] = { KUNIT_CASE(wmfw_err_bad_header_length), KUNIT_CASE(wmfw_err_bad_core_type), - KUNIT_CASE_PARAM(wmfw_too_short_for_block_header, wmfw_valid_block_types_adsp2_gen_params), - KUNIT_CASE_PARAM(wmfw_too_short_for_block_header, wmfw_invalid_block_types_gen_params), - KUNIT_CASE_PARAM(wmfw_too_short_for_block_payload, wmfw_valid_block_types_adsp2_gen_params), - KUNIT_CASE_PARAM(wmfw_too_short_for_block_payload, wmfw_invalid_block_types_gen_params), - KUNIT_CASE_PARAM(wmfw_block_payload_len_garbage, wmfw_valid_block_types_adsp2_gen_params), - KUNIT_CASE_PARAM(wmfw_block_payload_len_garbage, wmfw_invalid_block_types_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_too_short_for_block_header, + wmfw_valid_block_types_adsp2_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_too_short_for_block_header, + wmfw_invalid_block_types_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_too_short_for_block_payload, + wmfw_valid_block_types_adsp2_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_too_short_for_block_payload, + wmfw_invalid_block_types_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_block_payload_len_garbage, + wmfw_valid_block_types_adsp2_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_block_payload_len_garbage, + wmfw_invalid_block_types_gen_params), { } /* terminator */ }; @@ -1236,12 +1242,18 @@ static struct kunit_case cs_dsp_wmfw_err_test_cases_v1[] = { KUNIT_CASE(wmfw_err_bad_header_length), KUNIT_CASE(wmfw_err_bad_core_type), - KUNIT_CASE_PARAM(wmfw_too_short_for_block_header, wmfw_valid_block_types_adsp2_gen_params), - KUNIT_CASE_PARAM(wmfw_too_short_for_block_header, wmfw_invalid_block_types_gen_params), - KUNIT_CASE_PARAM(wmfw_too_short_for_block_payload, wmfw_valid_block_types_adsp2_gen_params), - KUNIT_CASE_PARAM(wmfw_too_short_for_block_payload, wmfw_invalid_block_types_gen_params), - KUNIT_CASE_PARAM(wmfw_block_payload_len_garbage, wmfw_valid_block_types_adsp2_gen_params), - KUNIT_CASE_PARAM(wmfw_block_payload_len_garbage, wmfw_invalid_block_types_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_too_short_for_block_header, + wmfw_valid_block_types_adsp2_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_too_short_for_block_header, + wmfw_invalid_block_types_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_too_short_for_block_payload, + wmfw_valid_block_types_adsp2_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_too_short_for_block_payload, + wmfw_invalid_block_types_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_block_payload_len_garbage, + wmfw_valid_block_types_adsp2_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_block_payload_len_garbage, + wmfw_invalid_block_types_gen_params), KUNIT_CASE(wmfw_too_short_for_alg_header), KUNIT_CASE(wmfw_v1_alg_name_unterminated), @@ -1258,12 +1270,18 @@ static struct kunit_case cs_dsp_wmfw_err_test_cases_v2[] = { KUNIT_CASE(wmfw_err_bad_header_length), KUNIT_CASE(wmfw_err_bad_core_type), - KUNIT_CASE_PARAM(wmfw_too_short_for_block_header, wmfw_valid_block_types_adsp2_gen_params), - KUNIT_CASE_PARAM(wmfw_too_short_for_block_header, wmfw_invalid_block_types_gen_params), - KUNIT_CASE_PARAM(wmfw_too_short_for_block_payload, wmfw_valid_block_types_adsp2_gen_params), - KUNIT_CASE_PARAM(wmfw_too_short_for_block_payload, wmfw_invalid_block_types_gen_params), - KUNIT_CASE_PARAM(wmfw_block_payload_len_garbage, wmfw_valid_block_types_adsp2_gen_params), - KUNIT_CASE_PARAM(wmfw_block_payload_len_garbage, wmfw_invalid_block_types_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_too_short_for_block_header, + wmfw_valid_block_types_adsp2_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_too_short_for_block_header, + wmfw_invalid_block_types_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_too_short_for_block_payload, + wmfw_valid_block_types_adsp2_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_too_short_for_block_payload, + wmfw_invalid_block_types_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_block_payload_len_garbage, + wmfw_valid_block_types_adsp2_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_block_payload_len_garbage, + wmfw_invalid_block_types_gen_params), KUNIT_CASE(wmfw_too_short_for_alg_header), KUNIT_CASE(wmfw_v2_alg_name_exceeds_block), @@ -1284,12 +1302,18 @@ static struct kunit_case cs_dsp_wmfw_err_test_cases_v3[] = { KUNIT_CASE(wmfw_err_bad_header_length), KUNIT_CASE(wmfw_err_bad_core_type), - KUNIT_CASE_PARAM(wmfw_too_short_for_block_header, wmfw_valid_block_types_halo_gen_params), - KUNIT_CASE_PARAM(wmfw_too_short_for_block_header, wmfw_invalid_block_types_gen_params), - KUNIT_CASE_PARAM(wmfw_too_short_for_block_payload, wmfw_valid_block_types_halo_gen_params), - KUNIT_CASE_PARAM(wmfw_too_short_for_block_payload, wmfw_invalid_block_types_gen_params), - KUNIT_CASE_PARAM(wmfw_block_payload_len_garbage, wmfw_valid_block_types_halo_gen_params), - KUNIT_CASE_PARAM(wmfw_block_payload_len_garbage, wmfw_invalid_block_types_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_too_short_for_block_header, + wmfw_valid_block_types_halo_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_too_short_for_block_header, + wmfw_invalid_block_types_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_too_short_for_block_payload, + wmfw_valid_block_types_halo_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_too_short_for_block_payload, + wmfw_invalid_block_types_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_block_payload_len_garbage, + wmfw_valid_block_types_halo_gen_params), + KUNIT_CASE_PARAM_UNIQUE(wmfw_block_payload_len_garbage, + wmfw_invalid_block_types_gen_params), KUNIT_CASE(wmfw_too_short_for_alg_header), KUNIT_CASE(wmfw_v2_alg_name_exceeds_block), -- 2.47.3
