Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-microblaze.git] / tools / perf / tests / parse-events.c

diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
index fd3556c..6af9463 100644 (file)
--- a/tools/perf/tests/parse-events.c
+++ b/tools/perf/tests/parse-events.c
@@ -605,7 +605,7 @@ static int test__checkterms_simple(struct list_head *terms)
        TEST_ASSERT_VAL("wrong type val",
                        term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
        TEST_ASSERT_VAL("wrong val", term->val.num == 10);
-       TEST_ASSERT_VAL("wrong config", !term->config);
+       TEST_ASSERT_VAL("wrong config", !strcmp(term->config, "config"));
 
        /* config1 */
        term = list_entry(term->list.next, struct parse_events_term, list);
@@ -614,7 +614,7 @@ static int test__checkterms_simple(struct list_head *terms)
        TEST_ASSERT_VAL("wrong type val",
                        term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
        TEST_ASSERT_VAL("wrong val", term->val.num == 1);
-       TEST_ASSERT_VAL("wrong config", !term->config);
+       TEST_ASSERT_VAL("wrong config", !strcmp(term->config, "config1"));
 
        /* config2=3 */
        term = list_entry(term->list.next, struct parse_events_term, list);
@@ -623,7 +623,7 @@ static int test__checkterms_simple(struct list_head *terms)
        TEST_ASSERT_VAL("wrong type val",
                        term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
        TEST_ASSERT_VAL("wrong val", term->val.num == 3);
-       TEST_ASSERT_VAL("wrong config", !term->config);
+       TEST_ASSERT_VAL("wrong config", !strcmp(term->config, "config2"));
 
        /* umask=1*/
        term = list_entry(term->list.next, struct parse_events_term, list);
@@ -661,7 +661,7 @@ static int test__checkterms_simple(struct list_head *terms)
        TEST_ASSERT_VAL("wrong type val",
                        term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
        TEST_ASSERT_VAL("wrong val", term->val.num == 0xead);
-       TEST_ASSERT_VAL("wrong config", !term->config);
+       TEST_ASSERT_VAL("wrong config", !strcmp(term->config, "config"));
        return 0;
 }
 
@@ -2045,7 +2045,6 @@ static int test_event(struct evlist_test *e)
        struct evlist *evlist;
        int ret;
 
-       bzero(&err, sizeof(err));
        if (e->valid && !e->valid()) {
                pr_debug("... SKIP");
                return 0;
@@ -2055,15 +2054,16 @@ static int test_event(struct evlist_test *e)
        if (evlist == NULL)
                return -ENOMEM;
 
+       parse_events_error__init(&err);
        ret = parse_events(evlist, e->name, &err);
        if (ret) {
                pr_debug("failed to parse event '%s', err %d, str '%s'\n",
                         e->name, ret, err.str);
-               parse_events_print_error(&err, e->name);
+               parse_events_error__print(&err, e->name);
        } else {
                ret = e->check(evlist);
        }
-
+       parse_events_error__exit(&err);
        evlist__delete(evlist);
 
        return ret;