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

fix: adjust ci case for four lines version output

This commit is contained in:
Alex Duan 2025-02-13 13:33:38 +08:00
parent 22ca66b25c
commit 8d9539f86e
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/util/tdef.h
View File

@ -17,7 +17,7 @@
#define _TD_UTIL_DEF_H_ #define _TD_UTIL_DEF_H_
#include "os.h" #include "os.h"
#include "cur_name.h" #include "cus_name.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

12
tests/army/tools/benchmark/basic/commandline.py
View File

@ -31,16 +31,16 @@ class TDTestCase(TBase):
# run # run
outputs = etool.runBinFile("taosBenchmark", "-V") outputs = etool.runBinFile("taosBenchmark", "-V")
print(outputs) print(outputs)
if len(outputs) != 3: if len(outputs) != 4:
tdLog.exit(f"checkVersion return lines count {len(outputs) != 3}") tdLog.exit(f"checkVersion return lines count {len(outputs) != 3}")
# version string len # version string len
assert len(outputs[0]) > 27 assert len(outputs[1]) > 24
# commit id # commit id
assert len(outputs[1]) > 43 assert len(outputs[2]) > 43
assert outputs[1][:4] == "git:" assert outputs[2][:4] == "git:"
# build info # build info
assert len(outputs[2]) > 36 assert len(outputs[3]) > 36
assert outputs[2][:6] == "build:" assert outputs[3][:6] == "build:"
tdLog.info("check taosBenchmark version successfully.") tdLog.info("check taosBenchmark version successfully.")

12
tests/army/tools/taosdump/ws/taosdumpEscapedDb.py
View File

@ -31,16 +31,16 @@ class TDTestCase(TBase):
# run # run
outputs = etool.runBinFile("taosdump", "-V") outputs = etool.runBinFile("taosdump", "-V")
print(outputs) print(outputs)
if len(outputs) != 3: if len(outputs) != 4:
tdLog.exit(f"checkVersion return lines count {len(outputs) != 3}") tdLog.exit(f"checkVersion return lines count {len(outputs) != 3}")
# version string len # version string len
assert len(outputs[0]) > 22 assert len(outputs[1]) > 19
# commit id # commit id
assert len(outputs[1]) > 43 assert len(outputs[2]) > 43
assert outputs[1][:4] == "git:" assert outputs[2][:4] == "git:"
# build info # build info
assert len(outputs[2]) > 36 assert len(outputs[3]) > 36
assert outputs[2][:6] == "build:" assert outputs[3][:6] == "build:"
tdLog.info("check taosdump version successfully.") tdLog.info("check taosdump version successfully.")

1
tools/taos-tools/inc/dump.h
View File

@ -38,7 +38,6 @@
#include <taos.h> #include <taos.h>
#include <taoserror.h> #include <taoserror.h>
#include <tdef.h>
#include <toolsdef.h> #include <toolsdef.h>
#ifdef WEBSOCKET #ifdef WEBSOCKET

1
tools/taos-tools/src/benchSys.c
View File

@ -12,6 +12,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <bench.h> #include <bench.h>
#include "benchLog.h" #include "benchLog.h"
#include "cus_name.h"
#ifdef LINUX #ifdef LINUX
#include <argp.h> #include <argp.h>