summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchenzizhan <[email protected]>2023-05-30 14:34:18 +0800
committerchenzizhan <[email protected]>2023-05-30 14:34:18 +0800
commit87ed25f469033eb8f636f2f1b4999540a93172a8 (patch)
tree7970af5f70ef648f3ad2962a697334e898b226ba
parent625711dc7fd52b84675bf58dbcece9273ba4b625 (diff)
testCI
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--ctest/CMakeLists.txt6
-rw-r--r--test/src/test_utils.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d1aa5ef..f70f1eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ variables:
BUILD_IMAGE_CENTOS7: "git.mesalab.cn:7443/mesa_platform/build-env:master"
BUILD_IMAGE_CENTOS8: "git.mesalab.cn:7443/mesa_platform/build-env:rockylinux"
BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/
- INSTALL_DEPENDENCY_LIBRARY: libasan
+ INSTALL_DEPENDENCY_LIBRARY: libasan uuid uuid-devel libuuid libuuid-devel
INSTALL_PREFIX: "/opt/MESA/"
stages:
diff --git a/ctest/CMakeLists.txt b/ctest/CMakeLists.txt
index a20b703..b085c75 100644
--- a/ctest/CMakeLists.txt
+++ b/ctest/CMakeLists.txt
@@ -5,15 +5,17 @@ project(fieldstat_ctest)
add_test(NAME COPY_CREATE_DIR COMMAND sh -c "mkdir -p ${CMAKE_BINARY_DIR}/testing/ ")
add_test(NAME COPY_GTEST_INTERFACE_BINARY COMMAND sh -c "cp ${CMAKE_BINARY_DIR}/test/src/gtest_fieldstat_interface ${CMAKE_BINARY_DIR}/testing/")
-add_test(NAME COPY_GTEST_OUTPUT_BINARY COMMAND sh -c "cp ${CMAKE_BINARY_DIR}/test/src/gtest_fieldstat_output ${CMAKE_BINARY_DIR}/testing/")
+add_test(NAME COPY_GTEST_OUTPUT_BINARY COMMAND sh -c "cp ${CMAKE_BINARY_DIR}/test/src/gtest_fieldstat_counter_output ${CMAKE_BINARY_DIR}/testing/")
add_test(NAME COPY_GTEST_DYNAMIC_BINARY COMMAND sh -c "cp ${CMAKE_BINARY_DIR}/test/src/gtest_dynamic_fieldstat ${CMAKE_BINARY_DIR}/testing/")
add_test(NAME COPY_GTEST_DYNAMIC_OUTPUT_BINARY COMMAND sh -c "cp ${CMAKE_BINARY_DIR}/test/src/gtest_dynamic_fieldstat_output ${CMAKE_BINARY_DIR}/testing/")
add_test(NAME COPY_GTEST_OUTPUT_FILE_INSTANCE_BINARY COMMAND sh -c "cp ${CMAKE_BINARY_DIR}/test/src/gtest_fieldstat_output_file_instance ${CMAKE_BINARY_DIR}/testing/")
+add_test(NAME COPY_GTEST_OUTPUT_TOPK_BINARY COMMAND sh -c "cp ${CMAKE_BINARY_DIR}/test/src/gtest_fieldstat_topk ${CMAKE_BINARY_DIR}/testing/")
set(GTEST_RUN_DIR ${CMAKE_BINARY_DIR}/testing)
#add_test(NAME GTEST_RULE COMMAND gtest_rule WORKING_DIRECTORY ${GTEST_RUN_DIR})
add_test(NAME GTEST_FIELDSTAT_INTERFACE COMMAND gtest_fieldstat_interface WORKING_DIRECTORY ${GTEST_RUN_DIR})
-add_test(NAME GTEST_FIELDSTAT_OUTPUT COMMAND gtest_fieldstat_output WORKING_DIRECTORY ${GTEST_RUN_DIR})
+add_test(NAME GTEST_FIELDSTAT_OUTPUT COMMAND gtest_fieldstat_counter_output WORKING_DIRECTORY ${GTEST_RUN_DIR})
add_test(NAME GTEST_DYNAMIC_FIELDSTAT COMMAND gtest_dynamic_fieldstat WORKING_DIRECTORY ${GTEST_RUN_DIR})
add_test(NAME GTEST_DYNAMIC_FIELDSTAT_OUTPUT COMMAND gtest_dynamic_fieldstat_output WORKING_DIRECTORY ${GTEST_RUN_DIR})
add_test(NAME GTEST_FIELDSTAT_OUTPUT_FILE_INSTANCE COMMAND gtest_fieldstat_output_file_instance WORKING_DIRECTORY ${GTEST_RUN_DIR})
+add_test(NAME GTEST_FIELDSTAT_TOPK_OUTPUT COMMAND gtest_fieldstat_topk WORKING_DIRECTORY ${GTEST_RUN_DIR})
diff --git a/test/src/test_utils.cpp b/test/src/test_utils.cpp
index 207dcfe..5f082ad 100644
--- a/test/src/test_utils.cpp
+++ b/test/src/test_utils.cpp
@@ -178,8 +178,6 @@ std::string Heavy_keeper_tester::read_from_line_protocol(const char *output_file
return content;
}
-
-
std::string Heavy_keeper_tester::read_from_prometheus(const char *output_file_path, unsigned long portal)
{
int ret;