From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Jin Yao <yao.jin@linux.intel.com>,
John Garry <john.garry@huawei.com>,
"Paul A . Clarke" <pc@us.ibm.com>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
Brendan Higgins <brendanhiggins@google.com>,
Daniel Latypov <dlatypov@google.com>,
David Gow <davidgow@google.com>
Cc: eranian@google.com, Ian Rogers <irogers@google.com>
Subject: [PATCH v2 09/22] perf test: Convert pfm tests to use test cases.
Date: Wed, 13 Oct 2021 10:45:51 -0700 [thread overview]
Message-ID: <20211013174604.747276-10-irogers@google.com> (raw)
In-Reply-To: <20211013174604.747276-1-irogers@google.com>
Use null terminated array of test cases rather than the previous sub
test functions.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/tests/pfm.c | 66 ++++++++++++------------------------------
1 file changed, 19 insertions(+), 47 deletions(-)
diff --git a/tools/perf/tests/pfm.c b/tools/perf/tests/pfm.c
index f55e4ecdda71..651fee4ef819 100644
--- a/tools/perf/tests/pfm.c
+++ b/tools/perf/tests/pfm.c
@@ -11,27 +11,6 @@
#include <linux/kernel.h>
-#ifdef HAVE_LIBPFM
-static int test__pfm_events(void);
-static int test__pfm_group(void);
-#endif
-
-static const struct {
- int (*func)(void);
- const char *desc;
-} pfm_testcase_table[] = {
-#ifdef HAVE_LIBPFM
- {
- .func = test__pfm_events,
- .desc = "test of individual --pfm-events",
- },
- {
- .func = test__pfm_group,
- .desc = "test groups of --pfm-events",
- },
-#endif
-};
-
#ifdef HAVE_LIBPFM
static int count_pfm_events(struct perf_evlist *evlist)
{
@@ -44,7 +23,8 @@ static int count_pfm_events(struct perf_evlist *evlist)
return count;
}
-static int test__pfm_events(void)
+static int test__pfm_events(struct test_suite *test __maybe_unused,
+ int subtest __maybe_unused)
{
struct evlist *evlist;
struct option opt;
@@ -104,7 +84,8 @@ static int test__pfm_events(void)
return 0;
}
-static int test__pfm_group(void)
+static int test__pfm_group(struct test_suite *test __maybe_unused,
+ int subtest __maybe_unused)
{
struct evlist *evlist;
struct option opt;
@@ -187,37 +168,28 @@ static int test__pfm_group(void)
}
return 0;
}
-#endif
-
-static const char *test__pfm_subtest_get_desc(int i)
-{
- if (i < 0 || i >= (int)ARRAY_SIZE(pfm_testcase_table))
- return NULL;
- return pfm_testcase_table[i].desc;
-}
-
-static int test__pfm_subtest_get_nr(void)
+#else
+static int test__pfm_events(struct test_suite *test __maybe_unused,
+ int subtest __maybe_unused)
{
- return (int)ARRAY_SIZE(pfm_testcase_table);
+ return TEST_SKIP;
}
-static int test__pfm(struct test_suite *test __maybe_unused, int i __maybe_unused)
+static int test__pfm_group(struct test_suite *test __maybe_unused,
+ int subtest __maybe_unused)
{
-#ifdef HAVE_LIBPFM
- if (i < 0 || i >= (int)ARRAY_SIZE(pfm_testcase_table))
- return TEST_FAIL;
- return pfm_testcase_table[i].func();
-#else
return TEST_SKIP;
-#endif
}
+#endif
+
+static struct test_case pfm_tests[] = {
+ TEST_CASE_REASON("test of individual --pfm-events", pfm_events, "not compiled in"),
+ TEST_CASE_REASON("test groups of --pfm-events", pfm_group, "not compiled in"),
+ { .name = NULL, }
+};
struct test_suite suite__pfm = {
.desc = "Test libpfm4 support",
- .func = test__pfm,
- .subtest = {
- .skip_if_fail = true,
- .get_nr = test__pfm_subtest_get_nr,
- .get_desc = test__pfm_subtest_get_desc,
- }
+ .test_cases = pfm_tests,
+ .subtest = { .skip_if_fail = true }
};
--
2.33.0.882.g93a45727a2-goog
next prev parent reply other threads:[~2021-10-13 17:47 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-13 17:45 [PATCH v2 00/22] Start aligning perf test with kunit style Ian Rogers
2021-10-13 17:45 ` [PATCH v2 01/22] perf test: Use macro for "suite" declarations Ian Rogers
2021-10-13 17:45 ` [PATCH v2 02/22] perf test: Use macro for "suite" definitions Ian Rogers
2021-10-13 17:45 ` [PATCH v2 03/22] perf test: Make each test/suite its own struct Ian Rogers
2021-10-13 17:45 ` [PATCH v2 04/22] perf test: Move each test suite struct to its test Ian Rogers
2021-10-13 17:45 ` [PATCH v2 05/22] perf test: Rename struct test to test_suite Ian Rogers
2021-10-13 17:45 ` [PATCH v2 06/22] perf test: Add helper functions for abstraction Ian Rogers
2021-10-20 12:34 ` Jiri Olsa
2021-10-25 22:35 ` Ian Rogers
2021-10-13 17:45 ` [PATCH v2 07/22] perf test: Add test case struct Ian Rogers
2021-10-13 17:45 ` [PATCH v2 08/22] perf test: Add skip reason to test case Ian Rogers
2021-10-13 17:45 ` Ian Rogers [this message]
2021-10-13 17:45 ` [PATCH v2 10/22] perf test: Convert pmu event tests to test cases Ian Rogers
2021-10-13 17:45 ` [PATCH v2 11/22] perf test: Convert watch point " Ian Rogers
2021-10-20 12:45 ` Jiri Olsa
2021-11-13 21:11 ` Arnaldo Carvalho de Melo
2021-10-13 17:45 ` [PATCH v2 12/22] perf test: Convert clang " Ian Rogers
2021-10-13 17:45 ` [PATCH v2 13/22] perf test: Convert bpf " Ian Rogers
2021-10-13 17:45 ` [PATCH v2 14/22] perf test: Convert llvm " Ian Rogers
2021-10-13 17:45 ` [PATCH v2 15/22] perf test: Remove now unused subtest helpers Ian Rogers
2021-10-13 17:45 ` [PATCH v2 16/22] perf test: bp tests use test case Ian Rogers
2021-10-13 17:45 ` [PATCH v2 17/22] perf test: Convert time to tsc test to " Ian Rogers
2021-10-13 17:46 ` [PATCH v2 18/22] perf test: Remove non test case style support Ian Rogers
2021-10-13 17:46 ` [PATCH v2 19/22] perf test: BP tests, remove is_supported use Ian Rogers
2021-10-13 17:46 ` [PATCH v2 20/22] perf test: TSC test, " Ian Rogers
2021-10-13 17:46 ` [PATCH v2 21/22] perf test: Remove is_supported function Ian Rogers
2021-10-20 13:06 ` Jiri Olsa
2021-10-13 17:46 ` [PATCH v2 22/22] perf test: Remove skip_if_fail Ian Rogers
2021-10-20 12:14 ` [PATCH v2 00/22] Start aligning perf test with kunit style Jiri Olsa
2021-10-20 15:51 ` Ian Rogers
2021-10-28 23:52 ` Ian Rogers
2021-10-29 12:19 ` Jiri Olsa
2021-11-03 19:15 ` Ian Rogers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211013174604.747276-10-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=brendanhiggins@google.com \
--cc=davidgow@google.com \
--cc=dlatypov@google.com \
--cc=eranian@google.com \
--cc=john.garry@huawei.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=pc@us.ibm.com \
--cc=peterz@infradead.org \
--cc=yao.jin@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®