Now that we no longer need low exit codes to communicate
assertion steps - use normal KSFT exit codes.

Acked-by: Kees Cook <keesc...@chromium.org>
Tested-by: Jakub Sitnicki <ja...@cloudflare.com>
Signed-off-by: Jakub Kicinski <k...@kernel.org>
---
CC: keesc...@chromium.org
CC: l...@amacapital.net
CC: w...@chromium.org
CC: sh...@kernel.org
CC: m...@digikod.net
CC: linux-kselftest@vger.kernel.org
CC: linux-security-mod...@vger.kernel.org
---
 tools/testing/selftests/kselftest_harness.h | 13 ++++++-------
 tools/testing/selftests/landlock/common.h   | 10 +++++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/tools/testing/selftests/kselftest_harness.h 
b/tools/testing/selftests/kselftest_harness.h
index 98bdedf9a53a..618b41eac749 100644
--- a/tools/testing/selftests/kselftest_harness.h
+++ b/tools/testing/selftests/kselftest_harness.h
@@ -874,7 +874,7 @@ static inline void __test_check_assert(struct 
__test_metadata *t)
 {
        if (t->aborted) {
                if (t->no_print)
-                       _exit(1);
+                       _exit(KSFT_FAIL);
                abort();
        }
 }
@@ -937,7 +937,7 @@ void __wait_for_test(struct __test_metadata *t)
                fprintf(TH_LOG_STREAM,
                        "# %s: Test terminated by timeout\n", t->name);
        } else if (WIFEXITED(status)) {
-               if (WEXITSTATUS(status) == 255) {
+               if (WEXITSTATUS(status) == KSFT_SKIP) {
                        /* SKIP */
                        t->passed = 1;
                        t->skip = 1;
@@ -950,7 +950,7 @@ void __wait_for_test(struct __test_metadata *t)
                } else {
                        switch (WEXITSTATUS(status)) {
                        /* Success */
-                       case 0:
+                       case KSFT_PASS:
                                t->passed = 1;
                                break;
                        /* Other failure, assume step report. */
@@ -1132,12 +1132,11 @@ void __run_test(struct __fixture_metadata *f,
                setpgrp();
                t->fn(t, variant);
                if (t->skip)
-                       _exit(255);
-               /* Pass is exit 0 */
+                       _exit(KSFT_SKIP);
                if (t->passed)
-                       _exit(0);
+                       _exit(KSFT_PASS);
                /* Something else happened. */
-               _exit(1);
+               _exit(KSFT_FAIL);
        } else {
                __wait_for_test(t);
        }
diff --git a/tools/testing/selftests/landlock/common.h 
b/tools/testing/selftests/landlock/common.h
index c15e22abdca6..f5b40399a538 100644
--- a/tools/testing/selftests/landlock/common.h
+++ b/tools/testing/selftests/landlock/common.h
@@ -47,10 +47,10 @@
                        _metadata->no_print = 1; \
                        fixture_name##_##test_name##_child(_metadata, self, 
variant); \
                        if (_metadata->skip) \
-                               _exit(255); \
+                               _exit(KSFT_SKIP); \
                        if (_metadata->passed) \
-                               _exit(0); \
-                       _exit(1); \
+                               _exit(KSFT_PASS); \
+                       _exit(KSFT_FAIL); \
                } \
                if (child != waitpid(child, &status, 0)) \
                        abort(); \
@@ -60,10 +60,10 @@
                        return; \
                } \
                switch (WEXITSTATUS(status)) { \
-               case 0: \
+               case KSFT_PASS: \
                        _metadata->passed = 1; \
                        break; \
-               case 255: \
+               case KSFT_SKIP: \
                        _metadata->passed = 1; \
                        _metadata->skip = 1; \
                        break; \
-- 
2.43.0


Reply via email to