test: derive the suite totals and the Valgrind list instead of restating them

tests/CMakeLists.txt

@@ -4,27 +4,36 @@
 # --- test_bootctl: Boot control block ---
 add_executable(eboot_test_bootctl unit/test_bootctl.c)
 target_link_libraries(eboot_test_bootctl PRIVATE eboot_core)
+# Every unit suite registered below appends its ctest name here, so the
+# Valgrind block at the bottom derives its list instead of repeating it.
+set(EBLDR_UNIT_TESTS "")
+
 add_test(NAME test_bootctl COMMAND eboot_test_bootctl)
+list(APPEND EBLDR_UNIT_TESTS test_bootctl)
 
 # --- test_crypto: SHA-256 against known vectors ---
 add_executable(eboot_test_crypto unit/test_crypto.c)
 target_link_libraries(eboot_test_crypto PRIVATE eboot_core)
 add_test(NAME test_crypto COMMAND eboot_test_crypto)
+list(APPEND EBLDR_UNIT_TESTS test_crypto)
 
 # --- test_image_verify: Image header parse bounds ---
 add_executable(eboot_test_image_verify unit/test_image_verify.c)
 target_link_libraries(eboot_test_image_verify PRIVATE eboot_core)
 add_test(NAME test_image_verify COMMAND eboot_test_image_verify)
+list(APPEND EBLDR_UNIT_TESTS test_image_verify)
 
 # --- test_image_abi: pins the .efw image header wire format against eFirmware ---
 add_executable(eboot_test_image_abi unit/test_image_abi.c)
 target_link_libraries(eboot_test_image_abi PRIVATE eboot_core)
 add_test(NAME test_image_abi COMMAND eboot_test_image_abi)
+list(APPEND EBLDR_UNIT_TESTS test_image_abi)
 
 # --- test_secure_boot: Secure boot policy gates ---
 add_executable(eboot_test_secure_boot unit/test_secure_boot.c)
 target_link_libraries(eboot_test_secure_boot PRIVATE eboot_core)
 add_test(NAME test_secure_boot COMMAND eboot_test_secure_boot)
+list(APPEND EBLDR_UNIT_TESTS test_secure_boot)
 
 # --- test_recovery: UART recovery write range ---
 # eboot_stage1 links eboot_core PUBLIC, so naming eboot_core here too put it on
@@ -34,11 +43,13 @@ add_test(NAME test_secure_boot COMMAND eboot_test_secure_boot)
 add_executable(eboot_test_recovery unit/test_recovery.c)
 target_link_libraries(eboot_test_recovery PRIVATE eboot_stage1)
 add_test(NAME test_recovery COMMAND eboot_test_recovery)
+list(APPEND EBLDR_UNIT_TESTS test_recovery)
 
 # --- test_fw_transport: UART raw/XMODEM/YMODEM firmware transport ---
 add_executable(eboot_test_fw_transport unit/test_fw_transport.c)
 target_link_libraries(eboot_test_fw_transport PRIVATE eboot_core)
 add_test(NAME test_fw_transport COMMAND eboot_test_fw_transport)
+list(APPEND EBLDR_UNIT_TESTS test_fw_transport)
 
 # --- test_fw_update_sig: install path must authenticate, not just hash ---
 add_executable(eboot_test_fw_update_sig unit/test_fw_update_sig.c)
@@ -49,58 +60,68 @@ add_test(NAME test_fw_update_sig COMMAND eboot_test_fw_update_sig)
 add_executable(eboot_test_slot_size_bounds unit/test_slot_size_bounds.c)
 target_link_libraries(eboot_test_slot_size_bounds PRIVATE eboot_core)
 add_test(NAME test_slot_size_bounds COMMAND eboot_test_slot_size_bounds)
+list(APPEND EBLDR_UNIT_TESTS test_slot_size_bounds)
 
 # --- test_device_table: UEFI-style device table ---
 add_executable(eboot_test_device_table unit/test_device_table.c)
 target_link_libraries(eboot_test_device_table PRIVATE eboot_core)
 add_test(NAME test_device_table COMMAND eboot_test_device_table)
