From e67e0329fac58e5dfbf2d3492b0ff6d0e8e7b3cc Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Mon, 5 Aug 2013 21:45:30 +1000 Subject: [PATCH] Remove dependency on system netlibs for ip test --- test/Makefile.am | 3 ++- test/ip.cpp | 19 ------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 688ad278..53640bb7 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -25,8 +25,9 @@ TEST_BIN = \ AM_DEFAULT_SOURCE_EXT = .cpp LDADD = $(builddir)/../libutil.la +if PLATFORM_WIN32 hton_LDFLAGS = -lws2_32 -ip_LDFLAGS = -lws2_32 +endif TESTS = $(TEST_BIN) json.pl check_PROGRAMS = $(TEST_BIN) diff --git a/test/ip.cpp b/test/ip.cpp index d9ae5b8a..90cc9300 100644 --- a/test/ip.cpp +++ b/test/ip.cpp @@ -7,13 +7,6 @@ #include -#if defined(PLATFORM_WIN32) - #include -#else - #include -#endif - - using namespace std; @@ -31,18 +24,6 @@ main (int, char **) { for (unsigned int i = 0; i < elems (data); ++i) { ipv4::ip parsed (ipv4::ip::parse (data[i].str)); CHECK_HARD (parsed == data[i].ip); - - uint32_t mine = *(uint32_t*)(parsed.m_octets); - - struct addrinfo *theirs; - - int err = getaddrinfo (data[i].str, nullptr, nullptr, &theirs); - CHECK_EQ (err, 0); - - CHECK_EQ (mine, reinterpret_cast (theirs)->sin_addr.s_addr); - - //CHECK_HARD (inet_pton (AF_INET, data[i].str, &theirs) == 1); - //CHECK_HARD (theirs == mine); } return EXIT_SUCCESS;