* [PATCH] selftests/resctrl: Use correct exit code when tests fail
@ 2023-03-09 14:57 Peter Newman
2023-03-15 1:25 ` Shaopeng Tan (Fujitsu)
2023-03-17 17:49 ` Reinette Chatre
0 siblings, 2 replies; 3+ messages in thread
From: Peter Newman @ 2023-03-09 14:57 UTC (permalink / raw)
To: Fenghua Yu, Reinette Chatre
Cc: Shuah Khan, Shaopeng Tan, linux-kernel, linux-kselftest, eranian,
Peter Newman
Use ksft_finished() after running tests so that resctrl_tests doesn't
return exit code 0 when tests fail.
Consequently, report the MBA and MBM tests as skipped when running on
non-Intel hardware, otherwise resctrl_tests will exit with a failure
code.
Signed-off-by: Peter Newman <peternewman@google.com>
---
tools/testing/selftests/resctrl/resctrl_tests.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c
index df0d8d8526fc..69ebb0d7fff6 100644
--- a/tools/testing/selftests/resctrl/resctrl_tests.c
+++ b/tools/testing/selftests/resctrl/resctrl_tests.c
@@ -77,7 +77,7 @@ static void run_mbm_test(bool has_ben, char **benchmark_cmd, int span,
ksft_print_msg("Starting MBM BW change ...\n");
- if (!validate_resctrl_feature_request(MBM_STR)) {
+ if (!validate_resctrl_feature_request(MBM_STR) || (get_vendor() != ARCH_INTEL)) {
ksft_test_result_skip("Hardware does not support MBM or MBM is disabled\n");
return;
}
@@ -98,7 +98,7 @@ static void run_mba_test(bool has_ben, char **benchmark_cmd, int span,
ksft_print_msg("Starting MBA Schemata change ...\n");
- if (!validate_resctrl_feature_request(MBA_STR)) {
+ if (!validate_resctrl_feature_request(MBA_STR) || (get_vendor() != ARCH_INTEL)) {
ksft_test_result_skip("Hardware does not support MBA or MBA is disabled\n");
return;
}
@@ -258,10 +258,10 @@ int main(int argc, char **argv)
ksft_set_plan(tests ? : 4);
- if ((get_vendor() == ARCH_INTEL) && mbm_test)
+ if (mbm_test)
run_mbm_test(has_ben, benchmark_cmd, span, cpu_no, bw_report);
- if ((get_vendor() == ARCH_INTEL) && mba_test)
+ if (mba_test)
run_mba_test(has_ben, benchmark_cmd, span, cpu_no, bw_report);
if (cmt_test)
@@ -272,5 +272,5 @@ int main(int argc, char **argv)
umount_resctrlfs();
- return ksft_exit_pass();
+ ksft_finished();
}
base-commit: c9c3395d5e3dcc6daee66c6908354d47bf98cb0c
--
2.40.0.rc1.284.g88254d51c5-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread* RE: [PATCH] selftests/resctrl: Use correct exit code when tests fail
2023-03-09 14:57 [PATCH] selftests/resctrl: Use correct exit code when tests fail Peter Newman
@ 2023-03-15 1:25 ` Shaopeng Tan (Fujitsu)
2023-03-17 17:49 ` Reinette Chatre
1 sibling, 0 replies; 3+ messages in thread
From: Shaopeng Tan (Fujitsu) @ 2023-03-15 1:25 UTC (permalink / raw)
To: 'Peter Newman', Fenghua Yu, Reinette Chatre
Cc: Shuah Khan, linux-kernel, linux-kselftest, eranian
Hi Peter,
> Subject: [PATCH] selftests/resctrl: Use correct exit code when tests fail
>
> Use ksft_finished() after running tests so that resctrl_tests doesn't return exit
> code 0 when tests fail.
>
> Consequently, report the MBA and MBM tests as skipped when running on
> non-Intel hardware, otherwise resctrl_tests will exit with a failure code.
>
> Signed-off-by: Peter Newman <peternewman@google.com>
> ---
> tools/testing/selftests/resctrl/resctrl_tests.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c
> b/tools/testing/selftests/resctrl/resctrl_tests.c
> index df0d8d8526fc..69ebb0d7fff6 100644
> --- a/tools/testing/selftests/resctrl/resctrl_tests.c
> +++ b/tools/testing/selftests/resctrl/resctrl_tests.c
> @@ -77,7 +77,7 @@ static void run_mbm_test(bool has_ben, char
> **benchmark_cmd, int span,
>
> ksft_print_msg("Starting MBM BW change ...\n");
>
> - if (!validate_resctrl_feature_request(MBM_STR)) {
> + if (!validate_resctrl_feature_request(MBM_STR) || (get_vendor() !=
> +ARCH_INTEL)) {
> ksft_test_result_skip("Hardware does not support MBM or
> MBM is disabled\n");
> return;
> }
> @@ -98,7 +98,7 @@ static void run_mba_test(bool has_ben, char
> **benchmark_cmd, int span,
>
> ksft_print_msg("Starting MBA Schemata change ...\n");
>
> - if (!validate_resctrl_feature_request(MBA_STR)) {
> + if (!validate_resctrl_feature_request(MBA_STR) || (get_vendor() !=
> +ARCH_INTEL)) {
> ksft_test_result_skip("Hardware does not support MBA or
> MBA is disabled\n");
> return;
> }
> @@ -258,10 +258,10 @@ int main(int argc, char **argv)
>
> ksft_set_plan(tests ? : 4);
>
> - if ((get_vendor() == ARCH_INTEL) && mbm_test)
> + if (mbm_test)
> run_mbm_test(has_ben, benchmark_cmd, span, cpu_no,
> bw_report);
>
> - if ((get_vendor() == ARCH_INTEL) && mba_test)
> + if (mba_test)
> run_mba_test(has_ben, benchmark_cmd, span, cpu_no,
> bw_report);
>
> if (cmt_test)
> @@ -272,5 +272,5 @@ int main(int argc, char **argv)
>
> umount_resctrlfs();
>
> - return ksft_exit_pass();
> + ksft_finished();
> }
>
> base-commit: c9c3395d5e3dcc6daee66c6908354d47bf98cb0c
> --
> 2.40.0.rc1.284.g88254d51c5-goog
I think it is no problem.
Reviewed-by: Shaopeng Tan <tan.shaopeng@fujitsu.com>
Tested-by: Shaopeng Tan <tan.shaopeng@fujitsu.com>
Best regards,
Shaopeng TAN
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] selftests/resctrl: Use correct exit code when tests fail
2023-03-09 14:57 [PATCH] selftests/resctrl: Use correct exit code when tests fail Peter Newman
2023-03-15 1:25 ` Shaopeng Tan (Fujitsu)
@ 2023-03-17 17:49 ` Reinette Chatre
1 sibling, 0 replies; 3+ messages in thread
From: Reinette Chatre @ 2023-03-17 17:49 UTC (permalink / raw)
To: Peter Newman, Fenghua Yu
Cc: Shuah Khan, Shaopeng Tan, linux-kernel, linux-kselftest, eranian
Hi Peter,
On 3/9/2023 6:57 AM, Peter Newman wrote:
> Use ksft_finished() after running tests so that resctrl_tests doesn't
> return exit code 0 when tests fail.
>
> Consequently, report the MBA and MBM tests as skipped when running on
> non-Intel hardware, otherwise resctrl_tests will exit with a failure
> code.
>
> Signed-off-by: Peter Newman <peternewman@google.com>
> ---
Thank you very much.
Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
Reinette
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-17 17:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-09 14:57 [PATCH] selftests/resctrl: Use correct exit code when tests fail Peter Newman
2023-03-15 1:25 ` Shaopeng Tan (Fujitsu)
2023-03-17 17:49 ` Reinette Chatre
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).