Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d02acc1 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf test: Make 'list' use same filtering code as main 'perf test' 

Before:

  # perf test Synth
  39: Synthesize thread map  : Ok
  41: Synthesize cpu map     : Ok
  42: Synthesize stat config : Ok
  43: Synthesize stat        : Ok
  44: Synthesize stat round  : Ok
  45: Synthesize attr update : Ok
  # perf test list Synth
  #

After:

  # perf test Synth
  39: Synthesize thread map  : Ok
  41: Synthesize cpu map     : Ok
  42: Synthesize stat config : Ok
  43: Synthesize stat        : Ok
  44: Synthesize stat round  : Ok
  45: Synthesize attr update : Ok
  # perf test list Synth
  39: Synthesize thread map
  41: Synthesize cpu map
  42: Synthesize stat config
  43: Synthesize stat
  44: Synthesize stat round
  45: Synthesize attr update
  #

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Thomas Richter <tmricht@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-v95tqqzuwawsmds3zn2mosje@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1209b273

tools/perf/tests/builtin-test.c

+10 −8
Original line number Diff line number Diff line
@@ -609,15 +609,16 @@ static int perf_test__list_shell(int argc, const char **argv, int i) 
		return -1;



	for_each_shell_test(dir, ent) {

		int curr = i++;

		char bf[256];

		const char *desc = shell_test__description(bf, sizeof(bf), path, ent->d_name);



		++i;

		struct test t = {

			.desc = shell_test__description(bf, sizeof(bf), path, ent->d_name),

		};



		if (argc > 1 && !strstr(desc, argv[1]))

		if (!perf_test__matches(&t, curr, argc, argv))

			continue;



		pr_info("%2d: %s\n", i, desc);

		pr_info("%2d: %s\n", i, t.desc);

	}



	closedir(dir);
@@ -631,9 +632,10 @@ static int perf_test__list(int argc, const char **argv) 
	int i = 0;



	for_each_test(j, t) {

		++i;

		int curr = i++;



		if (argc > 1 && !strstr(t->desc, argv[1]))

		if (!perf_test__matches(t, curr, argc, argv) ||

		    (t->is_supported && !t->is_supported()))

			continue;



		pr_info("%2d: %s\n", i, t->desc);
@@ -668,7 +670,7 @@ int cmd_test(int argc, const char **argv) 


	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, argv);

		return perf_test__list(argc - 1, argv + 1);



	symbol_conf.priv_size = sizeof(int);

	symbol_conf.sort_by_name = true;