xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ljw0903/patch-2' into doc/contrib

This commit is contained in:
Shengliang Guan 2024-10-31 00:09:42 +08:00
parent 5d57d78826 1224134ae3
commit 183d879050
4 changed files with 46 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/libs/transport/test/CMakeLists.txt
View File

@ -33,7 +33,7 @@ target_include_directories(transportTest
"${CMAKE_CURRENT_SOURCE_DIR}/../inc" "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
) )
target_link_libraries (transportTest target_link_libraries(transportTest
os os
util util
common common
@ -42,7 +42,7 @@ target_link_libraries (transportTest
function function
) )
target_link_libraries (transUT target_link_libraries(transUT
os os
util util
common common
@ -62,7 +62,7 @@ target_include_directories(svrBench
"${CMAKE_CURRENT_SOURCE_DIR}/../inc" "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
) )
target_link_libraries (svrBench target_link_libraries(svrBench
os os
util util
common common
@ -82,7 +82,7 @@ target_include_directories(httpBench
"${CMAKE_CURRENT_SOURCE_DIR}/../inc" "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
) )
target_link_libraries (cliBench target_link_libraries(cliBench
os os
util util
common common

3
source/os/test/CMakeLists.txt
View File

@ -5,12 +5,11 @@ FIND_PATH(HEADER_GTEST_INCLUDE_DIR gtest.h /usr/include/gtest /usr/local/include
FIND_LIBRARY(LIB_GTEST_STATIC_DIR libgtest.a /usr/lib/ /usr/local/lib /usr/lib64) FIND_LIBRARY(LIB_GTEST_STATIC_DIR libgtest.a /usr/lib/ /usr/local/lib /usr/lib64)
FIND_LIBRARY(LIB_GTEST_SHARED_DIR libgtest.so /usr/lib/ /usr/local/lib /usr/lib64) FIND_LIBRARY(LIB_GTEST_SHARED_DIR libgtest.so /usr/lib/ /usr/local/lib /usr/lib64)
IF (HEADER_GTEST_INCLUDE_DIR AND (LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR)) IF(HEADER_GTEST_INCLUDE_DIR AND(LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR))
MESSAGE(STATUS "gTest library found, build os test") MESSAGE(STATUS "gTest library found, build os test")
INCLUDE_DIRECTORIES(${HEADER_GTEST_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${HEADER_GTEST_INCLUDE_DIR})
AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
ENDIF() ENDIF()
INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/src/util/inc) INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/src/util/inc)

30
source/util/test/CMakeLists.txt
View File

@ -5,7 +5,7 @@ FIND_PATH(HEADER_GTEST_INCLUDE_DIR gtest.h /usr/include/gtest /usr/local/include
FIND_LIBRARY(LIB_GTEST_STATIC_DIR libgtest.a /usr/lib/ /usr/local/lib /usr/lib64) FIND_LIBRARY(LIB_GTEST_STATIC_DIR libgtest.a /usr/lib/ /usr/local/lib /usr/lib64)
FIND_LIBRARY(LIB_GTEST_SHARED_DIR libgtest.so /usr/lib/ /usr/local/lib /usr/lib64) FIND_LIBRARY(LIB_GTEST_SHARED_DIR libgtest.so /usr/lib/ /usr/local/lib /usr/lib64)
IF (HEADER_GTEST_INCLUDE_DIR AND (LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR)) IF(HEADER_GTEST_INCLUDE_DIR AND(LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR))
MESSAGE(STATUS "gTest library found, build unit test") MESSAGE(STATUS "gTest library found, build unit test")
INCLUDE_DIRECTORIES(${HEADER_GTEST_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${HEADER_GTEST_INCLUDE_DIR})
@ -24,14 +24,12 @@ IF (HEADER_GTEST_INCLUDE_DIR AND (LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR))
LIST(APPEND BIN_SRC ${CMAKE_CURRENT_SOURCE_DIR}/trefTest.c) LIST(APPEND BIN_SRC ${CMAKE_CURRENT_SOURCE_DIR}/trefTest.c)
ADD_EXECUTABLE(trefTest ${BIN_SRC}) ADD_EXECUTABLE(trefTest ${BIN_SRC})
TARGET_LINK_LIBRARIES(trefTest common util) TARGET_LINK_LIBRARIES(trefTest common util)
ENDIF() ENDIF()
#IF (TD_LINUX) # IF (TD_LINUX)
# ADD_EXECUTABLE(trefTest ./trefTest.c) # ADD_EXECUTABLE(trefTest ./trefTest.c)
# TARGET_LINK_LIBRARIES(trefTest util common) # TARGET_LINK_LIBRARIES(trefTest util common)
#ENDIF () # ENDIF ()
INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/src/util/inc) INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/src/util/inc)
INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/common) INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/common)
@ -46,8 +44,8 @@ add_test(
# # freelistTest # # freelistTest
# add_executable(freelistTest "") # add_executable(freelistTest "")
# target_sources(freelistTest # target_sources(freelistTest
# PRIVATE # PRIVATE
# "freelistTest.cpp" # "freelistTest.cpp"
# ) # )
# target_link_libraries(freelistTest os util gtest gtest_main) # target_link_libraries(freelistTest os util gtest gtest_main)
@ -120,17 +118,17 @@ add_test(
) )
add_executable(regexTest "regexTest.cpp") add_executable(regexTest "regexTest.cpp")
target_link_libraries(regexTest os util gtest_main ) target_link_libraries(regexTest os util gtest_main)
add_test( add_test(
NAME regexTest NAME regexTest
COMMAND regexTest COMMAND regexTest
) )
add_executable(logTest "log.cpp") add_executable(logTest "log.cpp")
target_link_libraries(logTest os util common gtest_main) target_link_libraries(logTest os util common gtest_main)
add_test( add_test(
NAME logTest NAME logTest
COMMAND logTest COMMAND logTest
) )
add_executable(decompressTest "decompressTest.cpp") add_executable(decompressTest "decompressTest.cpp")
@ -140,7 +138,7 @@ add_test(
COMMAND decompressTest COMMAND decompressTest
) )
if (${TD_LINUX}) if(${TD_LINUX})
# terrorTest # terrorTest
add_executable(terrorTest "terrorTest.cpp") add_executable(terrorTest "terrorTest.cpp")
target_link_libraries(terrorTest os util common gtest_main) target_link_libraries(terrorTest os util common gtest_main)
@ -154,4 +152,4 @@ if (${TD_LINUX})
add_custom_command(TARGET terrorTest POST_BUILD add_custom_command(TARGET terrorTest POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ERR_TBL_FILE} $<TARGET_FILE_DIR:terrorTest> COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ERR_TBL_FILE} $<TARGET_FILE_DIR:terrorTest>
) )
endif () endif()

