lkml.org 
[lkml]   [2012]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] perf, test: Fix parse events automated tests
    Date
    Parse events tests got broken after following commit:

    perf tools: Fix trace events storms due to weight demux
    commit 0983cc0dbca45250cbb5984bec7c303ac265b8e5
    Author: Frederic Weisbecker <fweisbec@gmail.com>

    that added PERF_SAMPLE_PERIOD sample type for tracepoints.

    Updating related tests.

    Signed-off-by: Jiri Olsa <jolsa@redhat.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    ---
    tools/perf/util/parse-events-test.c | 12 ++++++------
    1 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/tools/perf/util/parse-events-test.c b/tools/perf/util/parse-events-test.c
    index 1b997d2..127d648 100644
    --- a/tools/perf/util/parse-events-test.c
    +++ b/tools/perf/util/parse-events-test.c
    @@ -13,6 +13,9 @@ do { \
    } \
    } while (0)

    +#define PERF_TP_SAMPLE_TYPE (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | \
    + PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD)
    +
    static int test__checkevent_tracepoint(struct perf_evlist *evlist)
    {
    struct perf_evsel *evsel = list_entry(evlist->entries.next,
    @@ -21,8 +24,7 @@ static int test__checkevent_tracepoint(struct perf_evlist *evlist)
    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);
    + PERF_TP_SAMPLE_TYPE == evsel->attr.sample_type);
    TEST_ASSERT_VAL("wrong sample_period", 1 == evsel->attr.sample_period);
    return 0;
    }
    @@ -37,8 +39,7 @@ static int test__checkevent_tracepoint_multi(struct perf_evlist *evlist)
    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);
    + PERF_TP_SAMPLE_TYPE == evsel->attr.sample_type);
    TEST_ASSERT_VAL("wrong sample_period",
    1 == evsel->attr.sample_period);
    }
    @@ -428,8 +429,7 @@ static int test__checkevent_list(struct perf_evlist *evlist)
    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);
    + PERF_TP_SAMPLE_TYPE == 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);
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-08-01 15:41    [W:0.025 / U:94.880 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site