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

enh: unified oem --version output

This commit is contained in:
Alex Duan 2025-02-13 10:12:36 +08:00
parent b24ba69d84
commit f4774273ee
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,8 +35,6 @@ class TDTestCase(TBase):
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[0]) > 27
assert outputs[0][:22] == "taosBenchmark version:"
# commit id # commit id
assert len(outputs[1]) > 43 assert len(outputs[1]) > 43
assert outputs[1][:4] == "git:" assert outputs[1][:4] == "git:"

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

@ -35,7 +35,6 @@ class TDTestCase(TBase):
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[0]) > 22
assert outputs[0][:17] == "taosdump version:"
# commit id # commit id
assert len(outputs[1]) > 43 assert len(outputs[1]) > 43
assert outputs[1][:4] == "git:" assert outputs[1][:4] == "git:"

2
tools/taos-tools/src/benchCommandOpt.c
View File

@ -29,7 +29,7 @@ char *g_aggreFunc[] = {"*", "count(*)", "avg(C0)", "sum(C0)",
void printVersion() { void printVersion() {
// version, macro define in src/CMakeLists.txt // version, macro define in src/CMakeLists.txt
printf("taosBenchmark version: %s\n", TD_VER_NUMBER); printf("%s\n%sBenchmark version: %s\n", TD_PRODUCT_NAME, CUS_PROMPT, TD_VER_NUMBER);
printf("git: %s\n", TAOSBENCHMARK_COMMIT_ID); printf("git: %s\n", TAOSBENCHMARK_COMMIT_ID);
printf("build: %s\n", BUILD_INFO); printf("build: %s\n", BUILD_INFO);
} }

2
tools/taos-tools/src/taosdump.c
View File

@ -262,7 +262,7 @@ static void printVersion(FILE *file) {
} }
// version, macro define in src/CMakeLists.txt // version, macro define in src/CMakeLists.txt
fprintf(file, "taosdump version: %s\n", TD_VER_NUMBER); fprintf(file, "%s\n%sdump version: %s\n", TD_PRODUCT_NAME, CUS_PROMPT, TD_VER_NUMBER);
fprintf(file, "git: %s\n", TAOSDUMP_COMMIT_ID); fprintf(file, "git: %s\n", TAOSDUMP_COMMIT_ID);
fprintf(file, "build: %s\n", BUILD_INFO); fprintf(file, "build: %s\n", BUILD_INFO);
} }