diff options
Diffstat (limited to 'tools/perf/tests/builtin-test.c')
| -rw-r--r-- | tools/perf/tests/builtin-test.c | 16 | 
1 files changed, 10 insertions, 6 deletions
| diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index 8cb5a1c3489e..fac3717d9ba1 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -107,6 +107,7 @@ static struct test_suite *generic_tests[] = {  	&suite__expand_cgroup_events,  	&suite__perf_time_to_tsc,  	&suite__dlfilter, +	&suite__sigtrap,  	NULL,  }; @@ -420,7 +421,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"); @@ -470,7 +471,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"); @@ -510,7 +511,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);  			} @@ -545,7 +546,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);  	} @@ -567,14 +568,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));  		}  	} @@ -606,6 +607,9 @@ int cmd_test(int argc, const char **argv)          if (ret < 0)                  return ret; +	/* Unbuffered output */ +	setvbuf(stdout, NULL, _IONBF, 0); +  	argc = parse_options_subcommand(argc, argv, test_options, test_subcommands, test_usage, 0);  	if (argc >= 1 && !strcmp(argv[0], "list"))  		return perf_test__list(argc - 1, argv + 1); |