From 32041519cb9af13c5d1c3982f3c3022c6bd12923 Mon Sep 17 00:00:00 2001 From: Jiri Olsa Date: Wed, 19 Dec 2012 11:33:39 -0300 Subject: [PATCH] --- yaml --- r: 349936 b: refs/heads/master c: f4c1ea5f2a6b9e1c0aaa874ffb25fe4a4f9f1a3f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/tools/perf/tests/builtin-test.c | 15 ++++++++++++--- trunk/tools/perf/tests/tests.h | 6 ++++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a9668dc3a96f..adf6a73e7768 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20914ce5b9e1ef4a35f1f09a2c9c8fb8eb1c4d86 +refs/heads/master: f4c1ea5f2a6b9e1c0aaa874ffb25fe4a4f9f1a3f diff --git a/trunk/tools/perf/tests/builtin-test.c b/trunk/tools/perf/tests/builtin-test.c index a164e4cd5f42..6a5dee2377b0 100644 --- a/trunk/tools/perf/tests/builtin-test.c +++ b/trunk/tools/perf/tests/builtin-test.c @@ -129,10 +129,19 @@ static int __cmd_test(int argc, const char *argv[]) pr_debug("\n--- start ---\n"); err = tests[curr].func(); pr_debug("---- end ----\n%s:", tests[curr].desc); - if (err) - color_fprintf(stderr, PERF_COLOR_RED, " FAILED!\n"); - else + + switch (err) { + case TEST_OK: pr_info(" Ok\n"); + break; + case TEST_SKIP: + color_fprintf(stderr, PERF_COLOR_YELLOW, " Skip\n"); + break; + case TEST_FAIL: + default: + color_fprintf(stderr, PERF_COLOR_RED, " FAILED!\n"); + break; + } } return 0; diff --git a/trunk/tools/perf/tests/tests.h b/trunk/tools/perf/tests/tests.h index 0ded425b17d6..5de0be1ff4b6 100644 --- a/trunk/tools/perf/tests/tests.h +++ b/trunk/tools/perf/tests/tests.h @@ -1,6 +1,12 @@ #ifndef TESTS_H #define TESTS_H +enum { + TEST_OK = 0, + TEST_FAIL = -1, + TEST_SKIP = -2, +}; + /* Tests */ int test__vmlinux_matches_kallsyms(void); int test__open_syscall_event(void);