fixup! refactor(core/prodtest): Refactor unit tests into separate rtl…

… library [no changelog]
trezor · Mar 5, 2025 · 3722dc1 · 3722dc1
1 parent 07f80e6
commit 3722dc1
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 40 deletions.
diff --git a/core/embed/projects/prodtest/cmd/prodtest_pmic.c b/core/embed/projects/prodtest/cmd/prodtest_pmic.c
@@ -302,13 +302,13 @@ PRODTEST_CLI_CMD(
   .args = "[<count>] [<period>]"
 );
 
-PRODTEST_UNIT_TEST(
+REGISTER_UNIT_TEST(
   .name = "ut-pmic-init-deinit",
   .func = ut_pmic_init_deinit,
   .info = "Test PMIC driver initialization and deinitialization",
 )
 
-PRODTEST_UNIT_TEST(
+REGISTER_UNIT_TEST(
   .name = "ut-pmic-battery",
   .func = ut_pmic_battery,
   .info = "Test PMIC battery connection",

diff --git a/core/embed/projects/prodtest/cmd/prodtest_unit_test.c b/core/embed/projects/prodtest/cmd/prodtest_unit_test.c
@@ -32,7 +32,7 @@ static void prodtest_unit_test_list(cli_t* cli) {
 
   cli_trace(cli, "List of all registered unit tests:");
 
-  ut_t* ut = ut_get_records_ptr();
+  unit_test_t* ut = unit_test_get_records();
 
   for (size_t i = 0; i < ut->unit_test_count; i++) {
     cli_trace(cli, " %s - %s ", ut->unit_test_array[i].name,
@@ -52,7 +52,7 @@ static void prodtest_unit_test_run(cli_t* cli) {
 
   cli_trace(cli, "Running all unit tests...");
 
-  ut_t* ut = ut_get_records_ptr();
+  unit_test_t* ut = unit_test_get_records();
 
   for (size_t i = 0; i < ut->unit_test_count; i++) {
     ut_status_t test_result = ut->unit_test_array[i].func(cli);
@@ -68,7 +68,7 @@ static void prodtest_unit_test_run(cli_t* cli) {
   if (ut_passed) {
     cli_ok(cli, "");
   } else {
-    cli_error(cli, CLI_ERROR, "Some of the unit tests Failed");
+    cli_error(cli, CLI_ERROR, "Some of the unit test failed");
   }
 }
 

diff --git a/core/embed/projects/prodtest/main.c b/core/embed/projects/prodtest/main.c
@@ -203,17 +203,11 @@ int main(void) {
 
   extern cli_command_t _prodtest_cli_cmd_section_start;
   extern cli_command_t _prodtest_cli_cmd_section_end;
-  extern unit_test_record_t _prodtest_unit_test_section_start;
-  extern unit_test_record_t _prodtest_unit_test_section_end;
 
   cli_set_commands(
       &g_cli, &_prodtest_cli_cmd_section_start,
       &_prodtest_cli_cmd_section_end - &_prodtest_cli_cmd_section_start);
 
-  ut_set_records(
-      &_prodtest_unit_test_section_start,
-      &_prodtest_unit_test_section_end - &_prodtest_unit_test_section_start);
-
 #ifdef USE_OPTIGA
   optiga_init();
   optiga_open_application();

diff --git a/core/embed/rtl/inc/rtl/unit_test.h b/core/embed/rtl/inc/rtl/unit_test.h
@@ -23,8 +23,6 @@
 
 #include <rtl/cli.h>
 
-typedef struct ut ut_t;
-
 typedef enum {
   UT_PASSED = 0,
   UT_FAILED,
@@ -48,20 +46,15 @@ typedef struct {
 
 // Register a unit test by placing its registration record
 // into a specially designated linker script section
-#define PRODTEST_UNIT_TEST(...)                                            \
-  __attribute__((used,                                                     \
-                 section(".prodtest_ut"))) static const unit_test_record_t \
+#define REGISTER_UNIT_TEST(...)                                                \
+  __attribute__((used, section(".unit_test"))) static const unit_test_record_t \
       CONCAT_UT(_ut_handler, __COUNTER__) = {__VA_ARGS__};
 
-struct ut {
+typedef struct {
   // Registered unit test record handlers
   const unit_test_record_t* unit_test_array;
   size_t unit_test_count;
-};
-
-// Register unit test records to ut structure
-void ut_set_records(const unit_test_record_t* unit_test_array,
-                    size_t unit_test_count);
+} unit_test_t;
 
-// Returns the pointer to ut structure with all registered records
-ut_t* ut_get_records_ptr();
+// Returns the pointer to unit_test_t structure with all registered records
+unit_test_t* unit_test_get_records(void);
diff --git a/core/embed/rtl/unit_test.c b/core/embed/rtl/unit_test.c
@@ -21,12 +21,13 @@
 
 #include <rtl/unit_test.h>
 
-ut_t g_ut = {0};
+extern unit_test_record_t _unit_test_section_start;
+extern unit_test_record_t _unit_test_section_end;
 
-void ut_set_records(const unit_test_record_t* unit_test_array,
-                    size_t unit_test_count) {
-  g_ut.unit_test_array = unit_test_array;
-  g_ut.unit_test_count = unit_test_count;
-}
+unit_test_t g_ut = {0};
 
-ut_t* ut_get_records_ptr() { return &g_ut; }
+unit_test_t* unit_test_get_records(void) {
+  g_ut.unit_test_array = &_unit_test_section_start;
+  g_ut.unit_test_count = &_unit_test_section_end - &_unit_test_section_start;
+  return &g_ut;
+}
diff --git a/core/embed/sys/linker/stm32f4/prodtest.ld b/core/embed/sys/linker/stm32f4/prodtest.ld
@@ -59,9 +59,9 @@ SECTIONS {
     _prodtest_cli_cmd_section_end = .;
     . = ALIGN(4);
 
-    _prodtest_unit_test_section_start = .;
-    KEEP(*(.prodtest_ut))
-    _prodtest_unit_test_section_end = .;
+    _unit_test_section_start = .;
+    KEEP(*(.unit_test))
+    _unit_test_section_end = .;
 
     . = ALIGN(128K);
   } >FLASH

diff --git a/core/embed/sys/linker/stm32u58/prodtest.ld b/core/embed/sys/linker/stm32u58/prodtest.ld
@@ -61,9 +61,9 @@ SECTIONS {
     _prodtest_cli_cmd_section_end = .;
     . = ALIGN(4);
 
-    _prodtest_unit_test_section_start = .;
-    KEEP(*(.prodtest_ut))
-    _prodtest_unit_test_section_end = .;
+    _unit_test_section_start = .;
+    KEEP(*(.unit_test))
+    _unit_test_section_end = .;
 
     . = ALIGN(512);
   } >FLASH AT>FLASH

diff --git a/core/embed/sys/linker/stm32u5g/prodtest.ld b/core/embed/sys/linker/stm32u5g/prodtest.ld
@@ -67,9 +67,9 @@ SECTIONS {
     _prodtest_cli_cmd_section_end = .;
     . = ALIGN(4);
 
-    _prodtest_unit_test_section_start = .;
-    KEEP(*(.prodtest_ut))
-    _prodtest_unit_test_section_end = .;
+    _unit_test_section_start = .;
+    KEEP(*(.unit_test))
+    _unit_test_section_end = .;
 
     . = ALIGN(512);
   } >FLASH AT>FLASH