Skip to content

Commit

Permalink
selftests/resctrl: Use correct exit code when tests fail
Browse files Browse the repository at this point in the history
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>
Reviewed-by: Shaopeng Tan <tan.shaopeng@fujitsu.com>
Tested-by: Shaopeng Tan <tan.shaopeng@fujitsu.com>
Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
  • Loading branch information
Peter Newman authored and Shuah Khan committed Apr 13, 2023
1 parent 266679f commit c2b1790
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions tools/testing/selftests/resctrl/resctrl_tests.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down Expand Up @@ -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)
Expand All @@ -272,5 +272,5 @@ int main(int argc, char **argv)

umount_resctrlfs();

return ksft_exit_pass();
ksft_finished();
}

0 comments on commit c2b1790

Please sign in to comment.