[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <8facf491-3c4c-4efb-8a14-f34011ffe011@linuxfoundation.org>
Date: Thu, 27 Jun 2024 12:41:37 -0600
From: Shuah Khan <skhan@...uxfoundation.org>
To: Laura Nao <laura.nao@...labora.com>, shuah@...nel.org
Cc: kernel@...labora.com, linux-kernel@...r.kernel.org,
linux-kselftest@...r.kernel.org, Shuah Khan <skhan@...uxfoundation.org>
Subject: Re: [PATCH 2/2] selftests/watchdog: convert the test output to KTAP
format
On 5/6/24 05:13, Laura Nao wrote:
> Modify the script output to conform to the KTAP format standard. The
What is script here?
> number of tests executed is determined by the script arguments, and
> options such as -c, -f, -h, -i, and -p do not impact the total test
> count.
>
> No functional change is intended.
There are functional changes - keep_alive() coupled with changes
tailored by a script that isn't in the kernel code which isn't
ideal.
Why not inlcude the script in this patch series to make it part
of the kernel?
>
> Signed-off-by: Laura Nao <laura.nao@...labora.com>
> ---
> .../selftests/watchdog/watchdog-test.c | 154 ++++++++++--------
> 1 file changed, 89 insertions(+), 65 deletions(-)
>
> diff --git a/tools/testing/selftests/watchdog/watchdog-test.c b/tools/testing/selftests/watchdog/watchdog-test.c
> index 786cc5a26206..90f32de9e194 100644
> --- a/tools/testing/selftests/watchdog/watchdog-test.c
> +++ b/tools/testing/selftests/watchdog/watchdog-test.c
> @@ -22,6 +22,7 @@
> #include <sys/ioctl.h>
> #include <linux/types.h>
> #include <linux/watchdog.h>
> +#include "../kselftest.h"
>
> #define DEFAULT_PING_RATE 1
> #define DEFAULT_PING_COUNT 5
> @@ -29,6 +30,7 @@
> int fd;
> const char v = 'V';
> static const char sopts[] = "bdehp:c:st:Tn:NLf:i";
> +static const char topts[] = "bdeLn:Nst:T";
> static const struct option lopts[] = {
> {"bootstatus", no_argument, NULL, 'b'},
> {"disable", no_argument, NULL, 'd'},
> @@ -52,7 +54,7 @@ static const struct option lopts[] = {
> * the PC Watchdog card to reset its internal timer so it doesn't trigger
> * a computer reset.
> */
> -static void keep_alive(void)
> +static int keep_alive(void)
> {
> int dummy;
> int ret;
> @@ -60,6 +62,8 @@ static void keep_alive(void)
> ret = ioctl(fd, WDIOC_KEEPALIVE, &dummy);
> if (!ret)
> printf(".");
> +
> + return ret;
> }
Are these changes driven by the script that isn't in the kernel code?
I don't want to see changes to keep_alive() bevator.
thanks,
-- Shuah
Powered by blists - more mailing lists