[PATCH v2 25/44] test: Drop the function for running measurement tests

[Simon Glass]

Use the new suite-runner to run these tests instead.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

(no changes since v1)

 include/test/suites.h   |  1 -
 test/boot/measurement.c | 10 ----------
 test/cmd_ut.c           |  2 +-
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/include/test/suites.h b/include/test/suites.h
index 775b0a5a131..1a40af6599a 100644
--- a/include/test/suites.h
+++ b/include/test/suites.h
@@ -39,7 +39,6 @@ int do_ut_bloblist(struct cmd_tbl *cmdtp, int flag, int argc,
 		   char *const argv[]);
 int do_ut_hush(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_loadm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
-int do_ut_measurement(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]);
 int do_ut_optee(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_overlay(struct cmd_tbl *cmdtp, int flag, int argc,
 		  char *const argv[]);
diff --git a/test/boot/measurement.c b/test/boot/measurement.c
index 018e8af45f0..5a49c7a6b23 100644
--- a/test/boot/measurement.c
+++ b/test/boot/measurement.c
@@ -53,13 +53,3 @@ static int measure(struct unit_test_state *uts)
 	return 0;
 }
 MEASUREMENT_TEST(measure, 0);
-
-int do_ut_measurement(struct cmd_tbl *cmdtp, int flag, int argc,
-		      char *const argv[])
-{
-	struct unit_test *tests = UNIT_TEST_SUITE_START(measurement);
-	const int n_ents = UNIT_TEST_SUITE_COUNT(measurement);
-
-	return cmd_ut_category("measurement", "measurement_test_", tests,
-			       n_ents, argc, argv);
-}
diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index f2a72adc16e..ff9976cb98a 100644
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -166,7 +166,7 @@ static struct suite suites[] = {
 	SUITE(setexpr),
 #endif
 #ifdef CONFIG_MEASURED_BOOT
-	SUITE_CMD(measurement, do_ut_measurement),
+	SUITE(measurement),
 #endif
 #ifdef CONFIG_SANDBOX
 #if CONFIG_IS_ENABLED(BLOBLIST)
-- 
2.43.0