diff options
author | Riccardo Spagni <ric@spagni.net> | 2017-11-25 19:52:33 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2017-11-25 19:52:33 +0200 |
commit | 64d301a7b0a8a03b030295ee2960cc7de7494896 (patch) | |
tree | f9921639e1a1e7f624007d15dcda6039dee86879 | |
parent | Merge pull request #2807 (diff) | |
parent | unit_tests: fix running without --data-dir (diff) | |
download | monero-64d301a7b0a8a03b030295ee2960cc7de7494896.tar.xz |
Merge pull request #2817
f493eabb unit_tests: fix running without --data-dir (moneromooo-monero)
-rw-r--r-- | tests/unit_tests/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/unit_tests/main.cpp b/tests/unit_tests/main.cpp index 86e7bcef3..95ea67410 100644 --- a/tests/unit_tests/main.cpp +++ b/tests/unit_tests/main.cpp @@ -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"); |