Merge branch 'branch-0.4.0' into 'branch-0.4.0'

MS-471 code coverage run failed

See merge request megasearch/milvus!477

Former-commit-id: 2d61f481c77acd95be9a9ffc71712ac89fc2e0ac
This commit is contained in:
peng.xu 2019-09-04 15:02:58 +08:00
commit 7b5482290a
2 changed files with 6 additions and 6 deletions

View File

@ -94,6 +94,7 @@ ${LCOV_CMD} -r "${FILE_INFO_OUTPUT}" -o "${FILE_INFO_OUTPUT_NEW}" \
"/usr/*" \
"*/boost/*" \
"*/cmake_build/*_ep-prefix/*" \
"src/core/cmake_build*" \
# gen html report
${LCOV_GEN_CMD} "${FILE_INFO_OUTPUT_NEW}" --output-directory ${DIR_LCOV_OUTPUT}/

View File

@ -125,12 +125,11 @@ zilliz::milvus::engine::DBMetaOptions MySQLTest::getDBMetaOptions() {
zilliz::milvus::engine::Options MySQLDBTest::GetOptions() {
auto options = engine::OptionsFactory::Build();
options.meta.path = "/tmp/milvus_test";
// options.meta.backend_uri = DBTestEnvironment::getURI();
//
// if(options.meta.backend_uri.empty()) {
// options.meta.backend_uri = "mysql://root:Fantast1c@192.168.1.194:3306/";
// }
options.meta.backend_uri = "mysql://root:Fantast1c@192.168.1.194:3306/";
options.meta.backend_uri = DBTestEnvironment::getURI();
if(options.meta.backend_uri.empty()) {
options.meta.backend_uri = "mysql://root:Fantast1c@192.168.1.194:3306/";
}
return options;
}