5
tests/taosc_test/CMakeLists.txt
View File

@ -5,15 +5,15 @@ FIND_PATH(HEADER_GTEST_INCLUDE_DIR gtest.h /usr/include/gtest /usr/local/include
FIND_LIBRARY(LIB_GTEST_STATIC_DIR libgtest.a /usr/lib/ /usr/local/lib /usr/lib64 /usr/local/taos/driver/) FIND_LIBRARY(LIB_GTEST_STATIC_DIR libgtest.a /usr/lib/ /usr/local/lib /usr/lib64 /usr/local/taos/driver/)
FIND_LIBRARY(LIB_GTEST_SHARED_DIR libgtest.so /usr/lib/ /usr/local/lib /usr/lib64 /usr/local/taos/driver/) FIND_LIBRARY(LIB_GTEST_SHARED_DIR libgtest.so /usr/lib/ /usr/local/lib /usr/lib64 /usr/local/taos/driver/)
IF (HEADER_GTEST_INCLUDE_DIR AND (LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR)) IF(HEADER_GTEST_INCLUDE_DIR AND(LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR))
MESSAGE(STATUS "gTest library found, build os test") MESSAGE(STATUS "gTest library found, build os test")
INCLUDE_DIRECTORIES(${HEADER_GTEST_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${HEADER_GTEST_INCLUDE_DIR})
AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
ENDIF() ENDIF()
aux_source_directory(src OS_SRC) aux_source_directory(src OS_SRC)
# taoscTest # taoscTest
add_executable(taoscTest "taoscTest.cpp") add_executable(taoscTest "taoscTest.cpp")
target_link_libraries(taoscTest taos os gtest_main) target_link_libraries(taoscTest taos os gtest_main)
@ -25,4 +25,3 @@ add_test(
NAME taoscTest NAME taoscTest
COMMAND taoscTest COMMAND taoscTest
) )