Make sure that calling ksft_test_result_*() functions from harness tests work as expected.
Signed-off-by: Thomas Weißschuh <[email protected]> --- .../selftests/kselftest_harness/harness-selftest.c | 20 +++++++++++++ .../kselftest_harness/harness-selftest.expected | 35 ++++++++++++++++------ 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/kselftest_harness/harness-selftest.c b/tools/testing/selftests/kselftest_harness/harness-selftest.c index f109a21ed6f7..3e3033d2745a 100644 --- a/tools/testing/selftests/kselftest_harness/harness-selftest.c +++ b/tools/testing/selftests/kselftest_harness/harness-selftest.c @@ -138,6 +138,26 @@ TEST(exit_skip) { exit(KSFT_SKIP); } +TEST(test_result_pass) { + ksft_test_result_pass(""); +} + +TEST(test_result_xpass) { + ksft_test_result_xpass(""); +} + +TEST(test_result_fail) { + ksft_test_result_fail(""); +} + +TEST(test_result_xfail) { + ksft_test_result_xfail(""); +} + +TEST(test_result_skip) { + ksft_test_result_skip(""); +} + int main(int argc, char **argv) { /* diff --git a/tools/testing/selftests/kselftest_harness/harness-selftest.expected b/tools/testing/selftests/kselftest_harness/harness-selftest.expected index da7febc11e10..c0a68ec124f8 100644 --- a/tools/testing/selftests/kselftest_harness/harness-selftest.expected +++ b/tools/testing/selftests/kselftest_harness/harness-selftest.expected @@ -1,6 +1,6 @@ TAP version 13 -1..14 -# Starting 14 tests from 4 test cases. +1..19 +# Starting 19 tests from 4 test cases. # RUN global.standalone_pass ... # harness-selftest.c:19:standalone_pass:before # harness-selftest.c:23:standalone_pass:after @@ -40,6 +40,23 @@ ok 8 global.exit_xfail # XFAIL unknown # RUN global.exit_skip ... # OK global.exit_skip ok 9 global.exit_skip # SKIP unknown +# RUN global.test_result_pass ... +# OK global.test_result_pass +ok 10 global.test_result_pass +# RUN global.test_result_xpass ... +# OK global.test_result_xpass +ok 11 global.test_result_xpass +# RUN global.test_result_fail ... +not ok 1 # Illegal usage of low-level ksft APIs in harness test +# test_result_fail: Test failed +# FAIL global.test_result_fail +not ok 12 global.test_result_fail +# RUN global.test_result_xfail ... +# OK global.test_result_xfail +ok 13 global.test_result_xfail +# RUN global.test_result_skip ... +# OK global.test_result_skip +ok 14 global.test_result_skip # RUN fixture.pass ... # harness-selftest.c:53:pass:setup # harness-selftest.c:62:pass:before @@ -48,7 +65,7 @@ ok 9 global.exit_skip # SKIP unknown # harness-selftest.c:66:pass:after # harness-selftest.c:58:pass:teardown same-process=1 # OK fixture.pass -ok 10 fixture.pass +ok 15 fixture.pass # RUN fixture.fail ... # harness-selftest.c:53:fail:setup # harness-selftest.c:70:fail:before @@ -56,26 +73,26 @@ ok 10 fixture.pass # harness-selftest.c:58:fail:teardown same-process=1 # fail: Test terminated by assertion # FAIL fixture.fail -not ok 11 fixture.fail +not ok 16 fixture.fail # RUN fixture.timeout ... # harness-selftest.c:53:timeout:setup # harness-selftest.c:77:timeout:before # timeout: Test terminated by timeout # FAIL fixture.timeout -not ok 12 fixture.timeout +not ok 17 fixture.timeout # RUN fixture_parent.pass ... # harness-selftest.c:87:pass:setup # harness-selftest.c:96:pass:before # harness-selftest.c:98:pass:after # harness-selftest.c:92:pass:teardown same-process=0 # OK fixture_parent.pass -ok 13 fixture_parent.pass +ok 18 fixture_parent.pass # RUN fixture_setup_failure.pass ... # harness-selftest.c:106:pass:setup # harness-selftest.c:108:pass:Expected 0 (0) == 1 (1) # pass: Test terminated by assertion # FAIL fixture_setup_failure.pass -not ok 14 fixture_setup_failure.pass -# FAILED: 8 / 14 tests passed. +not ok 19 fixture_setup_failure.pass +# FAILED: 12 / 19 tests passed. # 1 skipped test(s) detected. Consider enabling relevant config options to improve coverage. -# Totals: pass:5 fail:6 xfail:1 xpass:1 skip:1 error:0 +# Totals: pass:9 fail:7 xfail:1 xpass:1 skip:1 error:0 -- 2.52.0
