From 1441b28c15b9e050c1c979203b9bd21b4ec7ff80 Mon Sep 17 00:00:00 2001
From: Fancy code <258828110.@qq.com>
Date: Tue, 4 Jun 2024 18:56:33 +0800
Subject: [PATCH] Improve:test tool build.

---
 build/global_config.cmake                           | 1 +
 test/application/MissionManager/tool/CMakeLists.txt | 2 +-
 test/middleware/AppManager/tool/CMakeLists.txt      | 2 +-
 test/middleware/DeviceManager/tool/CMakeLists.txt   | 2 +-
 test/middleware/HuntingUpgrade/tool/CMakeLists.txt  | 2 +-
 test/middleware/IpcConfig/tool/CMakeLists.txt       | 2 +-
 test/middleware/McuAskBase/tool/CMakeLists.txt      | 4 +---
 test/middleware/McuManager/tool/CMakeLists.txt      | 2 +-
 test/middleware/MediaManager/tool/CMakeLists.txt    | 2 +-
 test/utils/Log/CMakeLists.txt                       | 4 ----
 test/utils/McuProtocol/tool/CMakeLists.txt          | 2 +-
 test/utils/UartDevice/tool/CMakeLists.txt           | 2 +-
 12 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/build/global_config.cmake b/build/global_config.cmake
index 1dbbefc..7af1883 100755
--- a/build/global_config.cmake
+++ b/build/global_config.cmake
@@ -3,6 +3,7 @@ set(DEFINE_LINUX                "linux")
 # set(CMAKE_SOURCE_DIR_IPCSDK     "${CMAKE_SOURCE_DIR_IPCSDK}${SUBMODULE_PATH_OF_IPC_SDK}")
 set(EXEC_OUTPUT_PATH            "${PLATFORM_PATH}/${PROJECT_OUTPUT_FOLDER}/bin")
 set(LIBS_OUTPUT_PATH            "${PLATFORM_PATH}/${PROJECT_OUTPUT_FOLDER}/libs")
+set(TEST_TOOLS_OUTPUT_PATH      "${PLATFORM_PATH}/${PROJECT_OUTPUT_FOLDER}/libs/test_tools")
 set(EXTERNAL_LIBS_OUTPUT_PATH   "${PLATFORM_PATH}/${PROJECT_OUTPUT_FOLDER}/libs/external")
 set(TEST_OUTPUT_PATH            "${PLATFORM_PATH}/${PROJECT_OUTPUT_FOLDER}/test")
 
diff --git a/test/application/MissionManager/tool/CMakeLists.txt b/test/application/MissionManager/tool/CMakeLists.txt
index 8cf7113..c488dfa 100644
--- a/test/application/MissionManager/tool/CMakeLists.txt
+++ b/test/application/MissionManager/tool/CMakeLists.txt
@@ -2,7 +2,7 @@ include(${CMAKE_SOURCE_DIR_IPCSDK}/build/global_config.cmake)
 include(${MIDDLEWARE_SOURCE_PATH}/HuntingUpgrade/build/hunting_upgrade.cmake)
 include(${HAL_SOURCE_PATH}/build/hal.cmake)
 set(EXECUTABLE_OUTPUT_PATH ${EXEC_OUTPUT_PATH})
