[#145] Moved tests to seperate folders to allow easy inclusion depend…

…ing on build type;
nasa · May 26, 2023 · acd84e0 · acd84e0
1 parent fe936c4
commit acd84e0
Show file tree

Hide file tree

Showing 23 changed files with 20 additions and 6 deletions.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -113,11 +113,8 @@ if(TEST_ENC)
     endif()
 endif()
 
-aux_source_directory(core UTIL_SRC_FILES)
-aux_source_directory(tests APP_SRC_FILES) 
-
-file( GLOB SOURCE_FILES tests/*.c)
-foreach(SOURCE_PATH ${SOURCE_FILES})
+file( GLOB UNIT_FILES unit/*.c)
+foreach(SOURCE_PATH ${UNIT_FILES})
     get_filename_component(EXECUTABLE_NAME ${SOURCE_PATH} NAME_WE)
 
     if((NOT TEST_ENC) AND ${EXECUTABLE_NAME} STREQUAL et_dt_validation)
@@ -139,7 +136,24 @@ foreach(SOURCE_PATH ${SOURCE_FILES})
             COMMAND ${CMAKE_COMMAND} -E remove $<TARGET_FILE:${EXECUTABLE_NAME}>
             COMMENT "Created ${PROJECT_BINARY_DIR}/bin/${EXECUTABLE_NAME}"
             )
-endforeach(SOURCE_PATH ${SOURCE_FILES}) 
+endforeach(SOURCE_PATH ${UNIT_FILES}) 
+
+if(${KMC_MDB_RH} OR ${KMC_MDB_DB})
+    file( GLOB KMC_FILES kmc/*.c)
+    foreach(SOURCE_PATH ${KMC_FILES})
+        get_filename_component(EXECUTABLE_NAME ${SOURCE_PATH} NAME_WE)
+
+        add_executable(${EXECUTABLE_NAME} ${SOURCE_PATH}) 
+        target_sources(${EXECUTABLE_NAME} PRIVATE core/shared_util.c)
+        target_link_libraries(${EXECUTABLE_NAME} LINK_PUBLIC Crypto pthread)
+
+        add_custom_command(TARGET ${EXECUTABLE_NAME} POST_BUILD
+                COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${EXECUTABLE_NAME}> ${PROJECT_BINARY_DIR}/bin/${EXECUTABLE_NAME}
+                COMMAND ${CMAKE_COMMAND} -E remove $<TARGET_FILE:${EXECUTABLE_NAME}>
+                COMMENT "Created ${PROJECT_BINARY_DIR}/bin/${EXECUTABLE_NAME}"
+                )
+    endforeach(SOURCE_PATH ${KMC_FILES}) 
+endif()
 
 target_include_directories (Crypto PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 

diff --git a/test/tests/ut_kmc_crypto.c → test/kmc/ut_kmc_crypto.c b/test/tests/ut_kmc_crypto.c → test/kmc/ut_kmc_crypto.c
diff --git a/test/tests/ut_kmc_crypto_auth_only.c → test/kmc/ut_kmc_crypto_auth_only.c b/test/tests/ut_kmc_crypto_auth_only.c → test/kmc/ut_kmc_crypto_auth_only.c
diff --git a/test/tests/ut_kmc_crypto_cam.c → test/kmc/ut_kmc_crypto_cam.c b/test/tests/ut_kmc_crypto_cam.c → test/kmc/ut_kmc_crypto_cam.c
diff --git a/test/tests/ut_kmc_crypto_with_mtls_sadb.c → test/kmc/ut_kmc_crypto_with_mtls_sadb.c b/test/tests/ut_kmc_crypto_with_mtls_sadb.c → test/kmc/ut_kmc_crypto_with_mtls_sadb.c
diff --git a/test/tests/ut_mariadb.c → test/kmc/ut_mariadb.c b/test/tests/ut_mariadb.c → test/kmc/ut_mariadb.c
diff --git a/test/tests/ut_tc_kmc.c → test/kmc/ut_tc_kmc.c b/test/tests/ut_tc_kmc.c → test/kmc/ut_tc_kmc.c
diff --git a/test/tests/pt_auth_as.c → test/performance/pt_auth_as.c b/test/tests/pt_auth_as.c → test/performance/pt_auth_as.c
diff --git a/test/tests/pt_auth_enc_as.c → test/performance/pt_auth_enc_as.c b/test/tests/pt_auth_enc_as.c → test/performance/pt_auth_enc_as.c
diff --git a/test/tests/pt_auth_enc_ps.c → test/performance/pt_auth_enc_ps.c b/test/tests/pt_auth_enc_ps.c → test/performance/pt_auth_enc_ps.c
diff --git a/test/tests/pt_gcry_base.c → test/performance/pt_gcry_base.c b/test/tests/pt_gcry_base.c → test/performance/pt_gcry_base.c
diff --git a/test/tests/et_dt_validation.c → test/unit/et_dt_validation.c b/test/tests/et_dt_validation.c → test/unit/et_dt_validation.c
diff --git a/test/tests/ut_crypto.c → test/unit/ut_crypto.c b/test/tests/ut_crypto.c → test/unit/ut_crypto.c
diff --git a/test/tests/ut_crypto_aos.c → test/unit/ut_crypto_aos.c b/test/tests/ut_crypto_aos.c → test/unit/ut_crypto_aos.c
diff --git a/test/tests/ut_crypto_config.c → test/unit/ut_crypto_config.c b/test/tests/ut_crypto_config.c → test/unit/ut_crypto_config.c
diff --git a/test/tests/ut_crypto_mc.c → test/unit/ut_crypto_mc.c b/test/tests/ut_crypto_mc.c → test/unit/ut_crypto_mc.c
diff --git a/test/tests/ut_mysql_m_tls_connection.c → test/unit/ut_mysql_m_tls_connection.c b/test/tests/ut_mysql_m_tls_connection.c → test/unit/ut_mysql_m_tls_connection.c
diff --git a/test/tests/ut_mysql_tls_connection.c → test/unit/ut_mysql_tls_connection.c b/test/tests/ut_mysql_tls_connection.c → test/unit/ut_mysql_tls_connection.c
diff --git a/test/tests/ut_sadb_err_cases_kmc_crypto.c → test/unit/ut_sadb_err_cases_kmc_crypto.c b/test/tests/ut_sadb_err_cases_kmc_crypto.c → test/unit/ut_sadb_err_cases_kmc_crypto.c
diff --git a/test/tests/ut_tc_apply.c → test/unit/ut_tc_apply.c b/test/tests/ut_tc_apply.c → test/unit/ut_tc_apply.c
diff --git a/test/tests/ut_tc_process.c → test/unit/ut_tc_process.c b/test/tests/ut_tc_process.c → test/unit/ut_tc_process.c
diff --git a/test/tests/ut_tm_apply.c → test/unit/ut_tm_apply.c b/test/tests/ut_tm_apply.c → test/unit/ut_tm_apply.c
diff --git a/test/tests/ut_tm_process.c → test/unit/ut_tm_process.c b/test/tests/ut_tm_process.c → test/unit/ut_tm_process.c