From: Jakub Kicinski <kuba@kernel.org>
To: shuah@kernel.org, keescook@chromium.org
Cc: linux-kselftest@vger.kernel.org, netdev@vger.kernel.org,
jakub@cloudflare.com, Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next v2 2/4] selftests: kselftest_harness: use KSFT_* exit codes
Date: Thu, 15 Feb 2024 16:26:17 -0800 [thread overview]
Message-ID: <20240216002619.1999225-3-kuba@kernel.org> (raw)
In-Reply-To: <20240216002619.1999225-1-kuba@kernel.org>
Now that we no longer need low exit codes to communicate
assertion steps - use normal KSFT exit codes.
Acked-by: Kees Cook <keescook@chromium.org>
Tested-by: Jakub Sitnicki <jakub@cloudflare.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
tools/testing/selftests/kselftest_harness.h | 13 ++++++-------
1 file changed, 6 insertions(+), 7 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);
}
--
2.43.0
next prev parent reply other threads:[~2024-02-16 0:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-16 0:26 [PATCH net-next v2 0/4] selftests: kselftest_harness: support using xfail Jakub Kicinski
2024-02-16 0:26 ` [PATCH net-next v2 1/4] selftests: kselftest_harness: pass step via shared memory Jakub Kicinski
2024-02-16 0:26 ` Jakub Kicinski [this message]
2024-02-16 0:26 ` [PATCH net-next v2 3/4] selftests: kselftest_harness: support using xfail Jakub Kicinski
2024-02-16 0:26 ` [PATCH net-next v2 4/4] selftests: ip_local_port_range: use XFAIL instead of SKIP Jakub Kicinski
2024-02-17 1:40 ` [PATCH net-next v2 0/4] selftests: kselftest_harness: support using xfail Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240216002619.1999225-3-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=jakub@cloudflare.com \
--cc=keescook@chromium.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=shuah@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).