diff --git a/Jenkinsfile b/Jenkinsfile index 8ce1ef0f5cc8d73d13e2bba1c144cb329308f585..dfe9970892c6388962bc3a98b8a018c73039585b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -117,7 +117,7 @@ def pre_test_win(){ cd C:\\workspace\\TDinternal rd /s /Q C:\\workspace\\TDinternal\\debug cd C:\\workspace\\TDinternal\\community - git reset --hard HEAD~10 >/dev/null + git reset --hard HEAD~10 ''' script { if (env.CHANGE_TARGET == 'master') { @@ -138,7 +138,7 @@ def pre_test_win(){ } bat''' cd C:\\workspace\\TDinternal\\community - git pull >/dev/null + git pull git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD git clean -dfx @@ -164,7 +164,7 @@ def pre_test_win(){ } bat ''' cd C:\\workspace\\TDinternal - git pull >/dev/null + git pull export TZ=Asia/Harbin date diff --git a/tests/pytest/test-all.bat b/tests/pytest/test-all.bat index 9748d582752a5a14cc20542cc9e82e2c0816e005..dd3ef925350c90d0da03e54b2aabe1041df0abcd 100644 --- a/tests/pytest/test-all.bat +++ b/tests/pytest/test-all.bat @@ -4,7 +4,7 @@ for /F "tokens=1,2 delims=#" %%a in ('"prompt #$H#$E# & echo on & for %%b in (1) for /F "usebackq tokens=*" %%i in (fulltest.bat) do ( echo Processing %%i call %%i ARG1 -w 1 -m %1 > result.txt 2>error.txt - if errorlevel 1 ( call :colorEcho 0c "failed" &echo. ) else ( call :colorEcho 0a "Success" &echo. ) + if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && exit /b ) else ( call :colorEcho 0a "Success" &echo. ) ) exit