perf tests: Make DSO tests a suite rather than individual

[PATCH v1] perf tests: Make DSO tests a suite rather than individual

Posted by Ian Rogers 2 years ago

Make the DSO data tests a suite rather than individual so their output
is grouped.

Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/tests/builtin-test.c |  2 --
 tools/perf/tests/dso-data.c     | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index 113e92119e1d..9c09e4681c3a 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -62,8 +62,6 @@ static struct test_suite *generic_tests[] = {
 	&suite__pmu,
 	&suite__pmu_events,
 	&suite__dso_data,
-	&suite__dso_data_cache,
-	&suite__dso_data_reopen,
 	&suite__perf_evsel__roundtrip_name_test,
 #ifdef HAVE_LIBTRACEEVENT
 	&suite__perf_evsel__tp_sched_test,
diff --git a/tools/perf/tests/dso-data.c b/tools/perf/tests/dso-data.c
index deaefcdd8f09..5286ae8bd2d7 100644
--- a/tools/perf/tests/dso-data.c
+++ b/tools/perf/tests/dso-data.c
@@ -393,6 +393,15 @@ static int test__dso_data_reopen(struct test_suite *test __maybe_unused, int sub
 	return 0;
 }
 
-DEFINE_SUITE("DSO data read", dso_data);
-DEFINE_SUITE("DSO data cache", dso_data_cache);
-DEFINE_SUITE("DSO data reopen", dso_data_reopen);
+
+static struct test_case tests__dso_data[] = {
+	TEST_CASE("read", dso_data),
+	TEST_CASE("cache", dso_data_cache),
+	TEST_CASE("reopen", dso_data_reopen),
+	{	.name = NULL, }
+};
+
+struct test_suite suite__dso_data = {
+	.desc = "DSO data tests",
+	.test_cases = tests__dso_data,
+};
-- 
2.43.0.rc1.413.gea7ed67945-goog

Re: [PATCH v1] perf tests: Make DSO tests a suite rather than individual

Posted by Arnaldo Carvalho de Melo 1 year, 12 months ago

Em Tue, Nov 28, 2023 at 11:46:24AM -0800, Ian Rogers escreveu:
> Make the DSO data tests a suite rather than individual so their output
> is grouped.

Thanks, applied to perf-tools-next.

- Arnaldo

 
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
>  tools/perf/tests/builtin-test.c |  2 --
>  tools/perf/tests/dso-data.c     | 15 ++++++++++++---
>  2 files changed, 12 insertions(+), 5 deletions(-)
> 
> diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
> index 113e92119e1d..9c09e4681c3a 100644
> --- a/tools/perf/tests/builtin-test.c
> +++ b/tools/perf/tests/builtin-test.c
> @@ -62,8 +62,6 @@ static struct test_suite *generic_tests[] = {
>  	&suite__pmu,
>  	&suite__pmu_events,
>  	&suite__dso_data,
> -	&suite__dso_data_cache,
> -	&suite__dso_data_reopen,
>  	&suite__perf_evsel__roundtrip_name_test,
>  #ifdef HAVE_LIBTRACEEVENT
>  	&suite__perf_evsel__tp_sched_test,
> diff --git a/tools/perf/tests/dso-data.c b/tools/perf/tests/dso-data.c
> index deaefcdd8f09..5286ae8bd2d7 100644
> --- a/tools/perf/tests/dso-data.c
> +++ b/tools/perf/tests/dso-data.c
> @@ -393,6 +393,15 @@ static int test__dso_data_reopen(struct test_suite *test __maybe_unused, int sub
>  	return 0;
>  }
>  
> -DEFINE_SUITE("DSO data read", dso_data);
> -DEFINE_SUITE("DSO data cache", dso_data_cache);
> -DEFINE_SUITE("DSO data reopen", dso_data_reopen);
> +
> +static struct test_case tests__dso_data[] = {
> +	TEST_CASE("read", dso_data),
> +	TEST_CASE("cache", dso_data_cache),
> +	TEST_CASE("reopen", dso_data_reopen),
> +	{	.name = NULL, }
> +};
> +
> +struct test_suite suite__dso_data = {
> +	.desc = "DSO data tests",
> +	.test_cases = tests__dso_data,
> +};
> -- 
> 2.43.0.rc1.413.gea7ed67945-goog
> 

-- 

- Arnaldo