+list(APPEND EBLDR_UNIT_TESTS test_device_table)
 
 # --- test_runtime_svc: Runtime variable store ---
 add_executable(eboot_test_runtime_svc unit/test_runtime_svc.c)
 target_link_libraries(eboot_test_runtime_svc PRIVATE eboot_core)
 add_test(NAME test_runtime_svc COMMAND eboot_test_runtime_svc)
+list(APPEND EBLDR_UNIT_TESTS test_runtime_svc)
 
 # --- test_board_config: Declarative hardware config ---
 add_executable(eboot_test_board_config unit/test_board_config.c)
 target_link_libraries(eboot_test_board_config PRIVATE eboot_core)
 add_test(NAME test_board_config COMMAND eboot_test_board_config)
+list(APPEND EBLDR_UNIT_TESTS test_board_config)
 
 # --- test_multicore: Multicore boot management ---
 add_executable(eboot_test_multicore unit/test_multicore.c)
 target_link_libraries(eboot_test_multicore PRIVATE eboot_core)
 add_test(NAME test_multicore COMMAND eboot_test_multicore)
+list(APPEND EBLDR_UNIT_TESTS test_multicore)
+
+# --- test_qemu_arm64_timer: Generic timer conversion ---
+add_executable(eboot_test_qemu_arm64_timer unit/test_qemu_arm64_timer.c)
+target_include_directories(eboot_test_qemu_arm64_timer PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/../boards/qemu_arm64
+)
+add_test(NAME test_qemu_arm64_timer COMMAND eboot_test_qemu_arm64_timer)
 
-# --- test_qemu_arm64_timer: Generic timer conversion ---
-add_executable(eboot_test_qemu_arm64_timer unit/test_qemu_arm64_timer.c)
-target_include_directories(eboot_test_qemu_arm64_timer PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/../boards/qemu_arm64
-)
-add_test(NAME test_qemu_arm64_timer COMMAND eboot_test_qemu_arm64_timer)
-
 # --- test_board_registry: Runtime board selection ---
 add_executable(eboot_test_board_registry unit/test_board_registry.c)
 target_link_libraries(eboot_test_board_registry PRIVATE eboot_core)
 add_test(NAME test_board_registry COMMAND eboot_test_board_registry)
+list(APPEND EBLDR_UNIT_TESTS test_board_registry)
 
 # --- test_slot_manager: Firmware slot management ---
 add_executable(eboot_test_slot_manager unit/test_slot_manager.c)
 target_link_libraries(eboot_test_slot_manager PRIVATE eboot_core)
 add_test(NAME test_slot_manager COMMAND eboot_test_slot_manager)
+list(APPEND EBLDR_UNIT_TESTS test_slot_manager)
 
 # --- test_boot_log: Boot log subsystem ---
 add_executable(eboot_test_boot_log unit/test_boot_log.c)
 target_link_libraries(eboot_test_boot_log PRIVATE eboot_core)
 add_test(NAME test_boot_log COMMAND eboot_test_boot_log)
+list(APPEND EBLDR_UNIT_TESTS test_boot_log)
 
 # --- test_ed25519: Ed25519 signature verification ---
 add_executable(eboot_test_ed25519 unit/test_ed25519.c)
 target_link_libraries(eboot_test_ed25519 PRIVATE eboot_core)
 add_test(NAME test_ed25519 COMMAND eboot_test_ed25519)
+list(APPEND EBLDR_UNIT_TESTS test_ed25519)
 
 # --- test_keystore: Key management ---
 add_executable(eboot_test_keystore unit/test_keystore.c)
 target_link_libraries(eboot_test_keystore PRIVATE eboot_core)
 add_test(NAME test_keystore COMMAND eboot_test_keystore)
+list(APPEND EBLDR_UNIT_TESTS test_keystore)
 
 # --- test_secure_boot_policy: debug-lock policy enforcement ---
 add_executable(eboot_test_secure_boot_policy unit/test_secure_boot_policy.c)
