kselftest/arm64: Convert za-fork to use kselftest.h

Now that kselftest.h can be used with nolibc convert the za-fork test to
use it. We do still have to open code ksft_print_msg() but that's not the
end of the world. Some of the advantage comes from using printf() which we
could have been using already.

This does change the output when tests are skipped, bringing it in line
with the standard kselftest output by removing the test name - we move
from

    ok 0 skipped

to

    ok 1 # SKIP fork_test

The old output was not following KTAP format for skips, and the
numbering was not standard or consistent with the reported plan.

Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

diff --git a/tools/testing/selftests/arm64/fp/Makefile b/tools/testing/selftests/arm64/fp/Makefile
index 48f56c86ad4579970300940813c94340712b9ac0..b413b0af07f990c70c3c9ef94386eae62843bd68 100644 (file)
--- a/tools/testing/selftests/arm64/fp/Makefile
+++ b/tools/testing/selftests/arm64/fp/Makefile
@@ -38,7 +38,7 @@ $(OUTPUT)/vec-syscfg: vec-syscfg.c $(OUTPUT)/rdvl.o
 $(OUTPUT)/vlset: vlset.c
 $(OUTPUT)/za-fork: za-fork.c $(OUTPUT)/za-fork-asm.o
        $(CC) -fno-asynchronous-unwind-tables -fno-ident -s -Os -nostdlib \
-               -include ../../../../include/nolibc/nolibc.h \
+               -include ../../../../include/nolibc/nolibc.h -I../..\
                -static -ffreestanding -Wall $^ -o $@
 $(OUTPUT)/za-ptrace: za-ptrace.c
 $(OUTPUT)/za-test: za-test.S $(OUTPUT)/asm-utils.o

diff --git a/tools/testing/selftests/arm64/fp/za-fork.c b/tools/testing/selftests/arm64/fp/za-fork.c
index ff475c649e96698eab7c0613c131d4a2025d0b6d..b86cb1049497f39647566dcf03e39a96a69e2d23 100644 (file)
--- a/tools/testing/selftests/arm64/fp/za-fork.c
+++ b/tools/testing/selftests/arm64/fp/za-fork.c
@@ -9,42 +9,9 @@
 #include <linux/sched.h>
 #include <linux/wait.h>
 
-#define EXPECTED_TESTS 1
-
-static void putstr(const char *str)
-{
-       write(1, str, strlen(str));
-}
-
-static void putnum(unsigned int num)
-{
-       char c;
-
-       if (num / 10)
-               putnum(num / 10);
-
-       c = '0' + (num % 10);
-       write(1, &c, 1);
-}
+#include "kselftest.h"
 
-static int tests_run;
-static int tests_passed;
-static int tests_failed;
-static int tests_skipped;
-
-static void print_summary(void)
-{
-       if (tests_passed + tests_failed + tests_skipped != EXPECTED_TESTS)
-               putstr("# UNEXPECTED TEST COUNT: ");
-
-       putstr("# Totals: pass:");
-       putnum(tests_passed);
-       putstr(" fail:");
-       putnum(tests_failed);
-       putstr(" xfail:0 xpass:0 skip:");
-       putnum(tests_skipped);
-       putstr(" error:0\n");
-}
+#define EXPECTED_TESTS 1
 
 int fork_test(void);
 int verify_fork(void);
@@ -63,22 +30,21 @@ int fork_test_c(void)
        if (newpid == 0) {
                /* In child */
                if (!verify_fork()) {
-                       putstr("# ZA state invalid in child\n");
+                       ksft_print_msg("ZA state invalid in child\n");
                        exit(0);
                } else {
                        exit(1);
                }
        }
        if (newpid < 0) {
-               putstr("# fork() failed: -");
-               putnum(-newpid);
-               putstr("\n");
+               ksft_print_msg("fork() failed: %d\n", newpid);
+
                return 0;
        }
 
        parent_result = verify_fork();
        if (!parent_result)
-               putstr("# ZA state invalid in parent\n");
+               ksft_print_msg("ZA state invalid in parent\n");
 
        for (;;) {
                waiting = waitpid(newpid, &child_status, 0);
@@ -86,18 +52,16 @@ int fork_test_c(void)
                if (waiting < 0) {
                        if (errno == EINTR)
                                continue;
-                       putstr("# waitpid() failed: ");
-                       putnum(errno);
-                       putstr("\n");
+                       ksft_print_msg("waitpid() failed: %d\n", errno);
                        return 0;
                }
                if (waiting != newpid) {
-                       putstr("# waitpid() returned wrong PID\n");
+                       ksft_print_msg("waitpid() returned wrong PID\n");
                        return 0;
                }
 
                if (!WIFEXITED(child_status)) {
-                       putstr("# child did not exit\n");
+                       ksft_print_msg("child did not exit\n");
                        return 0;
                }
 
@@ -105,29 +69,14 @@ int fork_test_c(void)
        }
 }
 
-#define run_test(name)                      \
-       if (name()) {                        \
-               tests_passed++;              \
-       } else {                             \
-               tests_failed++;              \
-               putstr("not ");              \
-       }                                    \
-       putstr("ok ");                       \
-       putnum(++tests_run);                 \
-       putstr(" " #name "\n");
-
 int main(int argc, char **argv)
 {
        int ret, i;
 
-       putstr("TAP version 13\n");
-       putstr("1..");
-       putnum(EXPECTED_TESTS);
-       putstr("\n");
+       ksft_print_header();
+       ksft_set_plan(EXPECTED_TESTS);
 
-       putstr("# PID: ");
-       putnum(getpid());
-       putstr("\n");
+       ksft_print_msg("PID: %d\n", getpid());
 
        /*
         * This test is run with nolibc which doesn't support hwcap and
@@ -136,21 +85,16 @@ int main(int argc, char **argv)
         */
        ret = open("/proc/sys/abi/sme_default_vector_length", O_RDONLY, 0);
        if (ret >= 0) {
-               run_test(fork_test);
+               ksft_test_result(fork_test(), "fork_test");
 
        } else {
-               putstr("# SME support not present\n");
-
+               ksft_print_msg("SME not supported\n");
                for (i = 0; i < EXPECTED_TESTS; i++) {
-                       putstr("ok ");
-                       putnum(i);
-                       putstr(" skipped\n");
+                       ksft_test_result_skip("fork_test\n");
                }
-
-               tests_skipped += EXPECTED_TESTS;
        }
 
-       print_summary();
+       ksft_finished();
 
        return 0;
 }