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

fix(os): add win ctest

This commit is contained in:
afwerar 2022-05-28 21:08:50 +08:00
parent 900aa793bd
commit 7b540d91d9
15 changed files with 67 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/cmake.options
View File

@ -49,7 +49,7 @@ IF(${TD_WINDOWS})
option( option(
BUILD_TEST BUILD_TEST
"If build unit tests using googletest" "If build unit tests using googletest"
OFF ON
) )
ELSE () ELSE ()

2
source/dnode/mnode/impl/test/acct/CMakeLists.txt
View File

@ -5,7 +5,9 @@ target_link_libraries(
PUBLIC sut PUBLIC sut
) )
if(NOT TD_WINDOWS)
add_test( add_test(
NAME acctTest NAME acctTest
COMMAND acctTest COMMAND acctTest
) )
endif(NOT TD_WINDOWS)

2
source/dnode/mnode/impl/test/func/CMakeLists.txt
View File

@ -5,7 +5,9 @@ target_link_libraries(
PUBLIC sut PUBLIC sut
) )
if(NOT TD_WINDOWS)
add_test( add_test(
NAME funcTest NAME funcTest
COMMAND funcTest COMMAND funcTest
) )
endif(NOT TD_WINDOWS)

2
source/dnode/mnode/impl/test/profile/CMakeLists.txt
View File

@ -5,7 +5,9 @@ target_link_libraries(
PUBLIC sut PUBLIC sut
) )
if(NOT TD_WINDOWS)
add_test( add_test(
NAME profileTest NAME profileTest
COMMAND profileTest COMMAND profileTest
) )
endif(NOT TD_WINDOWS)

2
source/dnode/mnode/impl/test/show/CMakeLists.txt
View File

@ -5,7 +5,9 @@ target_link_libraries(
PUBLIC sut PUBLIC sut
) )
if(NOT TD_WINDOWS)
add_test( add_test(
NAME showTest NAME showTest
COMMAND showTest COMMAND showTest
) )
endif(NOT TD_WINDOWS)

2
source/libs/executor/src/executorimpl.c
View File

@ -5197,5 +5197,5 @@ int32_t initStreamAggSupporter(SStreamAggSupporter* pSup, const char* pKey) {
if (bufSize <= pageSize) { if (bufSize <= pageSize) {
bufSize = pageSize * 4; bufSize = pageSize * 4;
} }
return createDiskbasedBuf(&pSup->pResultBuf, pageSize, bufSize, pKey, "/tmp/"); return createDiskbasedBuf(&pSup->pResultBuf, pageSize, bufSize, pKey, TD_TMP_DIR_PATH);
} }

2
source/libs/index/test/CMakeLists.txt
View File

