]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/blobdiff - tools/perf/builtin-test.c
perf tools: Convert critical messages to ui__error()
[mirror_ubuntu-zesty-kernel.git] / tools / perf / builtin-test.c
index 6c47376e29d81b93983ae5fd6d8cbafa47f293f2..5a8727c0875772c9c37c3fc381b1812161c3b983 100644 (file)
@@ -604,556 +604,6 @@ out_free_threads:
 #undef nsyscalls
 }
 
-#define TEST_ASSERT_VAL(text, cond) \
-do { \
-       if (!(cond)) { \
-               pr_debug("FAILED %s:%d %s\n", __FILE__, __LINE__, text); \
-               return -1; \
-       } \
-} while (0)
-
-static int test__checkevent_tracepoint(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
-       TEST_ASSERT_VAL("wrong type", PERF_TYPE_TRACEPOINT == evsel->attr.type);
-       TEST_ASSERT_VAL("wrong sample_type",
-               (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | PERF_SAMPLE_CPU) ==
-               evsel->attr.sample_type);
-       TEST_ASSERT_VAL("wrong sample_period", 1 == evsel->attr.sample_period);
-       return 0;
-}
-
-static int test__checkevent_tracepoint_multi(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel;
-
-       TEST_ASSERT_VAL("wrong number of entries", evlist->nr_entries > 1);
-
-       list_for_each_entry(evsel, &evlist->entries, node) {
-               TEST_ASSERT_VAL("wrong type",
-                       PERF_TYPE_TRACEPOINT == evsel->attr.type);
-               TEST_ASSERT_VAL("wrong sample_type",
-                       (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | PERF_SAMPLE_CPU)
-                       == evsel->attr.sample_type);
-               TEST_ASSERT_VAL("wrong sample_period",
-                       1 == evsel->attr.sample_period);
-       }
-       return 0;
-}
-
-static int test__checkevent_raw(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
-       TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->attr.type);
-       TEST_ASSERT_VAL("wrong config", 0x1a == evsel->attr.config);
-       return 0;
-}
-
-static int test__checkevent_numeric(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
-       TEST_ASSERT_VAL("wrong type", 1 == evsel->attr.type);
-       TEST_ASSERT_VAL("wrong config", 1 == evsel->attr.config);
-       return 0;
-}
-
-static int test__checkevent_symbolic_name(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
-       TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->attr.type);
-       TEST_ASSERT_VAL("wrong config",
-                       PERF_COUNT_HW_INSTRUCTIONS == evsel->attr.config);
-       return 0;
-}
-
-static int test__checkevent_symbolic_name_config(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
-       TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->attr.type);
-       TEST_ASSERT_VAL("wrong config",
-                       PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config);
-       TEST_ASSERT_VAL("wrong period",
-                       100000 == evsel->attr.sample_period);
-       TEST_ASSERT_VAL("wrong config1",
-                       0 == evsel->attr.config1);
-       TEST_ASSERT_VAL("wrong config2",
-                       1 == evsel->attr.config2);
-       return 0;
-}
-
-static int test__checkevent_symbolic_alias(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
-       TEST_ASSERT_VAL("wrong type", PERF_TYPE_SOFTWARE == evsel->attr.type);
-       TEST_ASSERT_VAL("wrong config",
-                       PERF_COUNT_SW_PAGE_FAULTS == evsel->attr.config);
-       return 0;
-}
-
-static int test__checkevent_genhw(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
-       TEST_ASSERT_VAL("wrong type", PERF_TYPE_HW_CACHE == evsel->attr.type);
-       TEST_ASSERT_VAL("wrong config", (1 << 16) == evsel->attr.config);
-       return 0;
-}
-
-static int test__checkevent_breakpoint(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
-       TEST_ASSERT_VAL("wrong type", PERF_TYPE_BREAKPOINT == evsel->attr.type);
-       TEST_ASSERT_VAL("wrong config", 0 == evsel->attr.config);
-       TEST_ASSERT_VAL("wrong bp_type", (HW_BREAKPOINT_R | HW_BREAKPOINT_W) ==
-                                        evsel->attr.bp_type);
-       TEST_ASSERT_VAL("wrong bp_len", HW_BREAKPOINT_LEN_4 ==
-                                       evsel->attr.bp_len);
-       return 0;
-}
-
-static int test__checkevent_breakpoint_x(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
-       TEST_ASSERT_VAL("wrong type", PERF_TYPE_BREAKPOINT == evsel->attr.type);
-       TEST_ASSERT_VAL("wrong config", 0 == evsel->attr.config);
-       TEST_ASSERT_VAL("wrong bp_type",
-                       HW_BREAKPOINT_X == evsel->attr.bp_type);
-       TEST_ASSERT_VAL("wrong bp_len", sizeof(long) == evsel->attr.bp_len);
-       return 0;
-}
-
-static int test__checkevent_breakpoint_r(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
-       TEST_ASSERT_VAL("wrong type",
-                       PERF_TYPE_BREAKPOINT == evsel->attr.type);
-       TEST_ASSERT_VAL("wrong config", 0 == evsel->attr.config);
-       TEST_ASSERT_VAL("wrong bp_type",
-                       HW_BREAKPOINT_R == evsel->attr.bp_type);
-       TEST_ASSERT_VAL("wrong bp_len",
-                       HW_BREAKPOINT_LEN_4 == evsel->attr.bp_len);
-       return 0;
-}
-
-static int test__checkevent_breakpoint_w(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
-       TEST_ASSERT_VAL("wrong type",
-                       PERF_TYPE_BREAKPOINT == evsel->attr.type);
-       TEST_ASSERT_VAL("wrong config", 0 == evsel->attr.config);
-       TEST_ASSERT_VAL("wrong bp_type",
-                       HW_BREAKPOINT_W == evsel->attr.bp_type);
-       TEST_ASSERT_VAL("wrong bp_len",
-                       HW_BREAKPOINT_LEN_4 == evsel->attr.bp_len);
-       return 0;
-}
-
-static int test__checkevent_tracepoint_modifier(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
-       TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
-       TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
-       TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
-
-       return test__checkevent_tracepoint(evlist);
-}
-
-static int
-test__checkevent_tracepoint_multi_modifier(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel;
-
-       TEST_ASSERT_VAL("wrong number of entries", evlist->nr_entries > 1);
-
-       list_for_each_entry(evsel, &evlist->entries, node) {
-               TEST_ASSERT_VAL("wrong exclude_user",
-                               !evsel->attr.exclude_user);
-               TEST_ASSERT_VAL("wrong exclude_kernel",
-                               evsel->attr.exclude_kernel);
-               TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
-               TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
-       }
-
-       return test__checkevent_tracepoint_multi(evlist);
-}
-
-static int test__checkevent_raw_modifier(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
-       TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
-       TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
-       TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
-
-       return test__checkevent_raw(evlist);
-}
-
-static int test__checkevent_numeric_modifier(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
-       TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
-       TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
-       TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
-
-       return test__checkevent_numeric(evlist);
-}
-
-static int test__checkevent_symbolic_name_modifier(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
-       TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
-       TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
-       TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
-
-       return test__checkevent_symbolic_name(evlist);
-}
-
-static int test__checkevent_exclude_host_modifier(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);
-       TEST_ASSERT_VAL("wrong exclude host", evsel->attr.exclude_host);
-
-       return test__checkevent_symbolic_name(evlist);
-}
-
-static int test__checkevent_exclude_guest_modifier(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest);
-       TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
-
-       return test__checkevent_symbolic_name(evlist);
-}
-
-static int test__checkevent_symbolic_alias_modifier(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
-       TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
-       TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
-       TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
-
-       return test__checkevent_symbolic_alias(evlist);
-}
-
-static int test__checkevent_genhw_modifier(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
-       TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
-       TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
-       TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
-
-       return test__checkevent_genhw(evlist);
-}
-
-static int test__checkevent_breakpoint_modifier(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
-       TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
-       TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
-       TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
-
-       return test__checkevent_breakpoint(evlist);
-}
-
-static int test__checkevent_breakpoint_x_modifier(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
-       TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
-       TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
-       TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
-
-       return test__checkevent_breakpoint_x(evlist);
-}
-
-static int test__checkevent_breakpoint_r_modifier(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
-       TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
-       TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
-       TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
-
-       return test__checkevent_breakpoint_r(evlist);
-}
-
-static int test__checkevent_breakpoint_w_modifier(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
-       TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
-       TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
-       TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
-
-       return test__checkevent_breakpoint_w(evlist);
-}
-
-static int test__checkevent_pmu(struct perf_evlist *evlist)
-{
-
-       struct perf_evsel *evsel = list_entry(evlist->entries.next,
-                                             struct perf_evsel, node);
-
-       TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
-       TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->attr.type);
-       TEST_ASSERT_VAL("wrong config",    10 == evsel->attr.config);
-       TEST_ASSERT_VAL("wrong config1",    1 == evsel->attr.config1);
-       TEST_ASSERT_VAL("wrong config2",    3 == evsel->attr.config2);
-       TEST_ASSERT_VAL("wrong period",  1000 == evsel->attr.sample_period);
-
-       return 0;
-}
-
-static int test__checkevent_list(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel;
-
-       TEST_ASSERT_VAL("wrong number of entries", 3 == evlist->nr_entries);
-
-       /* r1 */
-       evsel = list_entry(evlist->entries.next, struct perf_evsel, node);
-       TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->attr.type);
-       TEST_ASSERT_VAL("wrong config", 1 == evsel->attr.config);
-       TEST_ASSERT_VAL("wrong config1", 0 == evsel->attr.config1);
-       TEST_ASSERT_VAL("wrong config2", 0 == evsel->attr.config2);
-       TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
-       TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
-       TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
-       TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
-
-       /* syscalls:sys_enter_open:k */
-       evsel = list_entry(evsel->node.next, struct perf_evsel, node);
-       TEST_ASSERT_VAL("wrong type", PERF_TYPE_TRACEPOINT == evsel->attr.type);
-       TEST_ASSERT_VAL("wrong sample_type",
-               (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | PERF_SAMPLE_CPU) ==
-               evsel->attr.sample_type);
-       TEST_ASSERT_VAL("wrong sample_period", 1 == evsel->attr.sample_period);
-       TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
-       TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
-       TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
-       TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
-
-       /* 1:1:hp */
-       evsel = list_entry(evsel->node.next, struct perf_evsel, node);
-       TEST_ASSERT_VAL("wrong type", 1 == evsel->attr.type);
-       TEST_ASSERT_VAL("wrong config", 1 == evsel->attr.config);
-       TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
-       TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
-       TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
-       TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
-
-       return 0;
-}
-
-static struct test__event_st {
-       const char *name;
-       __u32 type;
-       int (*check)(struct perf_evlist *evlist);
-} test__events[] = {
-       {
-               .name  = "syscalls:sys_enter_open",
-               .check = test__checkevent_tracepoint,
-       },
-       {
-               .name  = "syscalls:*",
-               .check = test__checkevent_tracepoint_multi,
-       },
-       {
-               .name  = "r1a",
-               .check = test__checkevent_raw,
-       },
-       {
-               .name  = "1:1",
-               .check = test__checkevent_numeric,
-       },
-       {
-               .name  = "instructions",
-               .check = test__checkevent_symbolic_name,
-       },
-       {
-               .name  = "cycles/period=100000,config2/",
-               .check = test__checkevent_symbolic_name_config,
-       },
-       {
-               .name  = "faults",
-               .check = test__checkevent_symbolic_alias,
-       },
-       {
-               .name  = "L1-dcache-load-miss",
-               .check = test__checkevent_genhw,
-       },
-       {
-               .name  = "mem:0",
-               .check = test__checkevent_breakpoint,
-       },
-       {
-               .name  = "mem:0:x",
-               .check = test__checkevent_breakpoint_x,
-       },
-       {
-               .name  = "mem:0:r",
-               .check = test__checkevent_breakpoint_r,
-       },
-       {
-               .name  = "mem:0:w",
-               .check = test__checkevent_breakpoint_w,
-       },
-       {
-               .name  = "syscalls:sys_enter_open:k",
-               .check = test__checkevent_tracepoint_modifier,
-       },
-       {
-               .name  = "syscalls:*:u",
-               .check = test__checkevent_tracepoint_multi_modifier,
-       },
-       {
-               .name  = "r1a:kp",
-               .check = test__checkevent_raw_modifier,
-       },
-       {
-               .name  = "1:1:hp",
-               .check = test__checkevent_numeric_modifier,
-       },
-       {
-               .name  = "instructions:h",
-               .check = test__checkevent_symbolic_name_modifier,
-       },
-       {
-               .name  = "faults:u",
-               .check = test__checkevent_symbolic_alias_modifier,
-       },
-       {
-               .name  = "L1-dcache-load-miss:kp",
-               .check = test__checkevent_genhw_modifier,
-       },
-       {
-               .name  = "mem:0:u",
-               .check = test__checkevent_breakpoint_modifier,
-       },
-       {
-               .name  = "mem:0:x:k",
-               .check = test__checkevent_breakpoint_x_modifier,
-       },
-       {
-               .name  = "mem:0:r:hp",
-               .check = test__checkevent_breakpoint_r_modifier,
-       },
-       {
-               .name  = "mem:0:w:up",
-               .check = test__checkevent_breakpoint_w_modifier,
-       },
-       {
-               .name  = "cpu/config=10,config1,config2=3,period=1000/u",
-               .check = test__checkevent_pmu,
-       },
-       {
-               .name  = "r1,syscalls:sys_enter_open:k,1:1:hp",
-               .check = test__checkevent_list,
-       },
-       {
-               .name  = "instructions:G",
-               .check = test__checkevent_exclude_host_modifier,
-       },
-       {
-               .name  = "instructions:H",
-               .check = test__checkevent_exclude_guest_modifier,
-       },
-};
-
-#define TEST__EVENTS_CNT (sizeof(test__events) / sizeof(struct test__event_st))
-
-static int test__parse_events(void)
-{
-       struct perf_evlist *evlist;
-       u_int i;
-       int ret = 0;
-
-       for (i = 0; i < TEST__EVENTS_CNT; i++) {
-               struct test__event_st *e = &test__events[i];
-
-               evlist = perf_evlist__new(NULL, NULL);
-               if (evlist == NULL)
-                       break;
-
-               ret = parse_events(evlist, e->name, 0);
-               if (ret) {
-                       pr_debug("failed to parse event '%s', err %d\n",
-                                e->name, ret);
-                       break;
-               }
-
-               ret = e->check(evlist);
-               perf_evlist__delete(evlist);
-               if (ret)
-                       break;
-       }
-
-       return ret;
-}
-
 static int sched__get_first_possible_cpu(pid_t pid, cpu_set_t **maskp,
                                         size_t *sizep)
 {
@@ -1675,7 +1125,7 @@ static struct test {
        },
        {
                .desc = "parse events tests",
-               .func = test__parse_events,
+               .func = parse_events__test,
        },
 #if defined(__x86_64__) || defined(__i386__)
        {