diff --git a/include/util/tdef.h b/include/util/tdef.h index ccc4a6bafc..6d346290bc 100644 --- a/include/util/tdef.h +++ b/include/util/tdef.h @@ -17,7 +17,7 @@ #define _TD_UTIL_DEF_H_ #include "os.h" -#include "cur_name.h" +#include "cus_name.h" #ifdef __cplusplus extern "C" { diff --git a/tests/army/tools/benchmark/basic/commandline.py b/tests/army/tools/benchmark/basic/commandline.py index 6fb26364b7..f7cd36d9f6 100644 --- a/tests/army/tools/benchmark/basic/commandline.py +++ b/tests/army/tools/benchmark/basic/commandline.py @@ -31,16 +31,16 @@ class TDTestCase(TBase): # run outputs = etool.runBinFile("taosBenchmark", "-V") print(outputs) - if len(outputs) != 3: + if len(outputs) != 4: tdLog.exit(f"checkVersion return lines count {len(outputs) != 3}") # version string len - assert len(outputs[0]) > 27 + assert len(outputs[1]) > 24 # commit id - assert len(outputs[1]) > 43 - assert outputs[1][:4] == "git:" + assert len(outputs[2]) > 43 + assert outputs[2][:4] == "git:" # build info - assert len(outputs[2]) > 36 - assert outputs[2][:6] == "build:" + assert len(outputs[3]) > 36 + assert outputs[3][:6] == "build:" tdLog.info("check taosBenchmark version successfully.") diff --git a/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py b/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py index f9a0e31258..982cd18002 100644 --- a/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py +++ b/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py @@ -31,16 +31,16 @@ class TDTestCase(TBase): # run outputs = etool.runBinFile("taosdump", "-V") print(outputs) - if len(outputs) != 3: + if len(outputs) != 4: tdLog.exit(f"checkVersion return lines count {len(outputs) != 3}") # version string len - assert len(outputs[0]) > 22 + assert len(outputs[1]) > 19 # commit id - assert len(outputs[1]) > 43 - assert outputs[1][:4] == "git:" + assert len(outputs[2]) > 43 + assert outputs[2][:4] == "git:" # build info - assert len(outputs[2]) > 36 - assert outputs[2][:6] == "build:" + assert len(outputs[3]) > 36 + assert outputs[3][:6] == "build:" tdLog.info("check taosdump version successfully.") diff --git a/tools/taos-tools/inc/dump.h b/tools/taos-tools/inc/dump.h index d08da38ee7..b21dca4343 100644 --- a/tools/taos-tools/inc/dump.h +++ b/tools/taos-tools/inc/dump.h @@ -38,7 +38,6 @@ #include #include -#include #include #ifdef WEBSOCKET diff --git a/tools/taos-tools/src/benchSys.c b/tools/taos-tools/src/benchSys.c index 4e512a5e72..9e29701515 100644 --- a/tools/taos-tools/src/benchSys.c +++ b/tools/taos-tools/src/benchSys.c @@ -12,6 +12,7 @@ #include #include #include "benchLog.h" +#include "cus_name.h" #ifdef LINUX #include