aboutsummaryrefslogtreecommitdiff
path: root/tests/net_load_tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests/net_load_tests')
-rw-r--r--tests/net_load_tests/CMakeLists.txt4
-rw-r--r--tests/net_load_tests/clt.cpp7
-rw-r--r--tests/net_load_tests/srv.cpp4
3 files changed, 4 insertions, 11 deletions
diff --git a/tests/net_load_tests/CMakeLists.txt b/tests/net_load_tests/CMakeLists.txt
index 58f9cc5af..4db44f25a 100644
--- a/tests/net_load_tests/CMakeLists.txt
+++ b/tests/net_load_tests/CMakeLists.txt
@@ -37,9 +37,9 @@ add_executable(net_load_tests_clt
${clt_headers})
target_link_libraries(net_load_tests_clt
PRIVATE
- otshell_utils
p2p
cryptonote_core
+ epee
${GTEST_LIBRARIES}
${Boost_CHRONO_LIBRARY}
${Boost_DATE_TIME_LIBRARY}
@@ -58,9 +58,9 @@ add_executable(net_load_tests_srv
${srv_headers})
target_link_libraries(net_load_tests_srv
PRIVATE
- otshell_utils
p2p
cryptonote_core
+ epee
${GTEST_LIBRARIES}
${Boost_CHRONO_LIBRARY}
${Boost_DATE_TIME_LIBRARY}
diff --git a/tests/net_load_tests/clt.cpp b/tests/net_load_tests/clt.cpp
index 56089a4da..ed0a297fd 100644
--- a/tests/net_load_tests/clt.cpp
+++ b/tests/net_load_tests/clt.cpp
@@ -44,10 +44,7 @@
#include "net_load_tests.h"
-#include "../../contrib/otshell_utils/utils.hpp"
-
using namespace net_load_tests;
-using namespace nOT::nUtils;
namespace
{
@@ -632,10 +629,8 @@ int main(int argc, char** argv)
{
epee::debug::get_set_enable_assert(true, false);
//set up logging options
- epee::log_space::get_set_log_detalisation_level(true, LOG_LEVEL_0);
- epee::log_space::log_singletone::add_logger(LOGGER_CONSOLE, NULL, NULL);
+ mlog_configure(mlog_get_default_log_path("core_tests.log"), true);
::testing::InitGoogleTest(&argc, argv);
- epee::net_utils::data_logger::get_instance().kill_instance();
return RUN_ALL_TESTS();
}
diff --git a/tests/net_load_tests/srv.cpp b/tests/net_load_tests/srv.cpp
index d8d3eae2e..ffa88d290 100644
--- a/tests/net_load_tests/srv.cpp
+++ b/tests/net_load_tests/srv.cpp
@@ -216,8 +216,7 @@ namespace
int main(int argc, char** argv)
{
//set up logging options
- epee::log_space::get_set_log_detalisation_level(true, LOG_LEVEL_0);
- epee::log_space::log_singletone::add_logger(LOGGER_CONSOLE, NULL, NULL);
+ mlog_configure(mlog_get_default_log_path("core_tests.log"), true);
size_t thread_count = (std::max)(min_thread_count, std::thread::hardware_concurrency() / 2);
@@ -232,6 +231,5 @@ int main(int argc, char** argv)
if (!tcp_server.run_server(thread_count, true))
return 2;
- epee::net_utils::data_logger::get_instance().kill_instance();
return 0;
}