Re: [PATCH 03/12] perf test: Use 3 digits for test numbering now we can have more tests

[Arnaldo Carvalho de Melo]

Em Tue, Dec 21, 2021 at 08:35:40PM +0800, Leo Yan escreveu:
> On Wed, Dec 15, 2021 at 04:03:54PM +0000, carsten.haitzler@xxxxxxxxxxxx wrote:
> > From: Carsten Haitzler <carsten.haitzler@xxxxxxx>
> > 
> > This is in preparation for adding more tests that will need the test
> > number to be 3 digts so they align nicely in the output.
> > 
> > Signed-off-by: Carsten Haitzler <carsten.haitzler@xxxxxxx>
> 
> Reviewed-by: Leo Yan <leo.yan@xxxxxxxxxx>

Cherry picking this one while the other issues get resolved.

Thanks, applied.

- Arnaldo
 
> > ---
> >  tools/perf/tests/builtin-test.c | 12 ++++++------
> >  1 file changed, 6 insertions(+), 6 deletions(-)
> > 
> > diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
> > index 849737ead9fd..8652dcc4912c 100644
> > --- a/tools/perf/tests/builtin-test.c
> > +++ b/tools/perf/tests/builtin-test.c
> > @@ -435,7 +435,7 @@ static int run_shell_tests(int argc, const char *argv[], int i, int width,
> >  			continue;
> >  
> >  		st.file = ent->d_name;
> > -		pr_info("%2d: %-*s:", i, width, test_suite.desc);
> > +		pr_info("%3d: %-*s:", i, width, test_suite.desc);
> >  
> >  		if (intlist__find(skiplist, i)) {
> >  			color_fprintf(stderr, PERF_COLOR_YELLOW, " Skip (user override)\n");
> > @@ -485,7 +485,7 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist)
> >  				continue;
> >  		}
> >  
> > -		pr_info("%2d: %-*s:", i, width, test_description(t, -1));
> > +		pr_info("%3d: %-*s:", i, width, test_description(t, -1));
> >  
> >  		if (intlist__find(skiplist, i)) {
> >  			color_fprintf(stderr, PERF_COLOR_YELLOW, " Skip (user override)\n");
> > @@ -525,7 +525,7 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist)
> >  							curr, argc, argv))
> >  					continue;
> >  
> > -				pr_info("%2d.%1d: %-*s:", i, subi + 1, subw,
> > +				pr_info("%3d.%1d: %-*s:", i, subi + 1, subw,
> >  					test_description(t, subi));
> >  				test_and_print(t, subi);
> >  			}
> > @@ -560,7 +560,7 @@ static int perf_test__list_shell(int argc, const char **argv, int i)
> >  		if (!perf_test__matches(t.desc, curr, argc, argv))
> >  			continue;
> >  
> > -		pr_info("%2d: %s\n", i, t.desc);
> > +		pr_info("%3d: %s\n", i, t.desc);
> >  
> >  	}
> >  
> > @@ -582,14 +582,14 @@ static int perf_test__list(int argc, const char **argv)
> >  		if (!perf_test__matches(test_description(t, -1), curr, argc, argv))
> >  			continue;
> >  
> > -		pr_info("%2d: %s\n", i, test_description(t, -1));
> > +		pr_info("%3d: %s\n", i, test_description(t, -1));
> >  
> >  		if (has_subtests(t)) {
> >  			int subn = num_subtests(t);
> >  			int subi;
> >  
> >  			for (subi = 0; subi < subn; subi++)
> > -				pr_info("%2d:%1d: %s\n", i, subi + 1,
> > +				pr_info("%3d:%1d: %s\n", i, subi + 1,
> >  					test_description(t, subi));
> >  		}
> >  	}
> > -- 
> > 2.32.0
> > 

-- 

- Arnaldo