lkml.org 
[lkml]   [2021]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 05/10] libperf: tests: Add support for verbose printing
    Date
    Add __T_VERBOSE() so tests can add verbose output. The verbose output is
    enabled with the '-v' command line option.

    Signed-off-by: Rob Herring <robh@kernel.org>
    ---
    v5:
    - Pass verbose flag to static tests
    - Fix getopt loop with unsigned char (arm64)
    v3:
    - New patch
    ---
    tools/lib/perf/include/internal/tests.h | 32 +++++++++++++++++++++++++
    tools/lib/perf/tests/Makefile | 6 +++--
    2 files changed, 36 insertions(+), 2 deletions(-)

    diff --git a/tools/lib/perf/include/internal/tests.h b/tools/lib/perf/include/internal/tests.h
    index 2093e8868a67..29425c2dabe1 100644
    --- a/tools/lib/perf/include/internal/tests.h
    +++ b/tools/lib/perf/include/internal/tests.h
    @@ -3,11 +3,32 @@
    #define __LIBPERF_INTERNAL_TESTS_H

    #include <stdio.h>
    +#include <unistd.h>

    int tests_failed;
    +int tests_verbose;
    +
    +static inline int get_verbose(char **argv, int argc)
    +{
    + int c;
    + int verbose = 0;
    +
    + while ((c = getopt(argc, argv, "v")) != -1) {
    + switch (c)
    + {
    + case 'v':
    + verbose = 1;
    + break;
    + default:
    + break;
    + }
    + }
    + return verbose;
    +}

    #define __T_START \
    do { \
    + tests_verbose = get_verbose(argv, argc); \
    fprintf(stdout, "- running %s...", __FILE__); \
    fflush(NULL); \
    tests_failed = 0; \
    @@ -30,4 +51,15 @@ do {
    } \
    } while (0)

    +#define __T_VERBOSE(...) \
    +do { \
    + if (tests_verbose) { \
    + if (tests_verbose == 1) { \
    + fputc('\n', stderr); \
    + tests_verbose++; \
    + } \
    + fprintf(stderr, ##__VA_ARGS__); \
    + } \
    +} while (0)
    +
    #endif /* __LIBPERF_INTERNAL_TESTS_H */
    diff --git a/tools/lib/perf/tests/Makefile b/tools/lib/perf/tests/Makefile
    index 96841775feaf..b536cc9a26dd 100644
    --- a/tools/lib/perf/tests/Makefile
    +++ b/tools/lib/perf/tests/Makefile
    @@ -5,6 +5,8 @@ TESTS = test-cpumap test-threadmap test-evlist test-evsel
    TESTS_SO := $(addsuffix -so,$(TESTS))
    TESTS_A := $(addsuffix -a,$(TESTS))

    +TEST_ARGS := $(if $(V),-v)
    +
    # Set compile option CFLAGS
    ifdef EXTRA_CFLAGS
    CFLAGS := $(EXTRA_CFLAGS)
    @@ -28,9 +30,9 @@ all: $(TESTS_A) $(TESTS_SO)

    run:
    @echo "running static:"
    - @for i in $(TESTS_A); do ./$$i; done
    + @for i in $(TESTS_A); do ./$$i $(TEST_ARGS); done
    @echo "running dynamic:"
    - @for i in $(TESTS_SO); do LD_LIBRARY_PATH=../ ./$$i; done
    + @for i in $(TESTS_SO); do LD_LIBRARY_PATH=../ ./$$i $(TEST_ARGS); done

    clean:
    $(call QUIET_CLEAN, tests)$(RM) $(TESTS_A) $(TESTS_SO)
    --
    2.27.0
    \
     
     \ /
      Last update: 2021-03-11 01:10    [W:4.173 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site