Fix: Changed test outputs from debug print macro to regular print macro

Author: jackctj117

test/wh_test.c

@@ -61,7 +61,7 @@
 #if defined(WOLFHSM_CFG_ENABLE_CLIENT) && defined(WOLFHSM_CFG_ENABLE_SERVER)
 int whTest_Unit(void)
 {
-    WH_TEST_DEBUG_PRINT("Enter unit tests\n");
+    WH_TEST_PRINT("Enter unit tests\n");
 
     /* Component Tests */
     WH_TEST_ASSERT(0 == whTest_Flash_RamSim());

test/wh_test_cert.c

@@ -221,7 +221,7 @@ int whTest_CertClient(whClientContext* client)
     WH_TEST_ASSERT_RETURN(out_rc == WH_ERROR_CERT_VERIFY);
 
     /* Test verify with cached leaf public key */
-    WH_TEST_DEBUG_PRINT("Testing verify with cached leaf public key...\n");
+    WH_TEST_PRINT("Testing verify with cached leaf public key...\n");
     WH_TEST_RETURN_ON_FAIL(wh_Client_CertVerifyAndCacheLeafPubKey(
         client, RAW_CERT_CHAIN_A, RAW_CERT_CHAIN_A_len, rootCertA_id,
         &out_keyId, &out_rc));
@@ -406,7 +406,7 @@ int whTest_CertClientDma_ClientServerTestInternal(whClientContext* client)
     WH_TEST_ASSERT_RETURN(out_rc == WH_ERROR_CERT_VERIFY);
 
     /* Test verify with cached leaf public key */
-    WH_TEST_DEBUG_PRINT("Testing verify with cached leaf public key using DMA...\n");
+    WH_TEST_PRINT("Testing verify with cached leaf public key using DMA...\n");
     WH_TEST_RETURN_ON_FAIL(wh_Client_CertVerifyDmaAndCacheLeafPubKey(
         client, RAW_CERT_CHAIN_A, RAW_CERT_CHAIN_A_len, rootCertA_id,
         &out_keyId, &out_rc));
@@ -520,7 +520,7 @@ static int whTest_CertNonExportable(whClientContext* client)
     uint8_t  cert_buffer[2048]     = {0};
     uint32_t cert_len              = sizeof(cert_buffer);
 
-    WH_TEST_DEBUG_PRINT("Testing non-exportable certificate functionality...\n");
+    WH_TEST_PRINT("Testing non-exportable certificate functionality...\n");
 
     /* Add exportable certificate */
     WH_TEST_DEBUG_PRINT("Adding exportable certificate...\n");
@@ -635,7 +635,7 @@ int whTest_CertRamSim(whTestNvmBackendType nvmType)
 #endif
     }};
 
-    WH_TEST_DEBUG_PRINT("Testing Server Certificate with RAM sim...\n");
+    WH_TEST_PRINT("Testing Server Certificate with RAM sim...\n");
 
     /* Initialize NVM */
     WH_TEST_RETURN_ON_FAIL(wh_Nvm_Init(nvm, n_conf));

test/wh_test_clientserver.c

@@ -502,7 +502,7 @@ static int _testNonExportableNvmAccess(whClientContext* client)
     int32_t   out_rc                           = 0;
     whNvmSize out_len                          = 0;
 
-    WH_TEST_DEBUG_PRINT("Testing non-exportable NVM object access protection...\n");
+    WH_TEST_PRINT("Testing non-exportable NVM object access protection...\n");
 
     /* Test 1: Regular NVM Read Protection */
     /* Create NVM object with non-exportable flag */
@@ -575,7 +575,7 @@ static int _testNonExportableNvmAccess(whClientContext* client)
 
 #ifdef WOLFHSM_CFG_DMA
     /* Test 3: DMA NVM Read Protection */
-    WH_TEST_DEBUG_PRINT("Testing DMA NVM read protection...\n");
+    WH_TEST_PRINT("Testing DMA NVM read protection...\n");
 
     /* Create NVM object with non-exportable flag */
     memcpy(nvmLabel, "NonExportDmaNvmObj", sizeof("NonExportDmaNvmObj"));
@@ -646,7 +646,7 @@ static int _testNonExportableNvmAccess(whClientContext* client)
     wh_Client_NvmDestroyObjects(client, 1, &nvmId, &out_rc);
 #endif /* WOLFHSM_CFG_DMA */
 
-    WH_TEST_DEBUG_PRINT("NON-EXPORTABLE NVM ACCESS TEST SUCCESS\n");
+    WH_TEST_PRINT("NON-EXPORTABLE NVM ACCESS TEST SUCCESS\n");
     return 0;
 }
 #endif /* WOLFHSM_CFG_ENABLE_CLIENT */
