nvm_flash_log: test: rename nvm backend enums

Author: rizlik

test/wh_test.c

@@ -66,10 +66,10 @@ int whTest_Unit(void)
     WH_TEST_ASSERT(0 == whTest_Flash_RamSim());
     WH_TEST_ASSERT(0 == whTest_NvmFlash());
 #if defined(WOLFHSM_CFG_CERTIFICATE_MANAGER) && !defined(WOLFHSM_CFG_NO_CRYPTO)
-    WH_TEST_ASSERT(0 == whTest_CertRamSim(NVM_TEST_BACKEND_FLASH));
+    WH_TEST_ASSERT(0 == whTest_CertRamSim(WH_NVM_TEST_BACKEND_FLASH));
 
 #if defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG)
-    WH_TEST_ASSERT(0 == whTest_CertRamSim(NVM_TEST_BACKEND_FLASH_LOG));
+    WH_TEST_ASSERT(0 == whTest_CertRamSim(WH_NVM_TEST_BACKEND_FLASH_LOG));
 #endif /* WOLFHSM_CFG_SERVER_NVM_FLASH_LOG */
 
 #endif /* WOLFHSM_CFG_CERTIFICATE_MANAGER && !WOLFHSM_CFG_NO_CRYPTO */
@@ -85,10 +85,10 @@ int whTest_Unit(void)
 
 #if defined(WOLFHSM_CFG_SERVER_IMG_MGR) && !defined(WOLFHSM_CFG_NO_CRYPTO)
     /* Image Manager Tests */
-    WH_TEST_ASSERT(0 == whTest_ServerImgMgr(NVM_TEST_BACKEND_FLASH));
+    WH_TEST_ASSERT(0 == whTest_ServerImgMgr(WH_NVM_TEST_BACKEND_FLASH));
 
 #if defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG)
-    WH_TEST_ASSERT(0 == whTest_ServerImgMgr(NVM_TEST_BACKEND_FLASH_LOG));
+    WH_TEST_ASSERT(0 == whTest_ServerImgMgr(WH_NVM_TEST_BACKEND_FLASH_LOG));
 #endif
 
 #endif /* WOLFHSM_CFG_SERVER_IMG_MGR && !WOLFHSM_CFG_NO_CRYPTO */

test/wh_test_clientserver.c

@@ -1933,31 +1933,31 @@ static int wh_ClientServer_PosixMemMapThreadTest(whTestNvmBackendType nvmType)
 int whTest_ClientServer(void)
 {
     printf("Testing client/server sequential: mem...\n");
-    WH_TEST_ASSERT(0 == whTest_ClientServerSequential(NVM_TEST_BACKEND_FLASH));
+    WH_TEST_ASSERT(0 == whTest_ClientServerSequential(WH_NVM_TEST_BACKEND_FLASH));
 
 #if defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG)
     printf("Testing client/server sequential: mem + flash log...\n");
     WH_TEST_ASSERT(0 ==
-                   whTest_ClientServerSequential(NVM_TEST_BACKEND_FLASH_LOG));
+                   whTest_ClientServerSequential(WH_NVM_TEST_BACKEND_FLASH_LOG));
 #endif /* defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG) */
 
 #if defined(WOLFHSM_CFG_TEST_POSIX)
     printf("Testing client/server: (pthread) mem...\n");
-    WH_TEST_ASSERT(0 == wh_ClientServer_MemThreadTest(NVM_TEST_BACKEND_FLASH));
+    WH_TEST_ASSERT(0 == wh_ClientServer_MemThreadTest(WH_NVM_TEST_BACKEND_FLASH));
 
     printf("Testing client/server: (pthread) POSIX shared memory ...\n");
     WH_TEST_ASSERT(
-        0 == wh_ClientServer_PosixMemMapThreadTest(NVM_TEST_BACKEND_FLASH));
+        0 == wh_ClientServer_PosixMemMapThreadTest(WH_NVM_TEST_BACKEND_FLASH));
 
 #if defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG)
     printf("Testing client/server: (pthread) mem + flash log...\n");
     WH_TEST_ASSERT(0 ==
-                   wh_ClientServer_MemThreadTest(NVM_TEST_BACKEND_FLASH_LOG));
+                   wh_ClientServer_MemThreadTest(WH_NVM_TEST_BACKEND_FLASH_LOG));
 
     printf("Testing client/server: (pthread) POSIX shared memory + flash "
            "log...\n");
     WH_TEST_ASSERT(
-        0 == wh_ClientServer_PosixMemMapThreadTest(NVM_TEST_BACKEND_FLASH_LOG));
+        0 == wh_ClientServer_PosixMemMapThreadTest(WH_NVM_TEST_BACKEND_FLASH_LOG));
 #endif /* defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG) */
 
 #endif /* defined(WOLFHSM_CFG_TEST_POSIX) */

test/wh_test_common.c

@@ -54,7 +54,7 @@ int whTest_NvmCfgBackend(whTestNvmBackendType   type,
 
     switch (type) {
 #if defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG)
-        case NVM_TEST_BACKEND_FLASH_LOG:
+        case WH_NVM_TEST_BACKEND_FLASH_LOG:
             nvmSetup->nvmFlashLogCfg.flash_cb = fCb;
             /* restrict simulated flash partition to nvm_flash_log_partition */
             WH_TEST_ASSERT(fCfg->size >= WH_NVM_FLASH_LOG_PARTITION_SIZE * 2);
@@ -70,7 +70,7 @@ int whTest_NvmCfgBackend(whTestNvmBackendType   type,
             nvmCfg->config  = &nvmSetup->nvmFlashLogCfg;
             break;
 #endif
-        case NVM_TEST_BACKEND_FLASH:
+        case WH_NVM_TEST_BACKEND_FLASH:
             /* NVM Flash Configuration using RamSim HAL Flash */
             nvmSetup->nvmFlashCfg.cb      = fCb;
             nvmSetup->nvmFlashCfg.context = fCtx;

test/wh_test_common.h

@@ -111,11 +111,11 @@
 
 
 typedef enum {
-    NVM_TEST_BACKEND_FLASH = 0,
+    WH_NVM_TEST_BACKEND_FLASH = 0,
 #if defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG)
-    NVM_TEST_BACKEND_FLASH_LOG,
+    WH_NVM_TEST_BACKEND_FLASH_LOG,
 #endif
-    NVM_TEST_BACKEND_COUNT
+    WH_NVM_TEST_BACKEND_COUNT
 } whTestNvmBackendType;
 
 /* union helper struct to be able to test more than one NVM implementation */

test/wh_test_crypto.c

@@ -3713,12 +3713,12 @@ int whTest_Crypto(void)
 {
     printf("Testing crypto: (pthread) mem...\n");
     WH_TEST_RETURN_ON_FAIL(
-        wh_ClientServer_MemThreadTest(NVM_TEST_BACKEND_FLASH));
+        wh_ClientServer_MemThreadTest(WH_NVM_TEST_BACKEND_FLASH));
 
 #if defined(WOLFHSM_CFG_SERVER_NVM_FLASH_LOG)
     printf("Testing crypto: (pthread) mem (flash log)...\n");
     WH_TEST_RETURN_ON_FAIL(
-        wh_ClientServer_MemThreadTest(NVM_TEST_BACKEND_FLASH_LOG));
+        wh_ClientServer_MemThreadTest(WH_NVM_TEST_BACKEND_FLASH_LOG));
 #endif
 
     return 0;