lkml.org 
[lkml]   [2012]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 26/37] perf test: Fixup error reporting in basic mmap test
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    In two cases this test could detect an error, bail out but return zero.
    Fix it by reporting -1 for failure.

    Cc: David Ahern <dsahern@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Mike Galbraith <efault@gmx.de>
    Cc: Namhyung Kim <namhyung@gmail.com>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Stephane Eranian <eranian@google.com>
    Link: http://lkml.kernel.org/n/tip-tjhs9v6nqpofmxv3gs5lnu2c@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/tests/mmap-basic.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/tools/perf/tests/mmap-basic.c b/tools/perf/tests/mmap-basic.c
    index e174681..8682ecf 100644
    --- a/tools/perf/tests/mmap-basic.c
    +++ b/tools/perf/tests/mmap-basic.c
    @@ -128,6 +128,7 @@ int test__basic_mmap(void)
    goto out_munmap;
    }

    + err = -1;
    evsel = perf_evlist__id2evsel(evlist, sample.id);
    if (evsel == NULL) {
    pr_debug("event with id %" PRIu64
    @@ -137,16 +138,17 @@ int test__basic_mmap(void)
    nr_events[evsel->idx]++;
    }

    + err = 0;
    list_for_each_entry(evsel, &evlist->entries, node) {
    if (nr_events[evsel->idx] != expected_nr_events[evsel->idx]) {
    pr_debug("expected %d %s events, got %d\n",
    expected_nr_events[evsel->idx],
    perf_evsel__name(evsel), nr_events[evsel->idx]);
    + err = -1;
    goto out_munmap;
    }
    }

    - err = 0;
    out_munmap:
    perf_evlist__munmap(evlist);
    out_close_fd:
    --
    1.7.9.2.358.g22243


    \
     
     \ /
      Last update: 2012-12-12 00:21    [W:3.959 / U:0.756 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site