@@ -1933,29 +1933,29 @@ static int wh_ClientServer_PosixMemMapThreadTest(whTestNvmBackendType nvmType)
 #if defined(WOLFHSM_CFG_ENABLE_CLIENT) && defined(WOLFHSM_CFG_ENABLE_SERVER)
 int whTest_ClientServer(void)
 {
-    WH_TEST_DEBUG_PRINT("Testing client/server sequential: mem...\n");
+    WH_TEST_PRINT("Testing client/server sequential: mem...\n");
     WH_TEST_ASSERT(0 == whTest_ClientServerSequential(WH_NVM_TEST_BACKEND_FLASH));
 
 #if defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG)
-    WH_TEST_DEBUG_PRINT("Testing client/server sequential: mem + flash log...\n");
+    WH_TEST_PRINT("Testing client/server sequential: mem + flash log...\n");
     WH_TEST_ASSERT(0 ==
                    whTest_ClientServerSequential(WH_NVM_TEST_BACKEND_FLASH_LOG));
 #endif /* defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG) */
 
 #if defined(WOLFHSM_CFG_TEST_POSIX)
-    WH_TEST_DEBUG_PRINT("Testing client/server: (pthread) mem...\n");
+    WH_TEST_PRINT("Testing client/server: (pthread) mem...\n");
     WH_TEST_ASSERT(0 == wh_ClientServer_MemThreadTest(WH_NVM_TEST_BACKEND_FLASH));
 
-    WH_TEST_DEBUG_PRINT("Testing client/server: (pthread) POSIX shared memory ...\n");
+    WH_TEST_PRINT("Testing client/server: (pthread) POSIX shared memory ...\n");
     WH_TEST_ASSERT(
         0 == wh_ClientServer_PosixMemMapThreadTest(WH_NVM_TEST_BACKEND_FLASH));
 
 #if defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG)
-    WH_TEST_DEBUG_PRINT("Testing client/server: (pthread) mem + flash log...\n");
+    WH_TEST_PRINT("Testing client/server: (pthread) mem + flash log...\n");
     WH_TEST_ASSERT(0 ==
                    wh_ClientServer_MemThreadTest(WH_NVM_TEST_BACKEND_FLASH_LOG));
 
-    WH_TEST_DEBUG_PRINT("Testing client/server: (pthread) POSIX shared memory + flash "
+    WH_TEST_PRINT("Testing client/server: (pthread) POSIX shared memory + flash "
            "log...\n");
     WH_TEST_ASSERT(
         0 == wh_ClientServer_PosixMemMapThreadTest(WH_NVM_TEST_BACKEND_FLASH_LOG));

test/wh_test_comm.c

@@ -477,17 +477,17 @@ void wh_CommClientServer_TcpThreadTest(void)
 #if defined(WOLFHSM_CFG_ENABLE_CLIENT) && defined(WOLFHSM_CFG_ENABLE_SERVER)
 int whTest_Comm(void)
 {
-    WH_TEST_DEBUG_PRINT("Testing comms: mem...\n");
+    WH_TEST_PRINT("Testing comms: mem...\n");
     WH_TEST_ASSERT(0 == whTest_CommMem());
 
 #if defined(WOLFHSM_CFG_TEST_POSIX)
-    WH_TEST_DEBUG_PRINT("Testing comms: (pthread) mem...\n");
+    WH_TEST_PRINT("Testing comms: (pthread) mem...\n");
     wh_CommClientServer_MemThreadTest();
 
-    WH_TEST_DEBUG_PRINT("Testing comms: (pthread) tcp...\n");
+    WH_TEST_PRINT("Testing comms: (pthread) tcp...\n");
     wh_CommClientServer_TcpThreadTest();
 
-    WH_TEST_DEBUG_PRINT("Testing comms: (pthread) posix mem...\n");
+    WH_TEST_PRINT("Testing comms: (pthread) posix mem...\n");
     wh_CommClientServer_ShMemThreadTest();
 #endif /* defined(WOLFHSM_CFG_TEST_POSIX) */
 

test/wh_test_common.h

@@ -35,6 +35,17 @@
 #define WH_TEST_SUCCESS (0)
 #define WH_TEST_DEFAULT_CLIENT_ID (1)
 
+/* Test-specific print macro that always prints (replacement for printf in tests)
+ * This internally uses WOLFHSM_CFG_PRINTF for consistency */
+#if !defined(__CCRH__)
+#define WH_TEST_PRINT(fmt, ...) \
+    WOLFHSM_CFG_PRINTF(fmt, ##__VA_ARGS__)
+#else
+#define WH_TEST_PRINT(...) WH_TEST_PRINT2(__VA_ARGS__, "")
+#define WH_TEST_PRINT2(fmt, ...) \
+    WOLFHSM_CFG_PRINTF(fmt, ##__VA_ARGS__)
+#endif
+
 /* Test-specific debug print with function and line info
  * This internally uses WOLFHSM_CFG_PRINTF for consistency */
 #ifdef WOLFHSM_CFG_TEST_VERBOSE