From c8da07c7f05cd422da48854858e51041e3db4412 Mon Sep 17 00:00:00 2001 From: tony <292224750@qq.com> Date: Thu, 18 May 2023 14:07:18 +0800 Subject: [PATCH] 1. simplify the cmake of test --- commit_info | 3 +-- test/CMakeLists.txt | 38 ++++++++++++++++---------------------- 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/commit_info b/commit_info index c7a0ca69..ea5f45f9 100644 --- a/commit_info +++ b/commit_info @@ -1,3 +1,2 @@ -1. add examples of system test -2. fix multi threading bugs on some machines (e.g.., the aarach64), force a single tread now by torch::set_num_threads(1); +1. simplify the cmake of test diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 05e063ee..96fa3cd5 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -3,29 +3,23 @@ #set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_FLAGS "-std=c++20 -Wall -Werror=return-type -Werror=unused-variable -Werror=unused-parameter") enable_testing() -add_executable(cpp_test SystemTest/SimpleTest.cpp) -add_executable(sketch_test SystemTest/SketchTest.cpp) -message(STATUS " Libraries: ${LIBRARIES}") -target_link_libraries(cpp_test - IntelliStream - ) -target_link_libraries(sketch_test - IntelliStream - ) -# avoid undefined reference to "main" in test.cpp - -add_test( - NAME catch_test - COMMAND $ --success -) -add_test( - NAME sketch_test - COMMAND $ --success -) - - file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/torchscripts DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/scripts - DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) \ No newline at end of file + DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +macro(add_catch_test appName SOURCE_FILES SOURCE_LIBS) + get_property(SOURCE_FILES_LOCAL GLOBAL PROPERTY "${PROP_NAME}_SOURCE_PROP") + set(${SOURCE_FILES} ${SOURCE_FILES_LOCAL}) + add_executable(${appName} ${SOURCE_FILES}) + target_link_libraries(${appName} ${SOURCE_LIBS}) + add_test( + NAME catch_${appName} + COMMAND $ --success + ) +endmacro() +add_catch_test(cpp_test SystemTest/SimpleTest.cpp IntelliStream) +add_catch_test(sketch_test SystemTest/SketchTest.cpp IntelliStream) + + +