MS-98 Install unit test to installation directory

Former-commit-id: 26e87924a3a67cf766e471af5d7ee4b84de1b191
This commit is contained in:
jinhai 2019-06-19 15:46:14 +08:00
parent be11f16542
commit 6c836b451f
11 changed files with 20 additions and 26 deletions

View File

@ -15,6 +15,7 @@ Please mark all change in change log and use the ticket from JIRA.
- MS-77 - Performance issue of post-search action
- MS-22 - Enhancement for MemVector size control
- MS-92 - Unify behavior of debug and release build
- MS-98 - Install all unit test to installation directory
## New Feature

View File

@ -152,7 +152,6 @@ add_executable(milvus_server
${utils_files}
${service_files}
${metrics_files}
#${EASYLOGGINGPP_INCLUDE_DIR}/easylogging++.cc
)
if (ENABLE_LICENSE STREQUAL "ON")
@ -175,11 +174,3 @@ endif ()
install(TARGETS milvus_server DESTINATION bin)
add_subdirectory(sdk)
#target_link_libraries(
# libprometheus-cpp-push.a
# libprometheus-cpp-pull.a
# libprometheus-cpp-core.a
# pthread
# z
# ${CURL_LIBRARIES})

View File

@ -31,3 +31,5 @@ target_link_libraries(milvus_sdk
)
add_subdirectory(examples)
install(TARGETS milvus_sdk DESTINATION bin)

View File

@ -20,3 +20,5 @@ target_link_libraries(sdk_simple
milvus_sdk
pthread
)
install(TARGETS sdk_simple DESTINATION bin)

View File

@ -29,7 +29,7 @@ set(db_test_src
cuda_add_executable(db_test ${db_test_src})
set(db_libs
gpufaiss
libgpufaiss.a
faiss
cudart
cublas
@ -40,3 +40,5 @@ set(db_libs
)
target_link_libraries(db_test ${db_libs} ${unittest_libs})
install(TARGETS db_test DESTINATION bin)

View File

@ -24,7 +24,7 @@ set(wrapper_libs
stdc++
boost_system
boost_filesystem
gpufaiss
libgpufaiss.a
faiss
cudart
cublas
@ -41,5 +41,4 @@ set(topk_test_src
topk_test.cpp
${CMAKE_SOURCE_DIR}/src/wrapper/gpu/Topk.cu)
#cuda_add_executable(topk_test ${topk_test_src})
#target_link_libraries(topk_test ${unittest_libs} ${faiss_libs})
install(TARGETS wrapper_test DESTINATION bin)

View File

@ -15,12 +15,6 @@ INITIALIZE_EASYLOGGINGPP
using namespace zilliz::milvus;
int main(int argc, char **argv) {
std::string exe_path = server::CommonUtil::GetExePath();
std::string config_filename = exe_path + "/../../../conf/server_config.yaml";
zilliz::milvus::server::ServerConfig& config = zilliz::milvus::server::ServerConfig::GetInstance();
config.LoadConfigFile(config_filename);
std::cout << "Load config file form: " << config_filename << std::endl;
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}

View File

@ -55,7 +55,7 @@ set(count_test_src
add_executable(metrics_test ${count_test_src} ${require_files} )
target_link_libraries(metrics_test
gpufaiss
libgpufaiss.a
faiss
cudart
cublas
@ -65,10 +65,9 @@ target_link_libraries(metrics_test
lz4
metrics
gtest
# prometheus-cpp-pull
# prometheus-cpp-push
# prometheus-cpp-core
pthread
z
${unittest_libs}
)
)
install(TARGETS metrics_test DESTINATION bin)

View File

@ -31,7 +31,7 @@ cuda_add_executable(server_test
set(require_libs
stdc++
gpufaiss
libgpufaiss.a
faiss
cudart
cublas
@ -51,3 +51,5 @@ target_link_libraries(server_test
${cuda_library}
${unittest_libs}
)
install(TARGETS server_test DESTINATION bin)

View File

@ -13,7 +13,7 @@ set(s3_client_test_src
${unittest_srcs}
${s3_client_src}
${require_files}
s3_client_test.cpp
S3ClientTest.cpp
${MILVUS_ENGINE_SRC}/db/Status.cpp
)
@ -35,3 +35,5 @@ target_link_libraries(s3_test
${unittest_libs}
curl
crypto)
install(TARGETS s3_test DESTINATION bin)