Merge remote-tracking branch 'flyingangel2013/ts_3469_casefile' into doc/contrib

This commit is contained in:
Shengliang Guan 2024-10-31 00:02:41 +08:00
commit 5d57d78826
3 changed files with 94 additions and 95 deletions

View File

@ -2,23 +2,22 @@
MESSAGE(STATUS "build parser unit test") MESSAGE(STATUS "build parser unit test")
# IF(NOT TD_DARWIN) # IF(NOT TD_DARWIN)
# # GoogleTest requires at least C++11 # # GoogleTest requires at least C++11
# SET(CMAKE_CXX_STANDARD 11) # SET(CMAKE_CXX_STANDARD 11)
# AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST) # AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
# #
# ADD_EXECUTABLE(executorTest ${SOURCE_LIST}) # ADD_EXECUTABLE(executorTest ${SOURCE_LIST})
# TARGET_LINK_LIBRARIES( # TARGET_LINK_LIBRARIES(
# executorTest # executorTest
# PRIVATE os util common transport gtest taos_static qcom executor function planner scalar nodes vnode # PRIVATE os util common transport gtest taos_static qcom executor function planner scalar nodes vnode
# ) # )
# #
# TARGET_INCLUDE_DIRECTORIES( # TARGET_INCLUDE_DIRECTORIES(
# executorTest # executorTest
# PUBLIC "${TD_SOURCE_DIR}/include/libs/executor/" # PUBLIC "${TD_SOURCE_DIR}/include/libs/executor/"
# PRIVATE "${TD_SOURCE_DIR}/source/libs/executor/inc" # PRIVATE "${TD_SOURCE_DIR}/source/libs/executor/inc"
# ) # )
# ENDIF () # ENDIF ()
SET(CMAKE_CXX_STANDARD 11) SET(CMAKE_CXX_STANDARD 11)
AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)

View File

@ -7,160 +7,159 @@ IF(NOT TD_DARWIN)
add_executable(idxFstUtilUT "") add_executable(idxFstUtilUT "")
target_sources(idxTest target_sources(idxTest
PRIVATE PRIVATE
"indexTests.cc" "indexTests.cc"
) )
target_sources(idxFstTest target_sources(idxFstTest
PRIVATE PRIVATE
"fstTest.cc" "fstTest.cc"
) )
target_sources(idxFstUT target_sources(idxFstUT
PRIVATE PRIVATE
"fstUT.cc" "fstUT.cc"
) )
target_sources(idxUtilUT target_sources(idxUtilUT
PRIVATE PRIVATE
"utilUT.cc" "utilUT.cc"
) )
target_sources(idxJsonUT target_sources(idxJsonUT
PRIVATE PRIVATE
"jsonUT.cc" "jsonUT.cc"
) )
target_sources(idxFstUtilUT target_sources(idxFstUtilUT
PRIVATE PRIVATE
"fstUtilUT.cc" "fstUtilUT.cc"
)
target_include_directories(idxTest
PUBLIC
"${TD_SOURCE_DIR}/include/libs/index"
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
)
target_include_directories(idxFstTest
PUBLIC
"${TD_SOURCE_DIR}/include/libs/index"
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
) )
target_include_directories (idxTest
PUBLIC
"${TD_SOURCE_DIR}/include/libs/index"
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
)
target_include_directories (idxFstTest
PUBLIC
"${TD_SOURCE_DIR}/include/libs/index"
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
)
target_sources(idxJsonUT target_sources(idxJsonUT
PRIVATE PRIVATE
"jsonUT.cc" "jsonUT.cc"
) )
target_include_directories (idxTest target_include_directories(idxTest
PUBLIC PUBLIC
"${TD_SOURCE_DIR}/include/libs/index" "${TD_SOURCE_DIR}/include/libs/index"
"${CMAKE_CURRENT_SOURCE_DIR}/../inc" "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
) )
target_include_directories (idxFstTest target_include_directories(idxFstTest
PUBLIC PUBLIC
"${TD_SOURCE_DIR}/include/libs/index" "${TD_SOURCE_DIR}/include/libs/index"
"${CMAKE_CURRENT_SOURCE_DIR}/../inc" "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
) )
target_include_directories (idxFstUT target_include_directories(idxFstUT
PUBLIC PUBLIC
"${TD_SOURCE_DIR}/include/libs/index" "${TD_SOURCE_DIR}/include/libs/index"
"${CMAKE_CURRENT_SOURCE_DIR}/../inc" "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
) )
target_include_directories (idxUtilUT target_include_directories(idxUtilUT
PUBLIC PUBLIC
"${TD_SOURCE_DIR}/include/libs/index" "${TD_SOURCE_DIR}/include/libs/index"
"${CMAKE_CURRENT_SOURCE_DIR}/../inc" "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
) )
target_include_directories (idxJsonUT target_include_directories(idxJsonUT
PUBLIC
"${TD_SOURCE_DIR}/include/libs/index"
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
)
target_include_directories (idxFstUtilUT
PUBLIC
"${TD_SOURCE_DIR}/include/libs/index"
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
)
target_include_directories (idxJsonUT
PUBLIC PUBLIC
"${TD_SOURCE_DIR}/include/libs/index" "${TD_SOURCE_DIR}/include/libs/index"
"${CMAKE_CURRENT_SOURCE_DIR}/../inc" "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
) )
target_include_directories(idxFstUtilUT
PUBLIC
"${TD_SOURCE_DIR}/include/libs/index"
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
)
target_include_directories(idxJsonUT
PUBLIC
"${TD_SOURCE_DIR}/include/libs/index"
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
)
target_link_libraries (idxTest target_link_libraries(idxTest
os os
util util
common common
gtest_main gtest_main
index index
) )
target_link_libraries (idxFstTest target_link_libraries(idxFstTest
os os
util util
common common
gtest_main gtest_main
index index
) )
target_link_libraries (idxFstUT target_link_libraries(idxFstUT
os os
util util
common common
gtest_main gtest_main
index index
) )
target_link_libraries (idxTest target_link_libraries(idxTest
os os
util util
common common
gtest_main gtest_main
index index
) )
target_link_libraries (idxFstTest target_link_libraries(idxFstTest
os os
util util
common common
gtest_main gtest_main
index index
) )
target_link_libraries (idxFstUT target_link_libraries(idxFstUT
os os
util util
common common
gtest_main gtest_main
index index
) )
target_link_libraries (idxUtilUT target_link_libraries(idxUtilUT
os os
util util
common common
gtest_main gtest_main
index index
) )
target_link_libraries (idxJsonUT target_link_libraries(idxJsonUT
os os
util util
common common
gtest_main gtest_main
index index
) )
target_link_libraries (idxFstUtilUT target_link_libraries(idxFstUtilUT
os os
util util
common common
gtest_main gtest_main
index index
) )
add_test( add_test(
NAME idxJsonUT NAME idxJsonUT
COMMAND idxJsonUT COMMAND idxJsonUT
) )
add_test( add_test(
NAME idxFstUtilUT NAME idxFstUtilUT
COMMAND idxFstUtilUT COMMAND idxFstUtilUT
) )
add_test( add_test(
@ -168,15 +167,15 @@ IF(NOT TD_DARWIN)
COMMAND idxTest COMMAND idxTest
) )
add_test( add_test(
NAME idxUtilUT NAME idxUtilUT
COMMAND idxUtilUT COMMAND idxUtilUT
) )
add_test( add_test(
NAME idxFstUT NAME idxFstUT
COMMAND idxFstUT COMMAND idxFstUT
) )
add_test( add_test(
NAME idxFstTest NAME idxFstTest
COMMAND idxFstTest COMMAND idxFstTest
) )
ENDIF () ENDIF()

View File

@ -1,5 +1,6 @@
MESSAGE(STATUS "build qworker unit test") MESSAGE(STATUS "build qworker unit test")
IF(NOT TD_DARWIN) IF(NOT TD_DARWIN)
# GoogleTest requires at least C++11 # GoogleTest requires at least C++11
SET(CMAKE_CXX_STANDARD 11) SET(CMAKE_CXX_STANDARD 11)