From: Nathan Chancellor <nathan@kernel.org>
To: shuah@kernel.org
Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
Muhammad Usama Anjum <usama.anjum@collabora.com>,
Thomas Gleixner <tglx@linutronix.de>,
Nathan Chancellor <nathan@kernel.org>
Subject: [PATCH v2 10/10] selftests: kselftest: Make ksft_exit functions return void instead of int
Date: Wed, 24 Apr 2024 10:24:13 -0700 [thread overview]
Message-ID: <20240424-ksft-exit-int-to-void-v2-10-c35f3b8c9ca0@kernel.org> (raw)
In-Reply-To: <20240424-ksft-exit-int-to-void-v2-0-c35f3b8c9ca0@kernel.org>
Commit f7d5bcd35d42 ("selftests: kselftest: Mark functions that
unconditionally call exit() as __noreturn") marked functions that call
exit() as __noreturn but it did not change the return type of these
functions from 'void' to 'int' like it should have (since a noreturn
function by definition cannot return an integer because it does not
return...) because there were many tests that return the result of the
ksft_exit functions, even though it has never been used due to calling
exit().
Now that all uses of 'return ksft_exit...()' have been cleaned up
properly, change the types of the ksft_exit...() functions to void to
match their __noreturn nature.
Reviewed-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
tools/testing/selftests/kselftest.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/kselftest.h b/tools/testing/selftests/kselftest.h
index 9bb1664bcf95..f4221691a7da 100644
--- a/tools/testing/selftests/kselftest.h
+++ b/tools/testing/selftests/kselftest.h
@@ -327,13 +327,13 @@ void ksft_test_result_code(int exit_code, const char *test_name,
break; \
} } while (0)
-static inline __noreturn int ksft_exit_pass(void)
+static inline __noreturn void ksft_exit_pass(void)
{
ksft_print_cnts();
exit(KSFT_PASS);
}
-static inline __noreturn int ksft_exit_fail(void)
+static inline __noreturn void ksft_exit_fail(void)
{
ksft_print_cnts();
exit(KSFT_FAIL);
@@ -360,7 +360,7 @@ static inline __noreturn int ksft_exit_fail(void)
ksft_cnt.ksft_xfail + \
ksft_cnt.ksft_xskip)
-static inline __noreturn __printf(1, 2) int ksft_exit_fail_msg(const char *msg, ...)
+static inline __noreturn __printf(1, 2) void ksft_exit_fail_msg(const char *msg, ...)
{
int saved_errno = errno;
va_list args;
@@ -388,19 +388,19 @@ static inline __noreturn void ksft_exit_fail_perror(const char *msg)
#endif
}
-static inline __noreturn int ksft_exit_xfail(void)
+static inline __noreturn void ksft_exit_xfail(void)
{
ksft_print_cnts();
exit(KSFT_XFAIL);
}
-static inline __noreturn int ksft_exit_xpass(void)
+static inline __noreturn void ksft_exit_xpass(void)
{
ksft_print_cnts();
exit(KSFT_XPASS);
}
-static inline __noreturn __printf(1, 2) int ksft_exit_skip(const char *msg, ...)
+static inline __noreturn __printf(1, 2) void ksft_exit_skip(const char *msg, ...)
{
int saved_errno = errno;
va_list args;
--
2.44.0
next prev parent reply other threads:[~2024-04-24 17:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 17:24 [PATCH v2 00/10] selftests: " Nathan Chancellor
2024-04-24 17:24 ` [PATCH v2 01/10] selftests/clone3: ksft_exit functions do not return Nathan Chancellor
2024-04-24 17:24 ` [PATCH v2 02/10] selftests/ipc: " Nathan Chancellor
2024-04-24 17:24 ` [PATCH v2 03/10] selftests: membarrier: ksft_exit_pass() does " Nathan Chancellor
2024-04-24 17:24 ` [PATCH v2 04/10] selftests/mm: ksft_exit functions do " Nathan Chancellor
2024-04-24 17:24 ` [PATCH v2 05/10] selftests: pidfd: " Nathan Chancellor
2024-04-24 17:24 ` [PATCH v2 06/10] selftests/resctrl: ksft_exit_skip() does " Nathan Chancellor
2024-04-24 17:24 ` [PATCH v2 07/10] selftests: sync: ksft_exit_pass() " Nathan Chancellor
2024-04-24 17:24 ` [PATCH v2 08/10] selftests: timers: ksft_exit functions do " Nathan Chancellor
2024-04-24 17:24 ` [PATCH v2 09/10] selftests: x86: ksft_exit_pass() does " Nathan Chancellor
2024-04-24 17:24 ` Nathan Chancellor [this message]
2024-04-25 14:39 ` [PATCH v2 00/10] selftests: Make ksft_exit functions return void instead of int Shuah Khan
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=20240424-ksft-exit-int-to-void-v2-10-c35f3b8c9ca0@kernel.org \
--to=nathan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=shuah@kernel.org \
--cc=tglx@linutronix.de \
--cc=usama.anjum@collabora.com \
/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
all inboxes | Powered by JetHome®