commit cc9d1dedca074c326c4a0b8d1cfe2c30f9c5b026
author Simon Glass <sjg@chromium.org> Mon Jan 20 14:25:47 2025 -0700
committer Tom Rini <trini@konsulko.com> Fri Jan 24 14:34:40 2025 -0600
tree 935726562c461dc20a06bbf632979bb8edbbfc06
parent 8feb5eef64c5e25da2b5392a31024b25b7b57917

test: Drop the function for running measurement tests

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

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

include/test/suites.h

diff --git a/include/test/suites.h b/include/test/suites.h
index 775b0a5..1a40af6 100644
--- a/include/test/suites.h
+++ b/include/test/suites.h
@@ -39,7 +39,6 @@
 		   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[]);

test/boot/measurement.c

diff --git a/test/boot/measurement.c b/test/boot/measurement.c
index 018e8af..5a49c7a 100644
--- a/test/boot/measurement.c
+++ b/test/boot/measurement.c
@@ -53,13 +53,3 @@
 	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);
-}

test/cmd_ut.c

diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index f2a72ad..ff9976c 100644
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -166,7 +166,7 @@
 	SUITE(setexpr),
 #endif
 #ifdef CONFIG_MEASURED_BOOT
-	SUITE_CMD(measurement, do_ut_measurement),
+	SUITE(measurement),
 #endif
 #ifdef CONFIG_SANDBOX
 #if CONFIG_IS_ENABLED(BLOBLIST)