@@ -111,21 +132,25 @@ add_test(NAME test_secure_boot_policy COMMAND eboot_test_secure_boot_policy)
 add_executable(eboot_test_rollback unit/test_rollback.c)
 target_link_libraries(eboot_test_rollback PRIVATE eboot_core)
 add_test(NAME test_rollback COMMAND eboot_test_rollback)
+list(APPEND EBLDR_UNIT_TESTS test_rollback)
 
 # --- test_tlv_auth: TLV area must be bound to the signed header ---
 add_executable(eboot_test_tlv_auth unit/test_tlv_auth.c)
 target_link_libraries(eboot_test_tlv_auth PRIVATE eboot_core)
 add_test(NAME test_tlv_auth COMMAND eboot_test_tlv_auth)
+list(APPEND EBLDR_UNIT_TESTS test_tlv_auth)
 
 # --- test_storage: Unified storage abstraction ---
 add_executable(eboot_test_storage unit/test_storage.c)
 target_link_libraries(eboot_test_storage PRIVATE eboot_core)
 add_test(NAME test_storage COMMAND eboot_test_storage)
+list(APPEND EBLDR_UNIT_TESTS test_storage)
 
 # --- test_ecc: ECC memory range validation ---
 add_executable(eboot_test_ecc unit/test_ecc.c)
 target_link_libraries(eboot_test_ecc PRIVATE eboot_core)
 add_test(NAME test_ecc COMMAND eboot_test_ecc)
+list(APPEND EBLDR_UNIT_TESTS test_ecc)
 
 # --- test_fdt_loader: device tree parsing against malformed blobs ---
 # core/fdt_loader.c was in no source list, so it had never been compiled.
@@ -134,16 +159,19 @@ target_link_libraries(eboot_test_fdt_loader PRIVATE eboot_core)
 add_test(NAME test_fdt_loader COMMAND eboot_test_fdt_loader)
 
 # --- Valgrind test targets ---
+#
+# The list is derived from the suites registered above, not written out again.
+# Hand-maintained, it drifted: it had 17 of the 21 registered tests, missing
+# test_ecc, test_rollback, test_secure_boot and test_storage -- and nothing
+# failed when a name was forgotten, because a missing entry is simply a test
+# that never gets a memory-safety run.
+#
+# EBLDR_UNIT_TESTS is appended by each add_test() above, so a suite added
+# without touching this block still gets a Valgrind target.
 find_program(VALGRIND valgrind)
 if(VALGRIND)
     set(VALGRIND_OPTS --leak-check=full --error-exitcode=1 --quiet)
-    foreach(TEST_NAME test_bootctl test_crypto test_ed25519 test_keystore
-                      test_device_table test_runtime_svc test_board_config
-                      test_multicore test_qemu_arm64_timer test_board_registry
-                      test_slot_manager test_boot_log test_image_verify test_image_abi
-                      test_recovery test_slot_size_bounds test_fw_transport
-                      test_tlv_auth test_secure_boot_policy test_fdt_loader
-                      test_fw_decrypt)
+    foreach(TEST_NAME ${EBLDR_UNIT_TESTS})
         add_test(
             NAME valgrind_${TEST_NAME}
             COMMAND ${VALGRIND} ${VALGRIND_OPTS} $<TARGET_FILE:eboot_${TEST_NAME}>

tests/unit/test_board_config.c

@@ -20,6 +20,7 @@ static int tests_passed = 0;
     static void name(void); \
     static void run_##name(void) { \
         printf("  %-50s ", #name); \
+        tests_run++; \
         name(); \
         tests_passed++; \
         printf("[PASS]\n"); \
@@ -188,7 +189,6 @@ int main(void)
     run_test_total_ram();
     run_test_total_flash();
 
-    tests_run = 9;
     printf("\n%d/%d tests passed\n", tests_passed, tests_run);
     return (tests_passed == tests_run) ? 0 : 1;
 }

tests/unit/test_board_registry.c

@@ -21,6 +21,7 @@ static int tests_passed = 0;
     static void name(void); \
     static void run_##name(void) { \
         printf("  %-50s ", #name); \
+        tests_run++; \
         name(); \
         tests_passed++; \
         printf("[PASS]\n"); \
@@ -134,7 +135,6 @@ int main(void)
     run_test_get_by_index();
     run_test_register_null();
 
-    tests_run = 8;
     printf("\n%d/%d tests passed\n", tests_passed, tests_run);
     return (tests_passed == tests_run) ? 0 : 1;
 }

tests/unit/test_boot_log.c

@@ -300,6 +300,6 @@ int main(void)
     RUN(test_clear_reports_erase_failure);
     RUN(test_append_does_not_advance_head_when_write_fails);
     RUN(test_entry_layout_is_stable);
-    printf("\n%d/11 tests passed\n", tests_passed);
+    printf("\n%d/%d tests passed\n", tests_passed);
     return 0;
 }

