diff options
author | Jiri Olsa <jolsa@redhat.com> | 2012-06-21 06:25:16 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-06-25 13:55:24 -0400 |
commit | 7a25b2d32b9cb0b813d56ee6109acf90f3c9f1e5 (patch) | |
tree | d7c2cda490d97fd13f92727b9abc5e49d25f6877 /tools | |
parent | 35a468732289372aab506d7cf73f98f0379888ae (diff) |
perf test: Fix parse events test to follow proper raw event name
Following commit changed raw event names to carry event modificator.
perf evsel: Reconstruct raw event with modifiers from perf_event_attr
commit 6eef3d9c2bcf52b7a3c18e609f5838c007b989a4
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
The perf_evsel__name function now returns ':mod' suffix for raw events,
so we need to follow that in current tests.
All tests pass now for 'perf test parse' suite.
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1340274316-5161-1-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/util/parse-events-test.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/perf/util/parse-events-test.c b/tools/perf/util/parse-events-test.c index 229af6da33a2..a0f61a2a6835 100644 --- a/tools/perf/util/parse-events-test.c +++ b/tools/perf/util/parse-events-test.c | |||
@@ -413,19 +413,20 @@ static int test__checkevent_pmu_name(struct perf_evlist *evlist) | |||
413 | { | 413 | { |
414 | struct perf_evsel *evsel; | 414 | struct perf_evsel *evsel; |
415 | 415 | ||
416 | /* cpu/config=1,name=krava1/u */ | 416 | /* cpu/config=1,name=krava/u */ |
417 | evsel = list_entry(evlist->entries.next, struct perf_evsel, node); | 417 | evsel = list_entry(evlist->entries.next, struct perf_evsel, node); |
418 | TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->nr_entries); | 418 | TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->nr_entries); |
419 | TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->attr.type); | 419 | TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->attr.type); |
420 | TEST_ASSERT_VAL("wrong config", 1 == evsel->attr.config); | 420 | TEST_ASSERT_VAL("wrong config", 1 == evsel->attr.config); |
421 | TEST_ASSERT_VAL("wrong name", !strcmp(perf_evsel__name(evsel), "krava")); | 421 | TEST_ASSERT_VAL("wrong name", !strcmp(perf_evsel__name(evsel), "krava")); |
422 | 422 | ||
423 | /* cpu/config=2/" */ | 423 | /* cpu/config=2/u" */ |
424 | evsel = list_entry(evsel->node.next, struct perf_evsel, node); | 424 | evsel = list_entry(evsel->node.next, struct perf_evsel, node); |
425 | TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->nr_entries); | 425 | TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->nr_entries); |
426 | TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->attr.type); | 426 | TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->attr.type); |
427 | TEST_ASSERT_VAL("wrong config", 2 == evsel->attr.config); | 427 | TEST_ASSERT_VAL("wrong config", 2 == evsel->attr.config); |
428 | TEST_ASSERT_VAL("wrong name", !strcmp(perf_evsel__name(evsel), "raw 0x2")); | 428 | TEST_ASSERT_VAL("wrong name", |
429 | !strcmp(perf_evsel__name(evsel), "raw 0x2:u")); | ||
429 | 430 | ||
430 | return 0; | 431 | return 0; |
431 | } | 432 | } |