[PATCH 2/2] perf test: Do not abort tests on error

Robert Richter
2012-08-21T18:03:51Z

Run through all tests regardless of failures. On errors, return the
first error code detected.

Signed-off-by: Robert Richter <robert.richter@amd.com>
---
tools/perf/util/parse-events-test.c | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/tools/perf/util/parse-events-test.c b/tools/perf/util/parse-events-test.c
index 74be1bf..bc8b651 100644
--- a/tools/perf/util/parse-events-test.c
+++ b/tools/perf/util/parse-events-test.c
@@ -949,19 +949,19 @@ static int test_event(struct test__event_st *e)

static int test_events(struct test__event_st *events, unsigned cnt)
{
- int ret = 0;
+ int ret1, ret2 = 0;
unsigned i;

for (i = 0; i < cnt; i++) {
struct test__event_st *e = &events[i];

pr_debug("running test %d '%s'\n", i, e->name);
- ret = test_event(e);
- if (ret)
- break;
+ ret1 = test_event(e);
+ if (ret1)
+ ret2 = ret1;
}

- return ret;
+ return ret2;
}

static int test_term(struct test__term *t)
@@ -1022,13 +1022,13 @@ static int test_pmu(void)

int parse_events__test(void)
{
- int ret;
+ int ret1, ret2 = 0;

#define TEST_EVENTS(tests) \
do { \
- ret = test_events(tests, ARRAY_SIZE(tests)); \
- if (ret) \
- return ret; \
+ ret1 = test_events(tests, ARRAY_SIZE(tests)); \
+ if (!ret2) \
+ ret2 = ret1; \
} while (0)

TEST_EVENTS(test__events);
@@ -1036,5 +1036,9 @@ do { \
if (test_pmu())
TEST_EVENTS(test__events_pmu);

- return test_terms(test__terms, ARRAY_SIZE(test__terms));
+ ret1 = test_terms(test__terms, ARRAY_SIZE(test__terms));
+ if (!ret2)
+ ret2 = ret1;
+
+ return ret2;
}
--
1.7.8.6