tests/unit/test_bootctl.c

@@ -109,6 +109,7 @@ static int tests_passed = 0;
     static void run_##name(void) { \
         setup(); \
         printf("  %-50s ", #name); \
+        tests_run++; \
         name(); \
         tests_passed++; \
         printf("[PASS]\n"); \
@@ -292,7 +293,6 @@ int main(void)
     run_test_version_encoding();
     run_test_validate_null();
 
-    tests_run = 12;
     printf("\n%d/%d tests passed\n", tests_passed, tests_run);
     return (tests_passed == tests_run) ? 0 : 1;
 }

tests/unit/test_crypto.c

@@ -20,6 +20,7 @@ static int tests_passed = 0;
     static void name(void); \
     static void run_##name(void) { \
         printf("  %-50s ", #name); \
+        tests_run++; \
         name(); \
         tests_passed++; \
         printf("[PASS]\n"); \
@@ -118,7 +119,6 @@ int main(void)
     run_test_sha256_incremental();
     run_test_crypto_null_args();
 
-    tests_run = 5;
     printf("\n%d/%d tests passed\n", tests_passed, tests_run);
     return (tests_passed == tests_run) ? 0 : 1;
 }

tests/unit/test_device_table.c

@@ -20,6 +20,7 @@ static int tests_passed = 0;
     static void name(void); \
     static void run_##name(void) { \
         printf("  %-50s ", #name); \
+        tests_run++; \
         name(); \
         tests_passed++; \
         printf("[PASS]\n"); \
@@ -145,7 +146,6 @@ int main(void)
     run_test_corrupt_crc_fails();
     run_test_oversized_counts_fail();
 
-    tests_run = 8;
     printf("\n%d/%d tests passed\n", tests_passed, tests_run);
     return (tests_passed == tests_run) ? 0 : 1;
 }

tests/unit/test_fw_transport.c

@@ -163,6 +163,7 @@ static int tests_passed = 0;
     static void run_##name(void) { \
         setup(); \
         printf("  %-56s ", #name); \
+        tests_run++; \
         name(); \
         tests_passed++; \
         printf("[OK]\n"); \
@@ -555,7 +556,6 @@ int main(void)
     run_test_raw_oversized_length_is_rejected();
     run_test_raw_zero_length_is_rejected();
 
-    tests_run = 12;
     printf("\n%d/%d tests passed\n", tests_passed, tests_run);
     return (tests_passed == tests_run) ? 0 : 1;
 }

tests/unit/test_image_verify.c

@@ -95,6 +95,7 @@ static int tests_passed = 0;
         sim_tick = 0; \
         eos_hal_init(&sim_ops); \
         printf("  %-50s ", #name); \
+        tests_run++; \
         name(); \
         tests_passed++; \
         printf("[PASS]\n"); \
@@ -481,7 +482,6 @@ int main(void)
     run_test_unsigned_signature_types_are_rejected();
     run_test_header_version_is_validated();
     run_test_tlv_unreadable_entry_fails_closed();
-    tests_run = 17;
     printf("\n%d/%d tests passed\n", tests_passed, tests_run);
     return (tests_passed == tests_run) ? 0 : 1;
 }

