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 08/22] perf test: Add skip reason to test case.
Date: Wed, 13 Oct 2021 10:45:50 -0700 [thread overview]
Message-ID: <20211013174604.747276-9-irogers@google.com> (raw)
In-Reply-To: <20211013174604.747276-1-irogers@google.com>
This doesn't exist in kunit, but will ease the transition from perf
tests.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/tests/builtin-test.c | 3 +++
tools/perf/tests/tests.h | 11 ++++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index a6d84feba483..916faeee04ff 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -142,6 +142,9 @@ static const char *skip_reason(const struct test_suite *t, int subtest)
if (t->subtest.skip_reason)
return t->subtest.skip_reason(subtest);
+ if (t->test_cases)
+ return t->test_cases[subtest].skip_reason;
+
return NULL;
}
diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
index 71b8d2c88e5c..f87129b63d92 100644
--- a/tools/perf/tests/tests.h
+++ b/tools/perf/tests/tests.h
@@ -34,6 +34,7 @@ typedef int (*test_fnptr)(struct test_suite *, int);
struct test_case {
const char *name;
const char *desc;
+ const char *skip_reason;
test_fnptr run_case;
};
@@ -61,7 +62,15 @@ struct test_suite {
.run_case = test__##_name, \
}
-#define DEFINE_SUITE(description, _name) \
+#define TEST_CASE_REASON(description, _name, _reason) \
+ { \
+ .name = #_name, \
+ .desc = description, \
+ .run_case = test__##_name, \
+ .skip_reason = _reason, \
+ }
+
+#define DEFINE_SUITE(description, _name) \
struct test_case tests__##_name[] = { \
TEST_CASE(description, _name), \
{ .name = NULL, } \
--
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 ` Ian Rogers [this message]
2021-10-13 17:45 ` [PATCH v2 09/22] perf test: Convert pfm tests to use test cases Ian Rogers
2021-10-13 17:45 ` [PATCH v2 10/22] perf test: Convert pmu event tests to " 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-9-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