aboutsummaryrefslogtreecommitdiff
path: root/tests/unit_tests/main.cpp
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-05-15 20:38:27 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-05-15 21:45:34 +0100
commitb88c9a003e2a6643fd41a4eb70fb9b9460b75a97 (patch)
tree35fc7c5c55d1c7bd416fd8dd6750009bef94c4cf /tests/unit_tests/main.cpp
parentMerge pull request #3775 (diff)
downloadmonero-b88c9a003e2a6643fd41a4eb70fb9b9460b75a97.tar.xz
unit_tests: set default data dir to the source tree at build time
Diffstat (limited to '')
-rw-r--r--tests/unit_tests/main.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/unit_tests/main.cpp b/tests/unit_tests/main.cpp
index 85c6cbed5..13b62cbb4 100644
--- a/tests/unit_tests/main.cpp
+++ b/tests/unit_tests/main.cpp
@@ -61,8 +61,8 @@ int main(int argc, char** argv)
::testing::InitGoogleTest(&argc, argv);
po::options_description desc_options("Command line options");
- const command_line::arg_descriptor<std::string> arg_data_dir = { "data-dir", "Data files directory" };
- command_line::add_arg(desc_options, arg_data_dir, "");
+ const command_line::arg_descriptor<std::string> arg_data_dir = { "data-dir", "Data files directory", DEFAULT_DATA_DIR };
+ command_line::add_arg(desc_options, arg_data_dir);
po::variables_map vm;
bool r = command_line::handle_error_helper(desc_options, [&]()
@@ -74,12 +74,7 @@ int main(int argc, char** argv)
if (! r)
return 1;
- if (command_line::is_arg_defaulted(vm, arg_data_dir))
- unit_test::data_dir = boost::filesystem::canonical(boost::filesystem::path(epee::string_tools::get_current_module_folder()))
- .parent_path().parent_path().parent_path().parent_path()
- .append("tests").append("data");
- else
- unit_test::data_dir = command_line::get_arg(vm, arg_data_dir);
+ unit_test::data_dir = command_line::get_arg(vm, arg_data_dir);
return RUN_ALL_TESTS();
}