[PATCH v2 3/6] selftests: breakpoints: do not use ksft_exit_skip after ksft_set_plan

[Paolo Bonzini]

Calling ksft_exit_skip after ksft_set_plan results in executing fewer tests
than planned.  Use ksft_test_result_skip for the individual tests.
The call in suspend() is fine, but ksft_set_plan should be after it.

Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
 .../breakpoints/step_after_suspend_test.c     | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/tools/testing/selftests/breakpoints/step_after_suspend_test.c 
b/tools/testing/selftests/breakpoints/step_after_suspend_test.c
index 983ee6182e25..2cf6f10ab7c4 100644
--- a/tools/testing/selftests/breakpoints/step_after_suspend_test.c
+++ b/tools/testing/selftests/breakpoints/step_after_suspend_test.c
@@ -47,7 +47,7 @@ void child(int cpu)
        _exit(0);
 }
 
-bool run_test(int cpu)
+int run_test(int cpu)
 {
        int status;
        pid_t pid = fork();
@@ -55,7 +55,7 @@ bool run_test(int cpu)
 
        if (pid < 0) {
                ksft_print_msg("fork() failed: %s\n", strerror(errno));
-               return false;
+               return KSFT_FAIL;
        }
        if (pid == 0)
                child(cpu);
@@ -63,67 +63,68 @@ bool run_test(int cpu)
        wpid = waitpid(pid, &status, __WALL);
        if (wpid != pid) {
                ksft_print_msg("waitpid() failed: %s\n", strerror(errno));
-               return false;
+               return KSFT_FAIL;
        }
        if (!WIFSTOPPED(status)) {
                ksft_print_msg("child did not stop: %s\n", strerror(errno));
-               return false;
+               return KSFT_FAIL;
        }
        if (WSTOPSIG(status) != SIGSTOP) {
                ksft_print_msg("child did not stop with SIGSTOP: %s\n",
                        strerror(errno));
-               return false;
+               return KSFT_FAIL;
        }
 
        if (ptrace(PTRACE_SINGLESTEP, pid, NULL, NULL) < 0) {
                if (errno == EIO) {
-                       ksft_exit_skip(
+                       ksft_print_msg(
                                "ptrace(PTRACE_SINGLESTEP) not supported on 
this architecture: %s\n",
                                strerror(errno));
+                       return KSFT_SKIP;
                }
                ksft_print_msg("ptrace(PTRACE_SINGLESTEP) failed: %s\n",
                        strerror(errno));
-               return false;
+               return KSFT_FAIL;
        }
 
        wpid = waitpid(pid, &status, __WALL);
        if (wpid != pid) {
                ksft_print_msg("waitpid() failed: $s\n", strerror(errno));
-               return false;
+               return KSFT_FAIL;
        }
        if (WIFEXITED(status)) {
                ksft_print_msg("child did not single-step: %s\n",
                        strerror(errno));
-               return false;
+               return KSFT_FAIL;
        }
        if (!WIFSTOPPED(status)) {
                ksft_print_msg("child did not stop: %s\n", strerror(errno));
-               return false;
+               return KSFT_FAIL;
        }
        if (WSTOPSIG(status) != SIGTRAP) {
                ksft_print_msg("child did not stop with SIGTRAP: %s\n",
                        strerror(errno));
-               return false;
+               return KSFT_FAIL;
        }
 
        if (ptrace(PTRACE_CONT, pid, NULL, NULL) < 0) {
                ksft_print_msg("ptrace(PTRACE_CONT) failed: %s\n",
                        strerror(errno));
-               return false;
+               return KSFT_FAIL;
        }
 
        wpid = waitpid(pid, &status, __WALL);
        if (wpid != pid) {
                ksft_print_msg("waitpid() failed: %s\n", strerror(errno));
-               return false;
+               return KSFT_FAIL;
        }
        if (!WIFEXITED(status)) {
                ksft_print_msg("child did not exit after PTRACE_CONT: %s\n",
                        strerror(errno));
-               return false;
+               return KSFT_FAIL;
        }
 
-       return true;
+       return KSFT_PASS;
 }
 
 void suspend(void)
@@ -192,23 +193,29 @@ int main(int argc, char **argv)
                        continue;
                tests++;
        }
-       ksft_set_plan(tests);
 
        if (do_suspend)
                suspend();
 
+       ksft_set_plan(tests);
        for (cpu = 0; cpu < CPU_SETSIZE; cpu++) {
-               bool test_success;
+               int test_success;
 
                if (!CPU_ISSET(cpu, &available_cpus))
                        continue;
 
                test_success = run_test(cpu);
-               if (test_success) {
+               switch (test_success) {
+               case KSFT_PASS:
                        ksft_test_result_pass("CPU %d\n", cpu);
-               } else {
+                       break;
+               case KSFT_SKIP:
+                       ksft_test_result_skip("CPU %d\n", cpu);
+                       break;
+               case KSFT_FAIL:
                        ksft_test_result_fail("CPU %d\n", cpu);
                        succeeded = false;
+                       break;
                }
        }
 
-- 
2.26.2