Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1670)

Unified Diff: native_client_sdk/src/tests/nacl_io_test/host_resolver_test.cc

Issue 275533002: Handle h_addr in a more libc independent way. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: native_client_sdk/src/tests/nacl_io_test/host_resolver_test.cc
diff --git a/native_client_sdk/src/tests/nacl_io_test/host_resolver_test.cc b/native_client_sdk/src/tests/nacl_io_test/host_resolver_test.cc
index b5810c017af9d16266db5b4a91e0c328837d6d9f..ec196ff936f01633d984eb92193d467d0f6df9c7 100644
--- a/native_client_sdk/src/tests/nacl_io_test/host_resolver_test.cc
+++ b/native_client_sdk/src/tests/nacl_io_test/host_resolver_test.cc
@@ -321,8 +321,12 @@ TEST_F(FakeHostResolverTest, Gethostbyname) {
in_addr_t** addr_list = reinterpret_cast<in_addr_t**>(host->h_addr_list);
ASSERT_NE(reinterpret_cast<in_addr_t**>(NULL), addr_list);
ASSERT_EQ(NULL, addr_list[1]);
- in_addr_t exptected_addr = htonl(FAKE_IP);
- ASSERT_EQ(exptected_addr, *addr_list[0]);
+ in_addr_t expected_addr = htonl(FAKE_IP);
+ ASSERT_EQ(expected_addr, *addr_list[0]);
+ // Check that h_addr also matches as in some libc's it may be a separate
+ // member.
+ in_addr_t* first_addr = reinterpret_cast<in_addr_t*>(host->h_addr);
+ ASSERT_EQ(expected_addr, *first_addr);
}
TEST_F(FakeHostResolverTest, Gethostbyname_Failure) {
@@ -346,6 +350,10 @@ TEST_F(HostResolverTest, Gethostbyname_Numeric) {
ASSERT_NE(reinterpret_cast<in_addr_t**>(NULL), addr_list);
ASSERT_EQ(NULL, addr_list[1]);
ASSERT_EQ(inet_addr("8.8.8.8"), *addr_list[0]);
+ // Check that h_addr also matches as in some libc's it may be a separate
+ // member.
+ in_addr_t* first_addr = reinterpret_cast<in_addr_t*>(host->h_addr);
+ ASSERT_EQ(inet_addr("8.8.8.8"), *first_addr);
}
// These utility functions are only used for newlib (glibc provides its own

Powered by Google App Engine
This is Rietveld 408576698