commit b19fcc7c65e9715d85a40ac3c6c044a395e8b6fe
author Pierre Imai <imaipi@google.com> Fri Mar 11 17:54:48 2016 +0900
committer Pierre Imai <imaipi@google.com> Mon Mar 14 12:06:58 2016 +0900
tree 0032c52269f413fcaab141c404d4dc8c0f5a17c9
parent 492ca5bca129186b53f203386ebe3e28f9143c9e

Fix netd tests for use with APCT

Change-Id: Ica37a812c37036ffecd45b8f078d8ed9928d01fc

server/Android.mk

diff --git a/server/Android.mk b/server/Android.mk
index 270a722..799bbf1 100644
--- a/server/Android.mk
+++ b/server/Android.mk
@@ -120,20 +120,11 @@
 ### netd unit tests.
 ###
 include $(CLEAR_VARS)
-LOCAL_MODULE := FirewallControllerTest
+LOCAL_MODULE := netd_unit_test
 LOCAL_CFLAGS := -Wall -Werror -Wunused-parameter
 LOCAL_C_INCLUDES := system/netd/server
-LOCAL_SRC_FILES := FirewallControllerTest.cpp FirewallController.cpp
+LOCAL_SRC_FILES := FirewallControllerTest.cpp FirewallController.cpp SockDiagTest.cpp SockDiag.cpp
 LOCAL_MODULE_TAGS := tests
 LOCAL_SHARED_LIBRARIES := liblog libbase
 include $(BUILD_NATIVE_TEST)
 
-# Unit tests for SockDiag.cpp.
-include $(CLEAR_VARS)
-LOCAL_MODULE := SockDiagTest
-LOCAL_CFLAGS := -Wall -Werror -Wunused-parameter
-LOCAL_C_INCLUDES := system/netd/server
-LOCAL_SRC_FILES := SockDiagTest.cpp SockDiag.cpp
-LOCAL_MODULE_TAGS := tests
-LOCAL_SHARED_LIBRARIES := liblog
-include $(BUILD_NATIVE_TEST)

server/SockDiagTest.cpp

diff --git a/server/SockDiagTest.cpp b/server/SockDiagTest.cpp
index 8ee9908..5c7f661 100644
--- a/server/SockDiagTest.cpp
+++ b/server/SockDiagTest.cpp
@@ -66,11 +66,11 @@
 
 TEST_F(SockDiagTest, TestDump) {
     int v4socket = socket(AF_INET, SOCK_STREAM, 0);
+    ASSERT_NE(-1, v4socket) << "Failed to open IPv4 socket: " << strerror(errno);
     int v6socket = socket(AF_INET6, SOCK_STREAM, 0);
+    ASSERT_NE(-1, v6socket) << "Failed to open IPv6 socket: " << strerror(errno);
     int listensocket = socket(AF_INET6, SOCK_STREAM, 0);
-    ASSERT_NE(-1, v4socket) << "Failed to open IPv4 socket";
-    ASSERT_NE(-1, v6socket) << "Failed to open IPv6 socket";
-    ASSERT_NE(-1, listensocket) << "Failed to open listen socket";
+    ASSERT_NE(-1, listensocket) << "Failed to open listen socket: " << strerror(errno);
 
     uint16_t port = bindAndListen(listensocket);
     ASSERT_NE(0, port) << "Can't bind to server port";