tests/unit/test_keystore.c

@@ -82,6 +82,7 @@ static int tests_passed = 0;
     static void name(void); \
     static void run_##name(void) { \
         printf("  %-50s ", #name); \
+        tests_run++; \
         name(); \
         tests_passed++; \
         printf("[PASS]\n"); \
@@ -276,7 +277,6 @@ int main(void)
     run_test_revocation_is_persisted_without_clobbering_other_slots();
     run_test_revoke_reports_a_failed_persist();
 
-    tests_run = 9;
     printf("\n%d/%d tests passed\n", tests_passed, tests_run);
     return (tests_passed == tests_run) ? 0 : 1;
 }

tests/unit/test_multicore.c

@@ -21,6 +21,7 @@ static int tests_passed = 0;
     static void name(void); \
     static void run_##name(void) { \
         printf("  %-50s ", #name); \
+        tests_run++; \
         name(); \
         tests_passed++; \
         printf("[PASS]\n"); \
@@ -211,7 +212,6 @@ int main(void)
     run_test_invalid_core_id();
     run_test_ipi_mailbox_fallback();
 
-    tests_run = 10;
     printf("\n%d/%d tests passed\n", tests_passed, tests_run);
     return (tests_passed == tests_run) ? 0 : 1;
 }

tests/unit/test_rollback.c

@@ -22,6 +22,7 @@ static int tests_passed = 0;
     static void name(void); \
     static void run_##name(void) { \
         printf("  %-50s ", #name); \
+        tests_run++; \
         name(); \
         tests_passed++; \
         printf("[PASS]\n"); \
@@ -233,7 +234,6 @@ int main(void)
     run_test_commit_unsupported_without_hardware();
     run_test_clear_staged_prevents_commit();
     run_test_downgrade_blocked_after_confirmed_update();
-    tests_run = 14;
     printf("\n%d/%d tests passed\n", tests_passed, tests_run);
     return (tests_passed == tests_run) ? 0 : 1;
 }

tests/unit/test_runtime_svc.c

@@ -21,6 +21,7 @@ static int tests_passed = 0;
     static void run_##name(void) { \
         eos_rtsvc_init(); \
         printf("  %-50s ", #name); \
+        tests_run++; \
         name(); \
         tests_passed++; \
         printf("[PASS]\n"); \
@@ -140,7 +141,6 @@ int main(void)
     run_test_next_boot_slot();
     run_test_time();
 
-    tests_run = 9;
     printf("\n%d/%d tests passed\n", tests_passed, tests_run);
     return (tests_passed == tests_run) ? 0 : 1;
 }

tests/unit/test_secure_boot.c

@@ -84,6 +84,7 @@ static const eos_board_ops_t sim_ops = {
     .deinit_peripherals  = sim_noop,
 };
 
+static int tests_run = 0;
 static int tests_passed = 0;
 
 #define TEST(name) \
@@ -93,6 +94,7 @@ static int tests_passed = 0;
         sim_tick = 0; \
         eos_hal_init(&sim_ops); \
         printf("  %-50s ", #name); \
+        tests_run++; \
         name(); \
         tests_passed++; \
         printf("[PASS]\n"); \
@@ -203,6 +205,10 @@ int main(void)
     run_test_encrypted_image_rejected_while_decrypt_unimplemented();
     run_test_plaintext_image_boots_when_encryption_not_required();
     run_test_decrypt_failure_is_attested();
-    printf("%d passed\n", tests_passed);
-    return 0;
+    /* Compare, and let the exit code carry it. `return 0` meant a suite that
+     * ran nothing at all still reported success -- the ASSERT macro exits on
+     * failure, so the only thing this return could ever have signalled is
+     * exactly the case it ignored. */
+    printf("\n%d/%d passed\n", tests_passed, tests_run);
+    return tests_passed == tests_run ? 0 : 1;
 }