@ -92,10 +92,12 @@ target_link_libraries (idxJsonUT
index index
) )
if(NOT TD_WINDOWS)
add_test( add_test(
NAME idxtest NAME idxtest
COMMAND idxTest COMMAND idxTest
) )
endif(NOT TD_WINDOWS)
add_test( add_test(
NAME idxJsonUT NAME idxJsonUT
COMMAND idxJsonUT COMMAND idxJsonUT

4
source/libs/index/test/indexTests.cc
View File

@ -272,7 +272,7 @@ void validateFst() {
} }
delete m; delete m;
} }
static std::string logDir = "/tmp/log"; static std::string logDir = TD_TMP_DIR_PATH "log";
static void initLog() { static void initLog() {
const char* defaultLogFileNamePrefix = "taoslog"; const char* defaultLogFileNamePrefix = "taoslog";
@ -916,7 +916,7 @@ TEST_F(IndexEnv2, testIndexOpen) {
} }
} }
TEST_F(IndexEnv2, testEmptyIndexOpen) { TEST_F(IndexEnv2, testEmptyIndexOpen) {
std::string path = "/tmp/test"; std::string path = TD_TMP_DIR_PATH "test";
if (index->Init(path) != 0) { if (index->Init(path) != 0) {
std::cout << "failed to init index" << std::endl; std::cout << "failed to init index" << std::endl;
exit(1); exit(1);

2
source/libs/parser/test/CMakeLists.txt
View File

@ -26,7 +26,9 @@ if(${BUILD_WINGETOPT})
target_link_libraries(parserTest PUBLIC wingetopt) target_link_libraries(parserTest PUBLIC wingetopt)
endif() endif()
if(NOT TD_WINDOWS)
add_test( add_test(
NAME parserTest NAME parserTest
COMMAND parserTest COMMAND parserTest
) )
endif(NOT TD_WINDOWS)

2
source/libs/planner/test/CMakeLists.txt
View File

@ -32,7 +32,9 @@ if(${BUILD_WINGETOPT})
target_link_libraries(plannerTest PUBLIC wingetopt) target_link_libraries(plannerTest PUBLIC wingetopt)
endif() endif()
if(NOT TD_WINDOWS)
add_test( add_test(
NAME plannerTest NAME plannerTest
COMMAND plannerTest COMMAND plannerTest
) )
endif(NOT TD_WINDOWS)

2
source/libs/scalar/test/scalar/CMakeLists.txt
View File

@ -17,7 +17,9 @@ TARGET_INCLUDE_DIRECTORIES(
PUBLIC "${TD_SOURCE_DIR}/source/libs/parser/inc" PUBLIC "${TD_SOURCE_DIR}/source/libs/parser/inc"
PRIVATE "${TD_SOURCE_DIR}/source/libs/scalar/inc" PRIVATE "${TD_SOURCE_DIR}/source/libs/scalar/inc"
) )
if(NOT TD_WINDOWS)
add_test( add_test(
NAME scalarTest NAME scalarTest
COMMAND scalarTest COMMAND scalarTest
) )
endif(NOT TD_WINDOWS)

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

@ -111,10 +111,12 @@ target_link_libraries (pushServer
) )
if(NOT TD_WINDOWS)
add_test( add_test(
NAME transUT NAME transUT
COMMAND transUT COMMAND transUT
) )
endif(NOT TD_WINDOWS)
add_test( add_test(
NAME transUtilUt NAME transUtilUt
COMMAND transportTest COMMAND transportTest

1
tests/system-test/fulltest.bat
View File

@ -1,4 +1,3 @@
python3 .\test.py -f 0-others\taosShell.py
python3 .\test.py -f 0-others\taosShellError.py python3 .\test.py -f 0-others\taosShellError.py
python3 .\test.py -f 0-others\taosShellNetChk.py python3 .\test.py -f 0-others\taosShellNetChk.py

4
tests/system-test/test-all.bat
View File

@ -6,14 +6,14 @@ set /a a=0
@REM for /F "usebackq tokens=*" %%i in (fulltest.bat) do ( @REM for /F "usebackq tokens=*" %%i in (fulltest.bat) do (
@REM echo Processing %%i @REM echo Processing %%i
@REM set /a a+=1 @REM set /a a+=1
@REM call %%i ARG1 -w -m localhost > result_!a!.txt 2>error_!a!.txt @REM call %%i ARG1 > result_!a!.txt 2>error_!a!.txt
@REM if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && exit 8 ) else ( call :colorEcho 0a "Success" &echo. ) @REM if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && exit 8 ) else ( call :colorEcho 0a "Success" &echo. )
@REM ) @REM )
echo Linux Taosd Test echo Linux Taosd Test
for /F "usebackq tokens=*" %%i in (fulltest.bat) do ( for /F "usebackq tokens=*" %%i in (fulltest.bat) do (
echo Processing %%i echo Processing %%i
set /a a+=1 set /a a+=1
call %%i ARG1 -w 1 -m %1 > result_!a!.txt 2>error_!a!.txt call %%i ARG1 -m %1 > result_!a!.txt 2>error_!a!.txt
if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && exit 8 ) else ( call :colorEcho 0a "Success" &echo. ) if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && exit 8 ) else ( call :colorEcho 0a "Success" &echo. )
) )
exit exit

14
tests/test/c/sdbDump.c
View File

@ -20,13 +20,13 @@
#include "tconfig.h" #include "tconfig.h"
#include "tjson.h" #include "tjson.h"
#define TMP_DNODE_DIR "/tmp/dumpsdb" #define TMP_DNODE_DIR TD_TMP_DIR_PATH "dumpsdb"
#define TMP_MNODE_DIR "/tmp/dumpsdb/mnode" #define TMP_MNODE_DIR TD_TMP_DIR_PATH "dumpsdb/mnode"
#define TMP_SDB_DATA_DIR "/tmp/dumpsdb/mnode/data" #define TMP_SDB_DATA_DIR TD_TMP_DIR_PATH "dumpsdb/mnode/data"
#define TMP_SDB_SYNC_DIR "/tmp/dumpsdb/mnode/sync" #define TMP_SDB_SYNC_DIR TD_TMP_DIR_PATH "dumpsdb/mnode/sync"
#define TMP_SDB_DATA_FILE "/tmp/dumpsdb/mnode/data/sdb.data" #define TMP_SDB_DATA_FILE TD_TMP_DIR_PATH "dumpsdb/mnode/data/sdb.data"
#define TMP_SDB_RAFT_CFG_FILE "/tmp/dumpsdb/mnode/sync/raft_config.json" #define TMP_SDB_RAFT_CFG_FILE TD_TMP_DIR_PATH "dumpsdb/mnode/sync/raft_config.json"
#define TMP_SDB_RAFT_STORE_FILE "/tmp/dumpsdb/mnode/sync/raft_store.json" #define TMP_SDB_RAFT_STORE_FILE TD_TMP_DIR_PATH "dumpsdb/mnode/sync/raft_store.json"
void reportStartup(const char *name, const char *desc) {} void reportStartup(const char *name, const char *desc) {}