未验证 提交 2a8393f0 编写于 作者: wafwerar's avatar wafwerar 提交者: GitHub

Merge pull request #14330 from taosdata/fix/ZhiqiangWang/TD-16357-fix-test-exit

test: fix test exit
...@@ -20,12 +20,12 @@ if "%1" == "full" ( ...@@ -20,12 +20,12 @@ if "%1" == "full" (
call :GetTimeSeconds !time! call :GetTimeSeconds !time!
set time1=!_timeTemp! set time1=!_timeTemp!
echo Start at !time! echo Start at !time!
call %%i ARG1 > result_!a!.txt 2>error_!a!.txt call %%i ARG1 > result_!a!.txt 2>error_!a!.txt || set errorlevel=8
if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && set /a exitNum=8 && echo %%i >>failed.txt ) else ( call :colorEcho 0a "Success" &echo. ) if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && set /a exitNum=8 && echo %%i >>failed.txt ) else ( call :colorEcho 0a "Success" &echo. )
) )
) )
) )
exit !exitNum! exit /b !exitNum!
) )
echo Windows Taosd Test echo Windows Taosd Test
for /F "usebackq tokens=*" %%i in (simpletest.bat) do ( for /F "usebackq tokens=*" %%i in (simpletest.bat) do (
...@@ -36,8 +36,8 @@ for /F "usebackq tokens=*" %%i in (simpletest.bat) do ( ...@@ -36,8 +36,8 @@ for /F "usebackq tokens=*" %%i in (simpletest.bat) do (
call :GetTimeSeconds !timeNow! call :GetTimeSeconds !timeNow!
set time1=!_timeTemp! set time1=!_timeTemp!
echo Start at !timeNow! echo Start at !timeNow!
call %%i ARG1 > result_!a!.txt 2>error_!a!.txt call %%i ARG1 > result_!a!.txt 2>error_!a!.txt || set errorlevel=8
if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && echo result: && cat result_!a!.txt && echo error: && cat error_!a!.txt && exit 8 ) else ( call :colorEcho 0a "Success" &echo. ) if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && echo result: && cat result_!a!.txt && echo error: && cat error_!a!.txt && exit /b 8 ) else ( call :colorEcho 0a "Success" &echo. )
) )
) )
@REM echo Linux Taosd Test @REM echo Linux Taosd Test
...@@ -52,7 +52,7 @@ for /F "usebackq tokens=*" %%i in (simpletest.bat) do ( ...@@ -52,7 +52,7 @@ for /F "usebackq tokens=*" %%i in (simpletest.bat) do (
@REM if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && echo result: && cat result_!a!.txt && echo error: && cat error_!a!.txt && exit 8 ) else ( call :colorEcho 0a "Success" &echo. ) @REM if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && echo result: && cat result_!a!.txt && echo error: && cat error_!a!.txt && exit 8 ) else ( call :colorEcho 0a "Success" &echo. )
@REM ) @REM )
@REM ) @REM )
exit exit /b
:colorEcho :colorEcho
set timeNow=%time% set timeNow=%time%
......
...@@ -186,7 +186,7 @@ if __name__ == "__main__": ...@@ -186,7 +186,7 @@ if __name__ == "__main__":
tdLog.info("Procedures for tdengine deployed in %s" % (host)) tdLog.info("Procedures for tdengine deployed in %s" % (host))
if platform.system().lower() == 'windows': if platform.system().lower() == 'windows':
fileName = fileName.replace("/", os.sep) fileName = fileName.replace("/", os.sep)
if (masterIp == "" and not fileName[0:12] == "0-others\\udf"): if (masterIp == "" and not fileName == "0-others\\udf_create.py"):
threading.Thread(target=checkRunTimeError,daemon=True).start() threading.Thread(target=checkRunTimeError,daemon=True).start()
tdLog.info("Procedures for testing self-deployment") tdLog.info("Procedures for testing self-deployment")
tdDnodes.init(deployPath, masterIp) tdDnodes.init(deployPath, masterIp)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册