diff --git a/tests/script/sh/deploy.bat b/tests/script/sh/deploy.bat index 7a81761e5ba7560eae00d3bf2d60cb120b56686d..04c7b8a660ee48c02a0d97583ac2b22d06323e7c 100644 --- a/tests/script/sh/deploy.bat +++ b/tests/script/sh/deploy.bat @@ -59,7 +59,7 @@ for /f "skip=1" %%A in ( 'wmic computersystem get caption' ) do if not defined fqdn set "fqdn=%%A" -echo firstEp %fqdn% > %TAOS_CFG% +echo firstEp %fqdn%:7100 > %TAOS_CFG% echo fqdn %fqdn% >> %TAOS_CFG% echo serverPort %NODE% >> %TAOS_CFG% echo dataDir %DATA_DIR% >> %TAOS_CFG% diff --git a/tests/script/sh/exec.bat b/tests/script/sh/exec.bat index 9ad6667644685d26c3634c6f35321aa2242b0734..6651c7aa8f726d5d42d52a4c8f3a9395e7a12151 100644 --- a/tests/script/sh/exec.bat +++ b/tests/script/sh/exec.bat @@ -40,9 +40,9 @@ if %EXEC_OPTON% == stop ( rem wmic process where "name='taosd.exe' and CommandLine like '%%%NODE_NAME%%%'" call terminate > NUL 2>&1 for /f "tokens=1 skip=1" %%A in ( - 'wmic process where "name='taosd.exe'" get processId ' + 'wmic process where "name='taosd.exe' and CommandLine like '%%%NODE_NAME%%%'" get processId ' ) do ( rem echo taskkill /IM %%A taskkill /IM %%A > NUL 2>&1 - ) + ) ) diff --git a/tests/script/sh/stop_dnodes.bat b/tests/script/sh/stop_dnodes.bat index e44b7b4e292874fb6c1cf75505c1bfee0c656f86..ab7af2ca92023745b8b712cb78e9b168a6c00598 100644 --- a/tests/script/sh/stop_dnodes.bat +++ b/tests/script/sh/stop_dnodes.bat @@ -2,4 +2,5 @@ rem echo taskkill /F /IM taosd.exe +wmic process where "name='taosd.exe'" call terminate > NUL 2>&1 taskkill /F /IM taosd.exe > NUL 2>&1 \ No newline at end of file diff --git a/tests/tsim/src/simSystem.c b/tests/tsim/src/simSystem.c index bf47c56718b7377aa5cd4fd48269eec0fc9e0b38..65086eace5c3f844be6ba8d3e6ea1bd963832d15 100644 --- a/tests/tsim/src/simSystem.c +++ b/tests/tsim/src/simSystem.c @@ -78,8 +78,8 @@ char *simParseHostName(char *varName) { } bool simSystemInit() { - taosGetFqdn(simHostName); taos_init(); + taosGetFqdn(simHostName); simInitsimCmdList(); memset(simScriptList, 0, sizeof(SScript *) * MAX_MAIN_SCRIPT_NUM); return true;