From 02514518fbdfdc32dbb2b0f69f58d2504fe8d0cf Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Tue, 21 Aug 2012 20:03:15 +0200
Subject: [PATCH] --- yaml --- r: 323723 b: refs/heads/master c:
 9bfbbc6d1e6b4d055860231e232b807911bf8325 h: refs/heads/master i:   323721:
 d381250e3adcf24e133aa5c10462661b0434faf6   323719:
 8b11c096190431ebd1765a6cd83876670720eea9 v: v3

---
 [refs]                                    |  2 +-
 trunk/tools/perf/util/parse-events-test.c | 24 +++++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 6ab9c364809b..a29dcf923754 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d45a3e00687bb52a20d9256d3d1068eea271013f
+refs/heads/master: 9bfbbc6d1e6b4d055860231e232b807911bf8325
diff --git a/trunk/tools/perf/util/parse-events-test.c b/trunk/tools/perf/util/parse-events-test.c
index bf055ce1916e..392308cef177 100644
--- a/trunk/tools/perf/util/parse-events-test.c
+++ b/trunk/tools/perf/util/parse-events-test.c
@@ -948,19 +948,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)
@@ -1021,13 +1021,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);
@@ -1035,5 +1035,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;
 }