| Message ID | 20220520070144.10312-1-mykolal@fb.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | fa376860658252a4559026496528c5d3a36b52e3 |
| Delegated to: | BPF |
| Headers | show |
| Series | [bpf-next] selftests/bpf: fix subtest number formatting in test_progs | expand |
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>
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 >
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!
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)
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(-)