nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2817

Browse Source 
f493eabb unit_tests: fix running without --data-dir (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-11-25 19:52:33 +02:00
commit 64d301a7b0
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/unit_tests/main.cpp
View File

@ -52,7 +52,7 @@ 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", "", true};
const command_line::arg_descriptor<std::string> arg_data_dir = { "data-dir", "Data files directory" };
command_line::add_arg(desc_options, arg_data_dir, "");
po::variables_map vm;
@ -65,7 +65,7 @@ int main(int argc, char** argv)
if (! r)
return 1;
if (vm["data-dir"].defaulted())
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");