lkml.org 
[lkml]   [2021]   [Oct]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
Subject[PATCH v2 15/22] perf test: Remove now unused subtest helpers
From
Replaced by null terminated test case array.

Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/tests/builtin-test.c | 11 +----------
tools/perf/tests/tests.h | 3 ---
2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 916faeee04ff..c98c7134b552 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -119,9 +119,6 @@ static int num_subtests(const struct test_suite *t)
{
int num;

- if (t->subtest.get_nr)
- return t->subtest.get_nr();
-
if (!t->test_cases)
return 0;

@@ -134,14 +131,11 @@ static int num_subtests(const struct test_suite *t)

static bool has_subtests(const struct test_suite *t)
{
- return t->subtest.get_nr || num_subtests(t) > 1;
+ return num_subtests(t) > 1;
}

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;

@@ -153,9 +147,6 @@ static const char *test_description(const struct test_suite *t, int subtest)
if (t->test_cases && subtest >= 0)
return t->test_cases[subtest].desc;

- if (t->subtest.get_desc && subtest >= 0)
- return t->subtest.get_desc(subtest);
-
return t->desc;
}

diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
index f87129b63d92..9bf448f7429a 100644
--- a/tools/perf/tests/tests.h
+++ b/tools/perf/tests/tests.h
@@ -43,9 +43,6 @@ struct test_suite {
test_fnptr func;
struct {
bool skip_if_fail;
- int (*get_nr)(void);
- const char *(*get_desc)(int subtest);
- const char *(*skip_reason)(int subtest);
} subtest;
struct test_case *test_cases;
bool (*is_supported)(void);
--
2.33.0.882.g93a45727a2-goog
\
 
 \ /
  Last update: 2021-10-13 19:48    [W:0.373 / U:0.028 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site