-set(LIBRARY_OUTPUT_PATH ${LIBS_OUTPUT_PATH})
+set(LIBRARY_OUTPUT_PATH ${TEST_TOOLS_OUTPUT_PATH})
 
 include_directories(
     ./src
diff --git a/test/middleware/AppManager/tool/CMakeLists.txt b/test/middleware/AppManager/tool/CMakeLists.txt
index c335eb0..d32b142 100644
--- a/test/middleware/AppManager/tool/CMakeLists.txt
+++ b/test/middleware/AppManager/tool/CMakeLists.txt
@@ -1,7 +1,7 @@
 include(${CMAKE_SOURCE_DIR_IPCSDK}/build/global_config.cmake)
 include(${MIDDLEWARE_SOURCE_PATH}/AppManager/build/app_manager.cmake)
 set(EXECUTABLE_OUTPUT_PATH ${EXEC_OUTPUT_PATH})
-set(LIBRARY_OUTPUT_PATH ${LIBS_OUTPUT_PATH})
+set(LIBRARY_OUTPUT_PATH ${TEST_TOOLS_OUTPUT_PATH})
 
 include_directories(
     ./src
diff --git a/test/middleware/DeviceManager/tool/CMakeLists.txt b/test/middleware/DeviceManager/tool/CMakeLists.txt
index 73bd6c6..05f2ab5 100644
--- a/test/middleware/DeviceManager/tool/CMakeLists.txt
+++ b/test/middleware/DeviceManager/tool/CMakeLists.txt
@@ -1,6 +1,6 @@
 include(${CMAKE_SOURCE_DIR_IPCSDK}/build/global_config.cmake)
 set(EXECUTABLE_OUTPUT_PATH ${EXEC_OUTPUT_PATH})
-set(LIBRARY_OUTPUT_PATH ${LIBS_OUTPUT_PATH})
+set(LIBRARY_OUTPUT_PATH ${TEST_TOOLS_OUTPUT_PATH})
 
 include_directories(
     ./src
diff --git a/test/middleware/HuntingUpgrade/tool/CMakeLists.txt b/test/middleware/HuntingUpgrade/tool/CMakeLists.txt
index cd7aafc..3489bc2 100644
--- a/test/middleware/HuntingUpgrade/tool/CMakeLists.txt
+++ b/test/middleware/HuntingUpgrade/tool/CMakeLists.txt
@@ -1,7 +1,7 @@
 include(${CMAKE_SOURCE_DIR_IPCSDK}/build/global_config.cmake)
 include(${HAL_SOURCE_PATH}/build/hal.cmake)
 set(EXECUTABLE_OUTPUT_PATH ${EXEC_OUTPUT_PATH})
-set(LIBRARY_OUTPUT_PATH ${LIBS_OUTPUT_PATH})
+set(LIBRARY_OUTPUT_PATH ${TEST_TOOLS_OUTPUT_PATH})
 
 include_directories(
     ./src
diff --git a/test/middleware/IpcConfig/tool/CMakeLists.txt b/test/middleware/IpcConfig/tool/CMakeLists.txt
index eb3d4b1..e9c8a9b 100644
--- a/test/middleware/IpcConfig/tool/CMakeLists.txt
+++ b/test/middleware/IpcConfig/tool/CMakeLists.txt
@@ -1,7 +1,7 @@
 include(${CMAKE_SOURCE_DIR_IPCSDK}/build/global_config.cmake)
 include(${MIDDLEWARE_SOURCE_PATH}/IpcConfig/build/ipc_config.cmake)
 set(EXECUTABLE_OUTPUT_PATH ${EXEC_OUTPUT_PATH})
-set(LIBRARY_OUTPUT_PATH ${LIBS_OUTPUT_PATH})
+set(LIBRARY_OUTPUT_PATH ${TEST_TOOLS_OUTPUT_PATH})
 
 include_directories(
     ./src
diff --git a/test/middleware/McuAskBase/tool/CMakeLists.txt b/test/middleware/McuAskBase/tool/CMakeLists.txt
index 51471c7..ffeecb9 100644
--- a/test/middleware/McuAskBase/tool/CMakeLists.txt
+++ b/test/middleware/McuAskBase/tool/CMakeLists.txt
@@ -1,6 +1,6 @@
 include(${CMAKE_SOURCE_DIR_IPCSDK}/build/global_config.cmake)
 set(EXECUTABLE_OUTPUT_PATH ${EXEC_OUTPUT_PATH})
-set(LIBRARY_OUTPUT_PATH ${LIBS_OUTPUT_PATH})
+set(LIBRARY_OUTPUT_PATH ${TEST_TOOLS_OUTPUT_PATH})
 
 include_directories(
     ./src
@@ -21,8 +21,6 @@ include_directories(
 #     ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs
 # )
 
-
-
 aux_source_directory(./src TEST_TOOL_SRC_FILES)
 set(TEST_TOOL_TARGET McuAskBaseTestTool)
 add_library(${TEST_TOOL_TARGET} STATIC ${TEST_TOOL_SRC_FILES})
diff --git a/test/middleware/McuManager/tool/CMakeLists.txt b/test/middleware/McuManager/tool/CMakeLists.txt
index cfc6d46..2fa3e01 100644
--- a/test/middleware/McuManager/tool/CMakeLists.txt
+++ b/test/middleware/McuManager/tool/CMakeLists.txt
@@ -1,6 +1,6 @@
 include(${CMAKE_SOURCE_DIR_IPCSDK}/build/global_config.cmake)
 set(EXECUTABLE_OUTPUT_PATH ${EXEC_OUTPUT_PATH})
-set(LIBRARY_OUTPUT_PATH ${LIBS_OUTPUT_PATH})
+set(LIBRARY_OUTPUT_PATH ${TEST_TOOLS_OUTPUT_PATH})
 
 include_directories(
     ./src
diff --git a/test/middleware/MediaManager/tool/CMakeLists.txt b/test/middleware/MediaManager/tool/CMakeLists.txt
index c6b08d6..7d3430f 100644
--- a/test/middleware/MediaManager/tool/CMakeLists.txt
+++ b/test/middleware/MediaManager/tool/CMakeLists.txt
@@ -1,6 +1,6 @@
 include(${CMAKE_SOURCE_DIR_IPCSDK}/build/global_config.cmake)
 set(EXECUTABLE_OUTPUT_PATH ${EXEC_OUTPUT_PATH})
-set(LIBRARY_OUTPUT_PATH ${LIBS_OUTPUT_PATH})
+set(LIBRARY_OUTPUT_PATH ${TEST_TOOLS_OUTPUT_PATH})
 
 include_directories(
     ./src
diff --git a/test/utils/Log/CMakeLists.txt b/test/utils/Log/CMakeLists.txt
index db7f8f2..f15f9da 100644
--- a/test/utils/Log/CMakeLists.txt
+++ b/test/utils/Log/CMakeLists.txt
@@ -16,10 +16,6 @@ link_directories(
     ${EXTERNAL_LIBS_OUTPUT_PATH}
 )
 
-
-
-
-
 aux_source_directory(. SRC_FILES)
 aux_source_directory(./src SRC_FILES)
 
diff --git a/test/utils/McuProtocol/tool/CMakeLists.txt b/test/utils/McuProtocol/tool/CMakeLists.txt
index a72de19..42dfd38 100644
--- a/test/utils/McuProtocol/tool/CMakeLists.txt
+++ b/test/utils/McuProtocol/tool/CMakeLists.txt
@@ -1,6 +1,6 @@
 include(${CMAKE_SOURCE_DIR_IPCSDK}/build/global_config.cmake)
 set(EXECUTABLE_OUTPUT_PATH ${EXEC_OUTPUT_PATH})
-set(LIBRARY_OUTPUT_PATH ${LIBS_OUTPUT_PATH})
+set(LIBRARY_OUTPUT_PATH ${TEST_TOOLS_OUTPUT_PATH})
 
 include_directories(
     ./src
diff --git a/test/utils/UartDevice/tool/CMakeLists.txt b/test/utils/UartDevice/tool/CMakeLists.txt
index a3cea16..4f0afa9 100644
--- a/test/utils/UartDevice/tool/CMakeLists.txt
+++ b/test/utils/UartDevice/tool/CMakeLists.txt
@@ -1,6 +1,6 @@
 include(${CMAKE_SOURCE_DIR_IPCSDK}/build/global_config.cmake)
 set(EXECUTABLE_OUTPUT_PATH ${EXEC_OUTPUT_PATH})
-set(LIBRARY_OUTPUT_PATH ${LIBS_OUTPUT_PATH})
+set(LIBRARY_OUTPUT_PATH ${TEST_TOOLS_OUTPUT_PATH})
 
 include_directories(
     ./src