Z991239-632 #comment fix: linux 回归测试

CMakeLists.txt

@@ -333,6 +333,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 add_definitions("-DHAVE_CONFIG_H")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/addin/cfg/shell.ini.in" ${CMAKE_BINARY_DIR}/shell.ini @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/buildflags.h.in ${CMAKE_CURRENT_BINARY_DIR}/buildflags.h)
 # WinPR
 include_directories("${CMAKE_SOURCE_DIR}/winpr/include")
 include_directories("${CMAKE_BINARY_DIR}/winpr/include")
@@ -366,12 +367,11 @@ add_subdirectory(DevAdapter)
 set(RVC_BUILD_CONFIG_LIST "")
 GET_CMAKE_PROPERTY(res VARIABLES)
 FOREACH(var ${res})
-	IF (var MATCHES "^WITH_*|^BUILD_TESTING|^BUILTIN_CHANNELS|^HAVE_*")
+	IF (var MATCHES "^WITH_*|^BUILD_TESTING|^HAVE_*")
 		LIST(APPEND RVC_BUILD_CONFIG_LIST "${var}=${${var}}")
 	ENDIF()
 ENDFOREACH()
 string(REPLACE ";" " " RVC_BUILD_CONFIG "${RVC_BUILD_CONFIG_LIST}")
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/buildflags.h.in ${CMAKE_CURRENT_BINARY_DIR}/buildflags.h)
 
 # 
 if(MSVC)

Common/SpTest.h

@@ -593,7 +593,7 @@ ErrorCodeEnum ITestCaseSuite<TClass>::RunTestCase()
 	INTERNAL_TEST_CAST_ON_EXAM_FUNCTION2()
 
 
-#ifdef WITH_DEBUG
+#ifdef WITH_BUILD_MODULE_TEST
 
 #define TEST_CASE_OVERRIDE_ON_EXAM_DECLAER()	\
 	INTERNAL_TEST_CASE_OVERRIDE_ON_EXAM_DECLARE2()
@@ -601,13 +601,13 @@ ErrorCodeEnum ITestCaseSuite<TClass>::RunTestCase()
 #define TEST_CASE_OVERRIDE_ON_EXAM_IMPLEMENT(entityClassName)	\
 	INTERNAL_TEST_CASE_OVERRIDE_ON_EXAM_IMPLEMENT2(entityClassName)
 
-#else
+#else //WITH_BUILD_MODULE_TEST
 
 #define TEST_CASE_OVERRIDE_ON_EXAM_DECLAER()
 
 #define TEST_CASE_OVERRIDE_ON_EXAM_IMPLEMENT()
 
-#endif // WITH_DEBUG
+#endif // WITH_BUILD_MODULE_TEST
 
 
 //////////////////////////////////////////////////////////////////////////

addin/cmake/ConfigOptions.cmake

@@ -13,11 +13,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
 	set(TARGET_ARCH "sparc")
 endif()
 
-if(TARGET_ARCH MATCHES "ARM")
-	
-else()
-	option(WITH_IPP "Use Intel Performance Primitives." OFF)
-endif()
+option(WITH_IPP "Use Intel Performance Primitives." OFF)
 
 option(BUILD_TESTING "Build the project test case." OFF)
 
@@ -29,3 +25,4 @@ option(WITH_THIRD_PARTY "Build third-party components" ON)
 
 option(SIMULATE_DEV_AND_TEST_TEMP "/run/version/1.2.3.4/" ON)
 
+option(WITH_MODULE_TEST "whether include module test components" OFF)

module/CMakeLists.txt

@@ -11,6 +11,16 @@ if(NOT MSVC)
 endif(NOT MSVC)
 set(MODULE_BASE_INCLUDES ${ModuleCommonHeadPath} ${RVC_TOOLKIT_INCLUDE_DIR})
 
+set(BUILD_MOUDLE_TEST OFF)
+if(BUILD_TESTING)
+#  TODO:
+endif(BUILD_TESTING)
+
+string(TOLOWER ${BUILD_TYPE_NAME} build_type)
+if (build_type STREQUAL debug)
+	set(BUILD_MOUDLE_TEST ON)
+endif()
+
 #对于 Windows 设置实体的版本信息
 #定义共享库输出
 macro(add_module_libraries _module_prefix _module_name _module_version)
@@ -49,7 +59,10 @@ macro(add_module_libraries _module_prefix _module_name _module_version)
     target_compile_definitions(${_module_name} PUBLIC "${_module_prefix}_EXPORTS")
     
     target_include_directories(${_module_name} PRIVATE ${MODULE_BASE_INCLUDES})
-    
+    if(BUILD_MOUDLE_TEST)
+        target_compile_definitions(${_module_name} PRIVATE "WITH_BUILD_MODULE_TEST")
+	    target_include_directories(${_module_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+    endif(BUILD_MOUDLE_TEST)
     configure_file("${MODULE_BASE_DIR}/include/modVer.h.in" "${CMAKE_CURRENT_BINARY_DIR}/modVer.h")
     target_include_directories(${_module_name} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 
@@ -77,6 +90,9 @@ macro(deploy_module _module_prefix _module_name)
     set_property(TARGET ${_module_name} PROPERTY FOLDER "module/")
 endmacro(deploy_module)
 
+if(BUILD_MOUDLE_TEST)
+    message(STATUS "build module test case")
+endif(BUILD_MOUDLE_TEST)
 
 add_subdirectory(mod_pinpad)
 add_subdirectory(mod_cardswiper)

test/module/CMakeLists.txt

@@ -60,6 +60,7 @@ macro(add_module_libraries _module_prefix _module_name _module_version)
     
     target_include_directories(${_module_name} PRIVATE ${MODULE_BASE_INCLUDES})
     if(BUILD_MOUDLE_TEST)
+        target_compile_definitions(${_module_name} PRIVATE "WITH_BUILD_MODULE_TEST")
 	    target_include_directories(${_module_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
     endif(BUILD_MOUDLE_TEST)
     configure_file("${MODULE_BASE_DIR}/include/modVer.h.in" "${CMAKE_CURRENT_BINARY_DIR}/modVer.h")