diff options
author | Jiri Olsa <jolsa@redhat.com> | 2013-06-07 09:37:03 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-07-12 12:45:52 -0400 |
commit | 450ac18d8f8076f0c522af1afb8519614a3b32f5 (patch) | |
tree | 1e5740504753077f49be14274747a66c44efc66a /tools/perf/tests | |
parent | 5888a8c26e5f8e76334d579637f9ed55036cec5a (diff) |
perf tests: Make TEST_ASSERT_VAL global
Making TEST_ASSERT_VAL global as it's used in multiple objects.
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1370612223-19188-3-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/tests')
-rw-r--r-- | tools/perf/tests/dso-data.c | 8 | ||||
-rw-r--r-- | tools/perf/tests/parse-events.c | 8 | ||||
-rw-r--r-- | tools/perf/tests/tests.h | 8 |
3 files changed, 8 insertions, 16 deletions
diff --git a/tools/perf/tests/dso-data.c b/tools/perf/tests/dso-data.c index 5eaffa2de9c5..dffe0551acaa 100644 --- a/tools/perf/tests/dso-data.c +++ b/tools/perf/tests/dso-data.c | |||
@@ -10,14 +10,6 @@ | |||
10 | #include "symbol.h" | 10 | #include "symbol.h" |
11 | #include "tests.h" | 11 | #include "tests.h" |
12 | 12 | ||
13 | #define TEST_ASSERT_VAL(text, cond) \ | ||
14 | do { \ | ||
15 | if (!(cond)) { \ | ||
16 | pr_debug("FAILED %s:%d %s\n", __FILE__, __LINE__, text); \ | ||
17 | return -1; \ | ||
18 | } \ | ||
19 | } while (0) | ||
20 | |||
21 | static char *test_file(int size) | 13 | static char *test_file(int size) |
22 | { | 14 | { |
23 | static char buf_templ[] = "/tmp/test-XXXXXX"; | 15 | static char buf_templ[] = "/tmp/test-XXXXXX"; |
diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c index 0275bab4ea9e..ad950f57d85b 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c | |||
@@ -7,14 +7,6 @@ | |||
7 | #include "tests.h" | 7 | #include "tests.h" |
8 | #include <linux/hw_breakpoint.h> | 8 | #include <linux/hw_breakpoint.h> |
9 | 9 | ||
10 | #define TEST_ASSERT_VAL(text, cond) \ | ||
11 | do { \ | ||
12 | if (!(cond)) { \ | ||
13 | pr_debug("FAILED %s:%d %s\n", __FILE__, __LINE__, text); \ | ||
14 | return -1; \ | ||
15 | } \ | ||
16 | } while (0) | ||
17 | |||
18 | #define PERF_TP_SAMPLE_TYPE (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | \ | 10 | #define PERF_TP_SAMPLE_TYPE (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | \ |
19 | PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD) | 11 | PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD) |
20 | 12 | ||
diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index dd7feae2d37b..07a92f9c6712 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h | |||
@@ -1,6 +1,14 @@ | |||
1 | #ifndef TESTS_H | 1 | #ifndef TESTS_H |
2 | #define TESTS_H | 2 | #define TESTS_H |
3 | 3 | ||
4 | #define TEST_ASSERT_VAL(text, cond) \ | ||
5 | do { \ | ||
6 | if (!(cond)) { \ | ||
7 | pr_debug("FAILED %s:%d %s\n", __FILE__, __LINE__, text); \ | ||
8 | return -1; \ | ||
9 | } \ | ||
10 | } while (0) | ||
11 | |||
4 | enum { | 12 | enum { |
5 | TEST_OK = 0, | 13 | TEST_OK = 0, |
6 | TEST_FAIL = -1, | 14 | TEST_FAIL = -1, |