diff --git a/source/libs/executor/test/CMakeLists.txt b/source/libs/executor/test/CMakeLists.txt index ebf7131aa5..b5e58ee05e 100644 --- a/source/libs/executor/test/CMakeLists.txt +++ b/source/libs/executor/test/CMakeLists.txt @@ -2,23 +2,22 @@ MESSAGE(STATUS "build parser unit test") # IF(NOT TD_DARWIN) -# # GoogleTest requires at least C++11 -# SET(CMAKE_CXX_STANDARD 11) -# AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST) -# -# ADD_EXECUTABLE(executorTest ${SOURCE_LIST}) -# TARGET_LINK_LIBRARIES( -# executorTest -# PRIVATE os util common transport gtest taos_static qcom executor function planner scalar nodes vnode -# ) -# -# TARGET_INCLUDE_DIRECTORIES( -# executorTest -# PUBLIC "${TD_SOURCE_DIR}/include/libs/executor/" -# PRIVATE "${TD_SOURCE_DIR}/source/libs/executor/inc" -# ) +# # GoogleTest requires at least C++11 +# SET(CMAKE_CXX_STANDARD 11) +# AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST) +# +# ADD_EXECUTABLE(executorTest ${SOURCE_LIST}) +# TARGET_LINK_LIBRARIES( +# executorTest +# PRIVATE os util common transport gtest taos_static qcom executor function planner scalar nodes vnode +# ) +# +# TARGET_INCLUDE_DIRECTORIES( +# executorTest +# PUBLIC "${TD_SOURCE_DIR}/include/libs/executor/" +# PRIVATE "${TD_SOURCE_DIR}/source/libs/executor/inc" +# ) # ENDIF () - SET(CMAKE_CXX_STANDARD 11) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST) diff --git a/source/libs/index/test/CMakeLists.txt b/source/libs/index/test/CMakeLists.txt index eff74f93d2..e8a8194ea2 100644 --- a/source/libs/index/test/CMakeLists.txt +++ b/source/libs/index/test/CMakeLists.txt @@ -7,160 +7,159 @@ IF(NOT TD_DARWIN) add_executable(idxFstUtilUT "") target_sources(idxTest - PRIVATE - "indexTests.cc" + PRIVATE + "indexTests.cc" ) target_sources(idxFstTest - PRIVATE - "fstTest.cc" + PRIVATE + "fstTest.cc" ) target_sources(idxFstUT - PRIVATE - "fstUT.cc" + PRIVATE + "fstUT.cc" ) target_sources(idxUtilUT - PRIVATE - "utilUT.cc" + PRIVATE + "utilUT.cc" ) target_sources(idxJsonUT - PRIVATE - "jsonUT.cc" + PRIVATE + "jsonUT.cc" ) target_sources(idxFstUtilUT - PRIVATE - "fstUtilUT.cc" + PRIVATE + "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 - PRIVATE - "jsonUT.cc" + PRIVATE + "jsonUT.cc" ) - target_include_directories (idxTest + target_include_directories(idxTest PUBLIC - "${TD_SOURCE_DIR}/include/libs/index" + "${TD_SOURCE_DIR}/include/libs/index" "${CMAKE_CURRENT_SOURCE_DIR}/../inc" - ) - target_include_directories (idxFstTest + ) + target_include_directories(idxFstTest PUBLIC - "${TD_SOURCE_DIR}/include/libs/index" + "${TD_SOURCE_DIR}/include/libs/index" "${CMAKE_CURRENT_SOURCE_DIR}/../inc" - ) + ) - target_include_directories (idxFstUT + target_include_directories(idxFstUT PUBLIC - "${TD_SOURCE_DIR}/include/libs/index" + "${TD_SOURCE_DIR}/include/libs/index" "${CMAKE_CURRENT_SOURCE_DIR}/../inc" - ) + ) - target_include_directories (idxUtilUT + target_include_directories(idxUtilUT PUBLIC - "${TD_SOURCE_DIR}/include/libs/index" + "${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_include_directories (idxFstUtilUT - PUBLIC - "${TD_SOURCE_DIR}/include/libs/index" - "${CMAKE_CURRENT_SOURCE_DIR}/../inc" - ) - target_include_directories (idxJsonUT + target_include_directories(idxJsonUT PUBLIC - "${TD_SOURCE_DIR}/include/libs/index" + "${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 + "${TD_SOURCE_DIR}/include/libs/index" + "${CMAKE_CURRENT_SOURCE_DIR}/../inc" + ) - target_link_libraries (idxTest - os + target_link_libraries(idxTest + os util common gtest_main index ) - target_link_libraries (idxFstTest - os + target_link_libraries(idxFstTest + os util common gtest_main index ) - target_link_libraries (idxFstUT - os + target_link_libraries(idxFstUT + os util common gtest_main index ) - target_link_libraries (idxTest - os + target_link_libraries(idxTest + os util common gtest_main index ) - target_link_libraries (idxFstTest - os + target_link_libraries(idxFstTest + os util common gtest_main index ) - target_link_libraries (idxFstUT - os + target_link_libraries(idxFstUT + os util common gtest_main index ) - target_link_libraries (idxUtilUT - os + target_link_libraries(idxUtilUT + os util common gtest_main index ) - target_link_libraries (idxJsonUT - os + target_link_libraries(idxJsonUT + os util common gtest_main index ) - target_link_libraries (idxFstUtilUT - os + target_link_libraries(idxFstUtilUT + os util common gtest_main index ) - + add_test( NAME idxJsonUT - COMMAND idxJsonUT + COMMAND idxJsonUT ) add_test( - NAME idxFstUtilUT - COMMAND idxFstUtilUT - + NAME idxFstUtilUT + COMMAND idxFstUtilUT ) add_test( @@ -168,15 +167,15 @@ IF(NOT TD_DARWIN) COMMAND idxTest ) add_test( - NAME idxUtilUT - COMMAND idxUtilUT + NAME idxUtilUT + COMMAND idxUtilUT ) add_test( - NAME idxFstUT - COMMAND idxFstUT + NAME idxFstUT + COMMAND idxFstUT ) add_test( NAME idxFstTest - COMMAND idxFstTest + COMMAND idxFstTest ) -ENDIF () +ENDIF() diff --git a/source/libs/qworker/test/CMakeLists.txt b/source/libs/qworker/test/CMakeLists.txt index 22870ea94d..e87456cf72 100644 --- a/source/libs/qworker/test/CMakeLists.txt +++ b/source/libs/qworker/test/CMakeLists.txt @@ -1,5 +1,6 @@ MESSAGE(STATUS "build qworker unit test") + IF(NOT TD_DARWIN) # GoogleTest requires at least C++11 SET(CMAKE_CXX_STANDARD 11) diff --git a/source/libs/transport/test/CMakeLists.txt b/source/libs/transport/test/CMakeLists.txt index 3a5213a726..f30dfc56a2 100644 --- a/source/libs/transport/test/CMakeLists.txt +++ b/source/libs/transport/test/CMakeLists.txt @@ -14,7 +14,7 @@ target_sources(transUT2 PRIVATE "transUT2.cpp" ) -target_sources(transportTest +target_sources(transportTest PRIVATE "transportTests.cpp" ) @@ -30,16 +30,16 @@ target_sources(cliBench target_sources(httpBench PRIVATE "http_test.c" -) +) -target_include_directories(transportTest +target_include_directories(transportTest PUBLIC - "${TD_SOURCE_DIR}/include/libs/transport" + "${TD_SOURCE_DIR}/include/libs/transport" "${CMAKE_CURRENT_SOURCE_DIR}/../inc" ) -target_link_libraries (transportTest - os +target_link_libraries(transportTest + os util common gtest_main @@ -47,81 +47,81 @@ target_link_libraries (transportTest function ) -target_link_libraries (transUT - os +target_link_libraries(transUT + os util common gtest_main - transport + transport ) target_include_directories(transUT PUBLIC - "${TD_SOURCE_DIR}/include/libs/transport" + "${TD_SOURCE_DIR}/include/libs/transport" "${CMAKE_CURRENT_SOURCE_DIR}/../inc" ) -target_link_libraries (transUT2 - os +target_link_libraries(transUT2 + os util common gtest_main - transport + transport ) target_include_directories(transUT2 PUBLIC - "${TD_SOURCE_DIR}/include/libs/transport" + "${TD_SOURCE_DIR}/include/libs/transport" "${CMAKE_CURRENT_SOURCE_DIR}/../inc" ) target_include_directories(svrBench PUBLIC - "${TD_SOURCE_DIR}/include/libs/transport" + "${TD_SOURCE_DIR}/include/libs/transport" "${CMAKE_CURRENT_SOURCE_DIR}/../inc" ) -target_link_libraries (svrBench - os +target_link_libraries(svrBench + os util common gtest_main - transport + transport ) target_include_directories(cliBench PUBLIC - "${TD_SOURCE_DIR}/include/libs/transport" + "${TD_SOURCE_DIR}/include/libs/transport" "${CMAKE_CURRENT_SOURCE_DIR}/../inc" ) target_include_directories(httpBench PUBLIC - "${TD_SOURCE_DIR}/include/libs/transport" + "${TD_SOURCE_DIR}/include/libs/transport" "${CMAKE_CURRENT_SOURCE_DIR}/../inc" ) -target_link_libraries (cliBench - os +target_link_libraries(cliBench + os util common gtest_main - transport + transport ) target_link_libraries(httpBench - os + os util common gtest_main - transport + transport ) add_test( - NAME transUT - COMMAND transUT + NAME transUT + COMMAND transUT ) add_test( - NAME transUtilUt + NAME transUtilUt COMMAND transportTest ) diff --git a/source/os/src/osDir.c b/source/os/src/osDir.c index 497769a71c..84de563cda 100644 --- a/source/os/src/osDir.c +++ b/source/os/src/osDir.c @@ -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)) { return 0; } + code = chmod(temp, mode); if (-1 == code) { - terrno = TAOS_SYSTEM_ERROR(errno); - return terrno; + struct stat statbuf = {0}; + code = stat(temp, &statbuf); + if (code != 0 || (statbuf.st_mode & mode) != mode) { + terrno = TAOS_SYSTEM_ERROR(errno); + return terrno; + } } } diff --git a/source/os/test/CMakeLists.txt b/source/os/test/CMakeLists.txt index 324920f37b..cc7110517f 100644 --- a/source/os/test/CMakeLists.txt +++ b/source/os/test/CMakeLists.txt @@ -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_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") INCLUDE_DIRECTORIES(${HEADER_GTEST_INCLUDE_DIR}) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST) - ENDIF() INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/src/util/inc) diff --git a/source/util/test/CMakeLists.txt b/source/util/test/CMakeLists.txt index 3732c2af59..e801008970 100644 --- a/source/util/test/CMakeLists.txt +++ b/source/util/test/CMakeLists.txt @@ -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_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") 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) ADD_EXECUTABLE(hashTest ${SOURCE_LIST}) TARGET_LINK_LIBRARIES(hashTest util common os gtest pthread) - + LIST(APPEND BIN_SRC ${CMAKE_CURRENT_SOURCE_DIR}/trefTest.c) ADD_EXECUTABLE(trefTest ${BIN_SRC}) TARGET_LINK_LIBRARIES(trefTest common util) - ENDIF() -#IF (TD_LINUX) -# ADD_EXECUTABLE(trefTest ./trefTest.c) -# TARGET_LINK_LIBRARIES(trefTest util common) -#ENDIF () - +# IF (TD_LINUX) +# ADD_EXECUTABLE(trefTest ./trefTest.c) +# TARGET_LINK_LIBRARIES(trefTest util common) +# ENDIF () INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/src/util/inc) INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/common) @@ -46,8 +44,8 @@ add_test( # # freelistTest # add_executable(freelistTest "") # target_sources(freelistTest -# PRIVATE -# "freelistTest.cpp" +# PRIVATE +# "freelistTest.cpp" # ) # target_link_libraries(freelistTest os util gtest gtest_main) @@ -57,7 +55,7 @@ add_test( # cfgTest add_executable(cfgTest "cfgTest.cpp") -target_link_libraries(cfgTest os util gtest_main) +target_link_libraries(cfgTest os util gtest_main) add_test( NAME cfgTest COMMAND cfgTest @@ -65,7 +63,7 @@ add_test( # bloomFilterTest add_executable(bloomFilterTest "bloomFilterTest.cpp") -target_link_libraries(bloomFilterTest os util gtest_main) +target_link_libraries(bloomFilterTest os util gtest_main) add_test( NAME bloomFilterTest COMMAND bloomFilterTest @@ -73,7 +71,7 @@ add_test( # taosbsearchTest add_executable(taosbsearchTest "taosbsearchTest.cpp") -target_link_libraries(taosbsearchTest os util gtest_main) +target_link_libraries(taosbsearchTest os util gtest_main) add_test( NAME taosbsearchTest COMMAND taosbsearchTest @@ -81,7 +79,7 @@ add_test( # trbtreeTest add_executable(rbtreeTest "trbtreeTest.cpp") -target_link_libraries(rbtreeTest os util gtest_main) +target_link_libraries(rbtreeTest os util gtest_main) add_test( NAME rbtreeTest COMMAND rbtreeTest @@ -120,17 +118,17 @@ add_test( ) add_executable(regexTest "regexTest.cpp") -target_link_libraries(regexTest os util gtest_main ) +target_link_libraries(regexTest os util gtest_main) add_test( NAME regexTest COMMAND regexTest ) add_executable(logTest "log.cpp") - target_link_libraries(logTest os util common gtest_main) - add_test( - NAME logTest - COMMAND logTest +target_link_libraries(logTest os util common gtest_main) +add_test( + NAME logTest + COMMAND logTest ) add_executable(decompressTest "decompressTest.cpp") @@ -140,7 +138,7 @@ add_test( COMMAND decompressTest ) -if (${TD_LINUX}) +if(${TD_LINUX}) # terrorTest add_executable(terrorTest "terrorTest.cpp") target_link_libraries(terrorTest os util common gtest_main) @@ -154,4 +152,4 @@ if (${TD_LINUX}) add_custom_command(TARGET terrorTest POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ERR_TBL_FILE} $ ) -endif () +endif() diff --git a/tests/taosc_test/CMakeLists.txt b/tests/taosc_test/CMakeLists.txt index 3ea6964462..c16fe59271 100644 --- a/tests/taosc_test/CMakeLists.txt +++ b/tests/taosc_test/CMakeLists.txt @@ -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_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") INCLUDE_DIRECTORIES(${HEADER_GTEST_INCLUDE_DIR}) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST) - ENDIF() aux_source_directory(src OS_SRC) + # taoscTest add_executable(taoscTest "taoscTest.cpp") target_link_libraries(taoscTest taos os gtest_main) @@ -25,4 +25,3 @@ add_test( NAME taoscTest COMMAND taoscTest ) -