Merge branch 'main' into merge/mainto3.0
This commit is contained in:
commit
3eb877aa5d
|
@ -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)
|
||||||
|
|
||||||
|
|
|
@ -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()
|
||||||
|
|
|
@ -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)
|
||||||
|
|
|
@ -14,7 +14,7 @@ target_sources(transUT2
|
||||||
PRIVATE
|
PRIVATE
|
||||||
"transUT2.cpp"
|
"transUT2.cpp"
|
||||||
)
|
)
|
||||||
target_sources(transportTest
|
target_sources(transportTest
|
||||||
PRIVATE
|
PRIVATE
|
||||||
"transportTests.cpp"
|
"transportTests.cpp"
|
||||||
)
|
)
|
||||||
|
@ -30,16 +30,16 @@ target_sources(cliBench
|
||||||
target_sources(httpBench
|
target_sources(httpBench
|
||||||
PRIVATE
|
PRIVATE
|
||||||
"http_test.c"
|
"http_test.c"
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(transportTest
|
target_include_directories(transportTest
|
||||||
PUBLIC
|
PUBLIC
|
||||||
"${TD_SOURCE_DIR}/include/libs/transport"
|
"${TD_SOURCE_DIR}/include/libs/transport"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
|
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries (transportTest
|
target_link_libraries(transportTest
|
||||||
os
|
os
|
||||||
util
|
util
|
||||||
common
|
common
|
||||||
gtest_main
|
gtest_main
|
||||||
|
@ -47,81 +47,81 @@ target_link_libraries (transportTest
|
||||||
function
|
function
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries (transUT
|
target_link_libraries(transUT
|
||||||
os
|
os
|
||||||
util
|
util
|
||||||
common
|
common
|
||||||
gtest_main
|
gtest_main
|
||||||
transport
|
transport
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(transUT
|
target_include_directories(transUT
|
||||||
PUBLIC
|
PUBLIC
|
||||||
"${TD_SOURCE_DIR}/include/libs/transport"
|
"${TD_SOURCE_DIR}/include/libs/transport"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
|
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries (transUT2
|
target_link_libraries(transUT2
|
||||||
os
|
os
|
||||||
util
|
util
|
||||||
common
|
common
|
||||||
gtest_main
|
gtest_main
|
||||||
transport
|
transport
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(transUT2
|
target_include_directories(transUT2
|
||||||
PUBLIC
|
PUBLIC
|
||||||
"${TD_SOURCE_DIR}/include/libs/transport"
|
"${TD_SOURCE_DIR}/include/libs/transport"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
|
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(svrBench
|
target_include_directories(svrBench
|
||||||
PUBLIC
|
PUBLIC
|
||||||
"${TD_SOURCE_DIR}/include/libs/transport"
|
"${TD_SOURCE_DIR}/include/libs/transport"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
|
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries (svrBench
|
target_link_libraries(svrBench
|
||||||
os
|
os
|
||||||
util
|
util
|
||||||
common
|
common
|
||||||
gtest_main
|
gtest_main
|
||||||
transport
|
transport
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(cliBench
|
target_include_directories(cliBench
|
||||||
PUBLIC
|
PUBLIC
|
||||||
"${TD_SOURCE_DIR}/include/libs/transport"
|
"${TD_SOURCE_DIR}/include/libs/transport"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
|
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(httpBench
|
target_include_directories(httpBench
|
||||||
PUBLIC
|
PUBLIC
|
||||||
"${TD_SOURCE_DIR}/include/libs/transport"
|
"${TD_SOURCE_DIR}/include/libs/transport"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
|
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries (cliBench
|
target_link_libraries(cliBench
|
||||||
os
|
os
|
||||||
util
|
util
|
||||||
common
|
common
|
||||||
gtest_main
|
gtest_main
|
||||||
transport
|
transport
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(httpBench
|
target_link_libraries(httpBench
|
||||||
os
|
os
|
||||||
util
|
util
|
||||||
common
|
common
|
||||||
gtest_main
|
gtest_main
|
||||||
transport
|
transport
|
||||||
)
|
)
|
||||||
|
|
||||||
add_test(
|
add_test(
|
||||||
NAME transUT
|
NAME transUT
|
||||||
COMMAND transUT
|
COMMAND transUT
|
||||||
)
|
)
|
||||||
add_test(
|
add_test(
|
||||||
NAME transUtilUt
|
NAME transUtilUt
|
||||||
COMMAND transportTest
|
COMMAND transportTest
|
||||||
)
|
)
|
||||||
|
|
|
@ -223,10 +223,15 @@ int32_t taosMulModeMkDir(const char *dirname, int mode, bool checkAccess) {
|
||||||
if (checkAccess && taosCheckAccessFile(temp, TD_FILE_ACCESS_EXIST_OK | TD_FILE_ACCESS_READ_OK | TD_FILE_ACCESS_WRITE_OK)) {
|
if (checkAccess && taosCheckAccessFile(temp, TD_FILE_ACCESS_EXIST_OK | TD_FILE_ACCESS_READ_OK | TD_FILE_ACCESS_WRITE_OK)) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
code = chmod(temp, mode);
|
code = chmod(temp, mode);
|
||||||
if (-1 == code) {
|
if (-1 == code) {
|
||||||
terrno = TAOS_SYSTEM_ERROR(errno);
|
struct stat statbuf = {0};
|
||||||
return terrno;
|
code = stat(temp, &statbuf);
|
||||||
|
if (code != 0 || (statbuf.st_mode & mode) != mode) {
|
||||||
|
terrno = TAOS_SYSTEM_ERROR(errno);
|
||||||
|
return terrno;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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)
|
||||||
|
|
|
@ -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})
|
||||||
|
@ -20,18 +20,16 @@ IF (HEADER_GTEST_INCLUDE_DIR AND (LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR))
|
||||||
LIST(APPEND SOURCE_LIST ${CMAKE_CURRENT_SOURCE_DIR}/hashTest.cpp)
|
LIST(APPEND SOURCE_LIST ${CMAKE_CURRENT_SOURCE_DIR}/hashTest.cpp)
|
||||||
ADD_EXECUTABLE(hashTest ${SOURCE_LIST})
|
ADD_EXECUTABLE(hashTest ${SOURCE_LIST})
|
||||||
TARGET_LINK_LIBRARIES(hashTest util common os gtest pthread)
|
TARGET_LINK_LIBRARIES(hashTest util common os gtest pthread)
|
||||||
|
|
||||||
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)
|
||||||
|
|
||||||
|
@ -57,7 +55,7 @@ add_test(
|
||||||
|
|
||||||
# cfgTest
|
# cfgTest
|
||||||
add_executable(cfgTest "cfgTest.cpp")
|
add_executable(cfgTest "cfgTest.cpp")
|
||||||
target_link_libraries(cfgTest os util gtest_main)
|
target_link_libraries(cfgTest os util gtest_main)
|
||||||
add_test(
|
add_test(
|
||||||
NAME cfgTest
|
NAME cfgTest
|
||||||
COMMAND cfgTest
|
COMMAND cfgTest
|
||||||
|
@ -65,7 +63,7 @@ add_test(
|
||||||
|
|
||||||
# bloomFilterTest
|
# bloomFilterTest
|
||||||
add_executable(bloomFilterTest "bloomFilterTest.cpp")
|
add_executable(bloomFilterTest "bloomFilterTest.cpp")
|
||||||
target_link_libraries(bloomFilterTest os util gtest_main)
|
target_link_libraries(bloomFilterTest os util gtest_main)
|
||||||
add_test(
|
add_test(
|
||||||
NAME bloomFilterTest
|
NAME bloomFilterTest
|
||||||
COMMAND bloomFilterTest
|
COMMAND bloomFilterTest
|
||||||
|
@ -73,7 +71,7 @@ add_test(
|
||||||
|
|
||||||
# taosbsearchTest
|
# taosbsearchTest
|
||||||
add_executable(taosbsearchTest "taosbsearchTest.cpp")
|
add_executable(taosbsearchTest "taosbsearchTest.cpp")
|
||||||
target_link_libraries(taosbsearchTest os util gtest_main)
|
target_link_libraries(taosbsearchTest os util gtest_main)
|
||||||
add_test(
|
add_test(
|
||||||
NAME taosbsearchTest
|
NAME taosbsearchTest
|
||||||
COMMAND taosbsearchTest
|
COMMAND taosbsearchTest
|
||||||
|
@ -81,7 +79,7 @@ add_test(
|
||||||
|
|
||||||
# trbtreeTest
|
# trbtreeTest
|
||||||
add_executable(rbtreeTest "trbtreeTest.cpp")
|
add_executable(rbtreeTest "trbtreeTest.cpp")
|
||||||
target_link_libraries(rbtreeTest os util gtest_main)
|
target_link_libraries(rbtreeTest os util gtest_main)
|
||||||
add_test(
|
add_test(
|
||||||
NAME rbtreeTest
|
NAME rbtreeTest
|
||||||
COMMAND rbtreeTest
|
COMMAND rbtreeTest
|
||||||
|
@ -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,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
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue