monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 08:17:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4424

Browse source 
92d1da28 unit_tests: fix build with GCC 5.4.0 on ubuntu (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-09-29 22:11:50 +02:00
commit 3d8f54daad
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/unit_tests/is_hdd.cpp
View file

@ -6,12 +6,12 @@
TEST(is_hdd, linux_os_root) TEST(is_hdd, linux_os_root)
{ {
std::string path = "/"; std::string path = "/";
EXPECT_TRUE(tools::is_hdd(path.c_str())); EXPECT_TRUE(tools::is_hdd(path.c_str()) != boost::none);
} }
#else #else
TEST(is_hdd, unknown_os) TEST(is_hdd, unknown_os)
{ {
std::string path = ""; std::string path = "";
EXPECT_FALSE(tools::is_hdd(path.c_str())); EXPECT_FALSE(tools::is_hdd(path.c_str()) != boost::none);
} }
#endif #endif

8
tests/unit_tests/wipeable_string.cpp
View file

@ -194,13 +194,13 @@ TEST(wipeable_string, parse_hexstr)
ASSERT_EQ(boost::none, epee::wipeable_string("0").parse_hexstr()); ASSERT_EQ(boost::none, epee::wipeable_string("0").parse_hexstr());
ASSERT_EQ(boost::none, epee::wipeable_string("000").parse_hexstr()); ASSERT_EQ(boost::none, epee::wipeable_string("000").parse_hexstr());
ASSERT_TRUE((s = epee::wipeable_string("").parse_hexstr())); ASSERT_TRUE((s = epee::wipeable_string("").parse_hexstr()) != boost::none);
ASSERT_EQ(*s, ""); ASSERT_EQ(*s, "");
ASSERT_TRUE((s = epee::wipeable_string("00").parse_hexstr())); ASSERT_TRUE((s = epee::wipeable_string("00").parse_hexstr()) != boost::none);
ASSERT_EQ(*s, epee::wipeable_string("", 1)); ASSERT_EQ(*s, epee::wipeable_string("", 1));
ASSERT_TRUE((s = epee::wipeable_string("41").parse_hexstr())); ASSERT_TRUE((s = epee::wipeable_string("41").parse_hexstr()) != boost::none);
ASSERT_EQ(*s, epee::wipeable_string("A")); ASSERT_EQ(*s, epee::wipeable_string("A"));
ASSERT_TRUE((s = epee::wipeable_string("414243").parse_hexstr())); ASSERT_TRUE((s = epee::wipeable_string("414243").parse_hexstr()) != boost::none);
ASSERT_EQ(*s, epee::wipeable_string("ABC")); ASSERT_EQ(*s, epee::wipeable_string("ABC"));
} }