lkml.org 
[lkml]   [2019]   [Oct]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: perf/core] libperf: Keep count of failed tests
    The following commit has been merged into the perf/core branch of tip:

    Commit-ID: 301a89f8cf628316eea6c768787a836b63a83439
    Gitweb: https://git.kernel.org/tip/301a89f8cf628316eea6c768787a836b63a83439
    Author: Jiri Olsa <jolsa@kernel.org>
    AuthorDate: Thu, 17 Oct 2019 12:59:16 +02:00
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitterDate: Sat, 19 Oct 2019 15:35:01 -03:00

    libperf: Keep count of failed tests

    Keep the count of failed tests, so we get better output with failures,
    like:

    # make tests
    ...
    running static:
    - running test-cpumap.c...OK
    - running test-threadmap.c...OK
    - running test-evlist.c...FAILED test-evlist.c:53 failed to create evsel2
    FAILED test-evlist.c:163 failed to create evsel2
    FAILED test-evlist.c:287 failed count
    FAILED (3)
    - running test-evsel.c...OK
    running dynamic:
    - running test-cpumap.c...OK
    - running test-threadmap.c...OK
    - running test-evlist.c...FAILED test-evlist.c:53 failed to create evsel2
    FAILED test-evlist.c:163 failed to create evsel2
    FAILED test-evlist.c:287 failed count
    FAILED (3)
    - running test-evsel.c...OK
    ...

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: Jin Yao <yao.jin@linux.intel.com>
    Cc: Michael Petlan <mpetlan@redhat.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Stephane Eranian <eranian@google.com>
    Link: http://lore.kernel.org/lkml/20191017105918.20873-9-jolsa@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/lib/include/internal/tests.h | 20 +++++++++++++++++---
    tools/perf/lib/tests/test-cpumap.c | 2 +-
    tools/perf/lib/tests/test-evlist.c | 2 +-
    tools/perf/lib/tests/test-evsel.c | 2 +-
    tools/perf/lib/tests/test-threadmap.c | 2 +-
    5 files changed, 21 insertions(+), 7 deletions(-)

    diff --git a/tools/perf/lib/include/internal/tests.h b/tools/perf/lib/include/internal/tests.h
    index b7a20cd..2093e88 100644
    --- a/tools/perf/lib/include/internal/tests.h
    +++ b/tools/perf/lib/include/internal/tests.h
    @@ -4,14 +4,28 @@

    #include <stdio.h>

    -#define __T_START fprintf(stdout, "- running %s...", __FILE__)
    -#define __T_OK fprintf(stdout, "OK\n")
    -#define __T_FAIL fprintf(stdout, "FAIL\n")
    +int tests_failed;
    +
    +#define __T_START \
    +do { \
    + fprintf(stdout, "- running %s...", __FILE__); \
    + fflush(NULL); \
    + tests_failed = 0; \
    +} while (0)
    +
    +#define __T_END \
    +do { \
    + if (tests_failed) \
    + fprintf(stdout, " FAILED (%d)\n", tests_failed); \
    + else \
    + fprintf(stdout, "OK\n"); \
    +} while (0)

    #define __T(text, cond) \
    do { \
    if (!(cond)) { \
    fprintf(stderr, "FAILED %s:%d %s\n", __FILE__, __LINE__, text); \
    + tests_failed++; \
    return -1; \
    } \
    } while (0)
    diff --git a/tools/perf/lib/tests/test-cpumap.c b/tools/perf/lib/tests/test-cpumap.c
    index aa34c20..c8d4509 100644
    --- a/tools/perf/lib/tests/test-cpumap.c
    +++ b/tools/perf/lib/tests/test-cpumap.c
    @@ -26,6 +26,6 @@ int main(int argc, char **argv)
    perf_cpu_map__put(cpus);
    perf_cpu_map__put(cpus);

    - __T_OK;
    + __T_END;
    return 0;
    }
    diff --git a/tools/perf/lib/tests/test-evlist.c b/tools/perf/lib/tests/test-evlist.c
    index 741bc1b..6d8ebe0 100644
    --- a/tools/perf/lib/tests/test-evlist.c
    +++ b/tools/perf/lib/tests/test-evlist.c
    @@ -408,6 +408,6 @@ int main(int argc, char **argv)
    test_mmap_thread();
    test_mmap_cpus();

    - __T_OK;
    + __T_END;
    return 0;
    }
    diff --git a/tools/perf/lib/tests/test-evsel.c b/tools/perf/lib/tests/test-evsel.c
    index 1b6c428..135722a 100644
    --- a/tools/perf/lib/tests/test-evsel.c
    +++ b/tools/perf/lib/tests/test-evsel.c
    @@ -130,6 +130,6 @@ int main(int argc, char **argv)
    test_stat_thread();
    test_stat_thread_enable();

    - __T_OK;
    + __T_END;
    return 0;
    }
    diff --git a/tools/perf/lib/tests/test-threadmap.c b/tools/perf/lib/tests/test-threadmap.c
    index 8c5f472..7dc4d6f 100644
    --- a/tools/perf/lib/tests/test-threadmap.c
    +++ b/tools/perf/lib/tests/test-threadmap.c
    @@ -26,6 +26,6 @@ int main(int argc, char **argv)
    perf_thread_map__put(threads);
    perf_thread_map__put(threads);

    - __T_OK;
    + __T_END;
    return 0;
    }
    \
     
     \ /
      Last update: 2019-10-22 02:21    [W:2.625 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site