* [PATCH bpf-next] selftests/bpf: fix subtest number formatting in test_progs
@ 2022-05-20 7:01 Mykola Lysenko
2022-05-20 16:22 ` Daniel Müller
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Mykola Lysenko @ 2022-05-20 7:01 UTC (permalink / raw)
To: bpf, ast, andrii, daniel, kernel-team; +Cc: Mykola Lysenko
Remove weird spaces around / while preserving proper
indentation
Signed-off-by: Mykola Lysenko <mykolal@fb.com>
---
tools/testing/selftests/bpf/test_progs.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
index ecf69fce036e..262b7577b0ef 100644
--- a/tools/testing/selftests/bpf/test_progs.c
+++ b/tools/testing/selftests/bpf/test_progs.c
@@ -230,9 +230,14 @@ static void print_test_log(char *log_buf, size_t log_cnt)
fprintf(env.stdout, "\n");
}
+#define TEST_NUM_WIDTH 7
+#define STRINGIFY(value) #value
+#define QUOTE(macro) STRINGIFY(macro)
+#define TEST_NUM_WIDTH_STR QUOTE(TEST_NUM_WIDTH)
+
static void print_test_name(int test_num, const char *test_name, char *result)
{
- fprintf(env.stdout, "#%-9d %s", test_num, test_name);
+ fprintf(env.stdout, "#%-" TEST_NUM_WIDTH_STR "d %s", test_num, test_name);
if (result)
fprintf(env.stdout, ":%s", result);
@@ -244,8 +249,12 @@ static void print_subtest_name(int test_num, int subtest_num,
const char *test_name, char *subtest_name,
char *result)
{
- fprintf(env.stdout, "#%-3d/%-5d %s/%s",
- test_num, subtest_num,
+ char test_num_str[TEST_NUM_WIDTH + 1];
+
+ snprintf(test_num_str, sizeof(test_num_str), "%d/%d", test_num, subtest_num);
+
+ fprintf(env.stdout, "#%-" TEST_NUM_WIDTH_STR "s %s/%s",
+ test_num_str,
test_name, subtest_name);
if (result)
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH bpf-next] selftests/bpf: fix subtest number formatting in test_progs
2022-05-20 7:01 [PATCH bpf-next] selftests/bpf: fix subtest number formatting in test_progs Mykola Lysenko
@ 2022-05-20 16:22 ` Daniel Müller
2022-05-20 23:23 ` Andrii Nakryiko
2022-05-20 23:30 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Daniel Müller @ 2022-05-20 16:22 UTC (permalink / raw)
To: Mykola Lysenko; +Cc: bpf, ast, andrii, daniel, kernel-team
On Fri, May 20, 2022 at 12:01:44AM -0700, Mykola Lysenko wrote:
> Remove weird spaces around / while preserving proper
> indentation
>
> Signed-off-by: Mykola Lysenko <mykolal@fb.com>
> ---
> tools/testing/selftests/bpf/test_progs.c | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
> index ecf69fce036e..262b7577b0ef 100644
> --- a/tools/testing/selftests/bpf/test_progs.c
> +++ b/tools/testing/selftests/bpf/test_progs.c
> @@ -230,9 +230,14 @@ static void print_test_log(char *log_buf, size_t log_cnt)
> fprintf(env.stdout, "\n");
> }
>
> +#define TEST_NUM_WIDTH 7
> +#define STRINGIFY(value) #value
> +#define QUOTE(macro) STRINGIFY(macro)
> +#define TEST_NUM_WIDTH_STR QUOTE(TEST_NUM_WIDTH)
> +
> static void print_test_name(int test_num, const char *test_name, char *result)
> {
> - fprintf(env.stdout, "#%-9d %s", test_num, test_name);
> + fprintf(env.stdout, "#%-" TEST_NUM_WIDTH_STR "d %s", test_num, test_name);
>
> if (result)
> fprintf(env.stdout, ":%s", result);
> @@ -244,8 +249,12 @@ static void print_subtest_name(int test_num, int subtest_num,
> const char *test_name, char *subtest_name,
> char *result)
> {
> - fprintf(env.stdout, "#%-3d/%-5d %s/%s",
> - test_num, subtest_num,
> + char test_num_str[TEST_NUM_WIDTH + 1];
> +
> + snprintf(test_num_str, sizeof(test_num_str), "%d/%d", test_num, subtest_num);
> +
> + fprintf(env.stdout, "#%-" TEST_NUM_WIDTH_STR "s %s/%s",
> + test_num_str,
> test_name, subtest_name);
>
> if (result)
> --
> 2.30.2
>
Looks good to me, thanks.
Acked-by: Daniel Müller <deso@posteo.net>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH bpf-next] selftests/bpf: fix subtest number formatting in test_progs
2022-05-20 7:01 [PATCH bpf-next] selftests/bpf: fix subtest number formatting in test_progs Mykola Lysenko
2022-05-20 16:22 ` Daniel Müller
@ 2022-05-20 23:23 ` Andrii Nakryiko
2022-05-20 23:30 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Andrii Nakryiko @ 2022-05-20 23:23 UTC (permalink / raw)
To: Mykola Lysenko
Cc: bpf, Alexei Starovoitov, Andrii Nakryiko, Daniel Borkmann, Kernel Team
On Fri, May 20, 2022 at 12:02 AM Mykola Lysenko <mykolal@fb.com> wrote:
>
> Remove weird spaces around / while preserving proper
> indentation
>
> Signed-off-by: Mykola Lysenko <mykolal@fb.com>
> ---
> tools/testing/selftests/bpf/test_progs.c | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
> index ecf69fce036e..262b7577b0ef 100644
> --- a/tools/testing/selftests/bpf/test_progs.c
> +++ b/tools/testing/selftests/bpf/test_progs.c
> @@ -230,9 +230,14 @@ static void print_test_log(char *log_buf, size_t log_cnt)
> fprintf(env.stdout, "\n");
> }
>
> +#define TEST_NUM_WIDTH 7
> +#define STRINGIFY(value) #value
> +#define QUOTE(macro) STRINGIFY(macro)
> +#define TEST_NUM_WIDTH_STR QUOTE(TEST_NUM_WIDTH)
> +
> static void print_test_name(int test_num, const char *test_name, char *result)
> {
> - fprintf(env.stdout, "#%-9d %s", test_num, test_name);
> + fprintf(env.stdout, "#%-" TEST_NUM_WIDTH_STR "d %s", test_num, test_name);
this is equivalent to
fprintf(env.stdout, "#%-*d %s", TEST_NUM_WIDTH, test_num, test_name);
but doesn't require macro stringify sequence, so I dropped STRINGIFY,
QUOTE and TEST_NU_WIDTH_STR and replaced it with * argument here and
below
>
> if (result)
> fprintf(env.stdout, ":%s", result);
> @@ -244,8 +249,12 @@ static void print_subtest_name(int test_num, int subtest_num,
> const char *test_name, char *subtest_name,
> char *result)
> {
> - fprintf(env.stdout, "#%-3d/%-5d %s/%s",
> - test_num, subtest_num,
> + char test_num_str[TEST_NUM_WIDTH + 1];
> +
> + snprintf(test_num_str, sizeof(test_num_str), "%d/%d", test_num, subtest_num);
> +
> + fprintf(env.stdout, "#%-" TEST_NUM_WIDTH_STR "s %s/%s",
> + test_num_str,
> test_name, subtest_name);
>
> if (result)
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH bpf-next] selftests/bpf: fix subtest number formatting in test_progs
2022-05-20 7:01 [PATCH bpf-next] selftests/bpf: fix subtest number formatting in test_progs Mykola Lysenko
2022-05-20 16:22 ` Daniel Müller
2022-05-20 23:23 ` Andrii Nakryiko
@ 2022-05-20 23:30 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-05-20 23:30 UTC (permalink / raw)
To: Mykola Lysenko; +Cc: bpf, ast, andrii, daniel, kernel-team
Hello:
This patch was applied to bpf/bpf-next.git (master)
by Andrii Nakryiko <andrii@kernel.org>:
On Fri, 20 May 2022 00:01:44 -0700 you wrote:
> Remove weird spaces around / while preserving proper
> indentation
>
> Signed-off-by: Mykola Lysenko <mykolal@fb.com>
> ---
> tools/testing/selftests/bpf/test_progs.c | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
Here is the summary with links:
- [bpf-next] selftests/bpf: fix subtest number formatting in test_progs
https://git.kernel.org/bpf/bpf-next/c/fa3768606582
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-20 23:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-20 7:01 [PATCH bpf-next] selftests/bpf: fix subtest number formatting in test_progs Mykola Lysenko
2022-05-20 16:22 ` Daniel Müller
2022-05-20 23:23 ` Andrii Nakryiko
2022-05-20 23:30 ` patchwork-bot+netdevbpf
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).