This is an automated email from the ASF dual-hosted git repository.
zhaoc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 6788cac Fix unit test failed (#3642)
6788cac is described below
commit 6788cacb9447f99b70da43bacbc288f530c947f0
Author: yangzhg <780531...@qq.com>
AuthorDate: Mon May 25 18:55:19 2020 +0800
Fix unit test failed (#3642)
Fix some unittest failed due to glog， this may be we change the ut build
dir，and the log path is not exist in new build dir， so we change the log from
file to stdout
---
be/test/agent/utils_test.cpp | 7 -------
be/test/olap/bloom_filter_index_test.cpp | 6 ------
be/test/olap/bloom_filter_test.cpp | 6 ------
be/test/olap/column_reader_test.cpp | 1 -
be/test/olap/comparison_predicate_test.cpp | 6 ------
be/test/olap/delta_writer_test.cpp | 1 -
be/test/runtime/memory_scratch_sink_test.cpp | 1 -
be/test/runtime/routine_load_task_executor_test.cpp | 6 ------
be/test/util/cidr_test.cpp | 6 ------
be/test/util/system_metrics_test.cpp | 6 ------
10 files changed, 46 deletions(-)
diff --git a/be/test/agent/utils_test.cpp b/be/test/agent/utils_test.cpp
index 36a0ab3..a1d0e06 100644
--- a/be/test/agent/utils_test.cpp
+++ b/be/test/agent/utils_test.cpp
@@ -38,13 +38,6 @@ TEST(AgentUtilsTest, Test) {
} // namespace doris
int main(int argc, char **argv) {
- std::string conffile = std::string(getenv("DORIS_HOME")) + "/conf/be.conf";
- if (!doris::config::init(conffile.c_str(), false)) {
- fprintf(stderr, "error read config file. \n");
- return -1;
- }
-
- doris::init_glog("be-test");
doris::BackendOptions::init();
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
diff --git a/be/test/olap/bloom_filter_index_test.cpp
b/be/test/olap/bloom_filter_index_test.cpp
index a2b651d..fc0ee78 100644
--- a/be/test/olap/bloom_filter_index_test.cpp
+++ b/be/test/olap/bloom_filter_index_test.cpp
@@ -105,12 +105,6 @@ TEST_F(TestBloomFilterIndex, abnormal_read) {
} // namespace doris
int main(int argc, char **argv) {
- std::string conffile = std::string(getenv("DORIS_HOME")) + "/conf/be.conf";
- if (!doris::config::init(conffile.c_str(), false)) {
- fprintf(stderr, "error read config file. \n");
- return -1;
- }
- doris::init_glog("be-test");
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}
diff --git a/be/test/olap/bloom_filter_test.cpp
b/be/test/olap/bloom_filter_test.cpp
index 0bfa51c..668a284 100644
--- a/be/test/olap/bloom_filter_test.cpp
+++ b/be/test/olap/bloom_filter_test.cpp
@@ -157,12 +157,6 @@ TEST_F(TestBloomFilter, bloom_filter_info) {
} // namespace doris
int main(int argc, char **argv) {
- std::string conffile = std::string(getenv("DORIS_HOME")) + "/conf/be.conf";
- if (!doris::config::init(conffile.c_str(), false)) {
- fprintf(stderr, "error read config file. \n");
- return -1;
- }
- doris::init_glog("be-test");
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}
diff --git a/be/test/olap/column_reader_test.cpp
b/be/test/olap/column_reader_test.cpp
index 0627b9c..8a8ac97 100644
--- a/be/test/olap/column_reader_test.cpp
+++ b/be/test/olap/column_reader_test.cpp
@@ -3016,7 +3016,6 @@ int main(int argc, char** argv) {
fprintf(stderr, "error read config file. \n");
return -1;
}
- doris::init_glog("be-test");
int ret = doris::OLAP_SUCCESS;
testing::InitGoogleTest(&argc, argv);
ret = RUN_ALL_TESTS();
diff --git a/be/test/olap/comparison_predicate_test.cpp
b/be/test/olap/comparison_predicate_test.cpp
index 2393a40..a2bd357 100644
--- a/be/test/olap/comparison_predicate_test.cpp
+++ b/be/test/olap/comparison_predicate_test.cpp
@@ -957,12 +957,6 @@ TEST_F(TestLessPredicate, DATETIME_COLUMN) {
} // namespace doris
int main(int argc, char** argv) {
- std::string conffile = std::string(getenv("DORIS_HOME")) + "/conf/be.conf";
- if (!doris::config::init(conffile.c_str(), false)) {
- fprintf(stderr, "error read config file. \n");
- return -1;
- }
- doris::init_glog("be-test");
int ret = doris::OLAP_SUCCESS;
testing::InitGoogleTest(&argc, argv);
doris::CpuInfo::init();
diff --git a/be/test/olap/delta_writer_test.cpp
b/be/test/olap/delta_writer_test.cpp
index 537433f..ac52ea9 100644
--- a/be/test/olap/delta_writer_test.cpp
+++ b/be/test/olap/delta_writer_test.cpp
@@ -452,7 +452,6 @@ int main(int argc, char** argv) {
fprintf(stderr, "error read config file. \n");
return -1;
}
- doris::init_glog("be-test");
int ret = doris::OLAP_SUCCESS;
testing::InitGoogleTest(&argc, argv);
doris::CpuInfo::init();
diff --git a/be/test/runtime/memory_scratch_sink_test.cpp
b/be/test/runtime/memory_scratch_sink_test.cpp
index 4a7df19..eaf602b 100644
--- a/be/test/runtime/memory_scratch_sink_test.cpp
+++ b/be/test/runtime/memory_scratch_sink_test.cpp
@@ -263,7 +263,6 @@ int main(int argc, char** argv) {
fprintf(stderr, "error read config file. \n");
return -1;
}
- doris::init_glog("be-test");
::testing::InitGoogleTest(&argc, argv);
doris::CpuInfo::init();
return RUN_ALL_TESTS();
diff --git a/be/test/runtime/routine_load_task_executor_test.cpp
b/be/test/runtime/routine_load_task_executor_test.cpp
index 6f50496..9aa2acf 100644
--- a/be/test/runtime/routine_load_task_executor_test.cpp
+++ b/be/test/runtime/routine_load_task_executor_test.cpp
@@ -122,12 +122,6 @@ TEST_F(RoutineLoadTaskExecutorTest, exec_task) {
} // end namespace
int main(int argc, char* argv[]) {
- std::string conffile = std::string(getenv("DORIS_HOME")) + "/conf/be.conf";
- if (!doris::config::init(conffile.c_str(), false)) {
- fprintf(stderr, "error read config file. \n");
- return -1;
- }
- doris::init_glog("be-test");
doris::CpuInfo::init();
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
diff --git a/be/test/util/cidr_test.cpp b/be/test/util/cidr_test.cpp
index 6b562d3..484d1aa 100644
--- a/be/test/util/cidr_test.cpp
+++ b/be/test/util/cidr_test.cpp
@@ -58,12 +58,6 @@ TEST(CIDR, contains) {
} // end namespace doris
int main(int argc, char** argv) {
- std::string conffile = std::string(getenv("DORIS_HOME")) + "/conf/be.conf";
- if (!doris::config::init(conffile.c_str(), false)) {
- fprintf(stderr, "error read config file. \n");
- return -1;
- }
- doris::init_glog("be-test");
::testing::InitGoogleTest(&argc, argv);
doris::CpuInfo::init();
return RUN_ALL_TESTS();
diff --git a/be/test/util/system_metrics_test.cpp
b/be/test/util/system_metrics_test.cpp
index fb54745..70e1d3e 100644
--- a/be/test/util/system_metrics_test.cpp
+++ b/be/test/util/system_metrics_test.cpp
@@ -287,12 +287,6 @@ TEST_F(SystemMetricsTest, no_proc_file) {
}
int main(int argc, char** argv) {
- std::string conffile = std::string(getenv("DORIS_HOME")) + "/conf/be.conf";
- if (!doris::config::init(conffile.c_str(), false)) {
- fprintf(stderr, "error read config file. \n");
- return -1;
- }
- doris::init_glog("be-test");
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
