diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-15 14:56:09 -0500 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-15 14:56:10 -0500 |
| commit | c5be70eab49c4fbee11f0f7d3b95df36d45ae186 (patch) | |
| tree | 6397e6124470c9e9f655566964905617782cda13 /tests/unit_tests | |
| parent | Merge pull request #1574 (diff) | |
| parent | unit_tests: fix portable serialization tests hardcoded data path (diff) | |
| download | monero-c5be70eab49c4fbee11f0f7d3b95df36d45ae186.tar.xz | |
Merge pull request #1575
b3ca0c62 unit_tests: fix portable serialization tests hardcoded data path (moneromooo-monero)
Diffstat (limited to 'tests/unit_tests')
| -rw-r--r-- | tests/unit_tests/main.cpp | 1 | ||||
| -rw-r--r-- | tests/unit_tests/serialization.cpp | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/unit_tests/main.cpp b/tests/unit_tests/main.cpp index faaf9475a..856e81857 100644 --- a/tests/unit_tests/main.cpp +++ b/tests/unit_tests/main.cpp @@ -34,6 +34,7 @@ int main(int argc, char** argv) { + epee::string_tools::set_module_name_and_folder(argv[0]); epee::debug::get_set_enable_assert(true, false); ::testing::InitGoogleTest(&argc, argv); diff --git a/tests/unit_tests/serialization.cpp b/tests/unit_tests/serialization.cpp index 2be7bde8c..1083dd4cc 100644 --- a/tests/unit_tests/serialization.cpp +++ b/tests/unit_tests/serialization.cpp @@ -657,7 +657,7 @@ TEST(Serialization, portability_wallet) const bool testnet = true; const bool restricted = false; tools::wallet2 w(testnet, restricted); - string wallet_file = "../data/wallet_9svHk1"; + string wallet_file = epee::string_tools::get_current_module_folder() + "/../../../../tests/data/wallet_9svHk1"; string password = "test"; bool r = false; try @@ -777,7 +777,7 @@ TEST(Serialization, portability_wallet) TEST(Serialization, portability_outputs) { // read file - const std::string filename = "../data/outputs"; + const std::string filename = epee::string_tools::get_current_module_folder() + "/../../../../tests/data/outputs"; std::string data; bool r = epee::file_io_utils::load_file_to_string(filename, data); ASSERT_TRUE(r); @@ -892,7 +892,7 @@ TEST(Serialization, portability_outputs) #define UNSIGNED_TX_PREFIX "Monero unsigned tx set\003" TEST(Serialization, portability_unsigned_tx) { - const string filename = "../data/unsigned_monero_tx"; + const string filename = epee::string_tools::get_current_module_folder() + "/../../../../tests/data/unsigned_monero_tx"; std::string s; const bool testnet = true; bool r = epee::file_io_utils::load_file_to_string(filename, s); @@ -1042,7 +1042,7 @@ TEST(Serialization, portability_unsigned_tx) #define SIGNED_TX_PREFIX "Monero signed tx set\003" TEST(Serialization, portability_signed_tx) { - const string filename = "../data/signed_monero_tx"; + const string filename = epee::string_tools::get_current_module_folder() + "/../../../../tests/data/signed_monero_tx"; const bool testnet = true; std::string s; bool r = epee::file_io_utils::load_file_to_string(filename, s); |