diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2023-11-06 09:35:11 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2023-11-06 09:35:11 -0500 |
| commit | cab0ebdeb5c25cdbb9d6f242ecff92233a4bd412 (patch) | |
| tree | af470630c7c885b0f0d9b421896e7a3cbde28449 | |
| parent | Merge pull request #9044 (diff) | |
| parent | unit tests: fix running from pwd and auto test selected location (diff) | |
| download | monero-cab0ebdeb5c25cdbb9d6f242ecff92233a4bd412.tar.xz | |
Merge pull request #9045
504269e unit tests: fix running from pwd and auto test selected location (jeffro256)
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/unit_tests/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 00896818c..736872b04 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -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 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) add_definitions(-DSTATICLIB) diff --git a/tests/unit_tests/main.cpp b/tests/unit_tests/main.cpp index 586cb7c60..4094d79b7 100644 --- a/tests/unit_tests/main.cpp +++ b/tests/unit_tests/main.cpp @@ -63,7 +63,7 @@ int main(int argc, char** argv) ::testing::InitGoogleTest(&argc, argv); // 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"); const command_line::arg_descriptor<std::string> arg_data_dir = { "data-dir", "Data files directory", default_test_data_dir.string() }; |