1 files changed, 49 insertions, 36 deletions

diff --git a/tools/perf/tests/evsel-tp-sched.c b/tools/perf/tests/evsel-tp-sched.c
index 5f8501c68da4..226196fb9677 100644
--- a/tools/perf/tests/evsel-tp-sched.c
+++ b/tools/perf/tests/evsel-tp-sched.c
@@ -1,14 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <linux/err.h>
-#include <traceevent/event-parse.h>
+#include <event-parse.h>
 #include "evsel.h"
 #include "tests.h"
 #include "debug.h"
 
-static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name,
-				  int size, bool should_be_signed)
+static int evsel__test_field(struct evsel *evsel, const char *name, int size, bool should_be_signed)
 {
-	struct tep_format_field *field = perf_evsel__field(evsel, name);
+	struct tep_format_field *field = evsel__field(evsel, name);
 	int is_signed;
 	int ret = 0;
 
@@ -17,7 +16,7 @@ static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name,
 		return -1;
 	}
 
-	is_signed = !!(field->flags | TEP_FIELD_IS_SIGNED);
+	is_signed = !!(field->flags & TEP_FIELD_IS_SIGNED);
 	if (should_be_signed && !is_signed) {
 		pr_debug("%s: \"%s\" signedness(%d) is wrong, should be %d\n",
 			 evsel->name, name, is_signed, should_be_signed);
@@ -33,57 +32,71 @@ static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name,
 	return ret;
 }
 
-int test__perf_evsel__tp_sched_test(struct test *test __maybe_unused, int subtest __maybe_unused)
+static int test__perf_evsel__tp_sched_test(struct test_suite *test __maybe_unused,
+					   int subtest __maybe_unused)
 {
-	struct perf_evsel *evsel = perf_evsel__newtp("sched", "sched_switch");
-	int ret = 0;
+	struct evsel *evsel = evsel__newtp("sched", "sched_switch");
+	int ret = TEST_OK;
 
 	if (IS_ERR(evsel)) {
-		pr_debug("perf_evsel__newtp failed with %ld\n", PTR_ERR(evsel));
-		return -1;
+		pr_debug("evsel__newtp failed with %ld\n", PTR_ERR(evsel));
+		return PTR_ERR(evsel) == -EACCES ? TEST_SKIP : TEST_FAIL;
 	}
 
-	if (perf_evsel__test_field(evsel, "prev_comm", 16, true))
-		ret = -1;
+	if (evsel__test_field(evsel, "prev_comm", 16, false))
+		ret = TEST_FAIL;
 
-	if (perf_evsel__test_field(evsel, "prev_pid", 4, true))
-		ret = -1;
+	if (evsel__test_field(evsel, "prev_pid", 4, true))
+		ret = TEST_FAIL;
 
-	if (perf_evsel__test_field(evsel, "prev_prio", 4, true))
-		ret = -1;
+	if (evsel__test_field(evsel, "prev_prio", 4, true))
+		ret = TEST_FAIL;
 
-	if (perf_evsel__test_field(evsel, "prev_state", sizeof(long), true))
-		ret = -1;
+	if (evsel__test_field(evsel, "prev_state", sizeof(long), true))
+		ret = TEST_FAIL;
 
-	if (perf_evsel__test_field(evsel, "next_comm", 16, true))
-		ret = -1;
+	if (evsel__test_field(evsel, "next_comm", 16, false))
+		ret = TEST_FAIL;
 
-	if (perf_evsel__test_field(evsel, "next_pid", 4, true))
-		ret = -1;
+	if (evsel__test_field(evsel, "next_pid", 4, true))
+		ret = TEST_FAIL;
 
-	if (perf_evsel__test_field(evsel, "next_prio", 4, true))
-		ret = -1;
+	if (evsel__test_field(evsel, "next_prio", 4, true))
+		ret = TEST_FAIL;
 
-	perf_evsel__delete(evsel);
+	evsel__delete(evsel);
 
-	evsel = perf_evsel__newtp("sched", "sched_wakeup");
+	evsel = evsel__newtp("sched", "sched_wakeup");
 
 	if (IS_ERR(evsel)) {
-		pr_debug("perf_evsel__newtp failed with %ld\n", PTR_ERR(evsel));
-		return -1;
+		pr_debug("evsel__newtp failed with %ld\n", PTR_ERR(evsel));
+		return TEST_FAIL;
 	}
 
-	if (perf_evsel__test_field(evsel, "comm", 16, true))
-		ret = -1;
+	if (evsel__test_field(evsel, "comm", 16, false))
+		ret = TEST_FAIL;
 
-	if (perf_evsel__test_field(evsel, "pid", 4, true))
-		ret = -1;
+	if (evsel__test_field(evsel, "pid", 4, true))
+		ret = TEST_FAIL;
 
-	if (perf_evsel__test_field(evsel, "prio", 4, true))
-		ret = -1;
+	if (evsel__test_field(evsel, "prio", 4, true))
+		ret = TEST_FAIL;
 
-	if (perf_evsel__test_field(evsel, "target_cpu", 4, true))
-		ret = -1;
+	if (evsel__test_field(evsel, "target_cpu", 4, true))
+		ret = TEST_FAIL;
 
+	evsel__delete(evsel);
 	return ret;
 }
+
+static struct test_case tests__perf_evsel__tp_sched_test[] = {
+	TEST_CASE_REASON("Parse sched tracepoints fields",
+			 perf_evsel__tp_sched_test,
+			 "permissions"),
+	{	.name = NULL, }
+};
+
+struct test_suite suite__perf_evsel__tp_sched_test = {
+	.desc = "Parse sched tracepoints fields",
+	.test_cases = tests__perf_evsel__tp_sched_test,
+};