Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

unit tests: fix running from pwd and auto test selected location

Browse Source
This commit is contained in:
jeffro256 2023-10-28 03:14:05 -05:00
parent 053ba2cf07
commit 504269e6cf
No known key found for this signature in database
GPG Key ID: 6F79797A6E392442
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/CMakeLists.txt
View File

@ -32,7 +32,7 @@ set(MONERO_WALLET_CRYPTO_BENCH "auto" CACHE STRING "Select wallet crypto librari
# The docs say this only affects grouping in IDEs # The docs say this only affects grouping in IDEs
set(folder "tests") set(folder "tests")
set(TEST_DATA_DIR "${CMAKE_CURRENT_LIST_DIR}/data") set(TEST_DATA_DIR "${CMAKE_CURRENT_BINARY_DIR}/data")
if (WIN32 AND STATIC) if (WIN32 AND STATIC)
add_definitions(-DSTATICLIB) add_definitions(-DSTATICLIB)

2
tests/unit_tests/main.cpp
View File

@ -63,7 +63,7 @@ int main(int argc, char** argv)
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);
// the default test data directory is ../data (relative to the executable's directory) // the default test data directory is ../data (relative to the executable's directory)
const auto default_test_data_dir = boost::filesystem::path(argv[0]).parent_path().parent_path() / "data"; const auto default_test_data_dir = boost::filesystem::canonical(argv[0]).parent_path().parent_path() / "data";
po::options_description desc_options("Command line options"); po::options_description desc_options("Command line options");
const command_line::arg_descriptor<std::string> arg_data_dir = { "data-dir", "Data files directory", default_test_data_dir.string() }; const command_line::arg_descriptor<std::string> arg_data_dir = { "data-dir", "Data files directory", default_test_data_dir.string() };