commit cb417094c869812eff27d8fc36c13cddec71783f
author Mark Salyzyn <salyzyn@google.com> Fri Nov 04 20:00:38 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 04 20:00:38 2016 +0000
tree b2e0879bb7651d24bdce712569a6f80260a62175
parent ada8307ce6aeb8ad1c310b61f37440496b2c3eff
parent 38bc47f46086007477369d70c2fecff34c4a141e

Merge "libcutils: sockets_test breaks MAC build" am: 8d339e940f am: d32e7f4703 am: cca5e721b2
am: 067aa86b4f

Change-Id: I870e080a585dfe8077199808a07b838d1665f3f8

libcutils/tests/sockets_test.cpp

diff --git a/libcutils/tests/sockets_test.cpp b/libcutils/tests/sockets_test.cpp
index 82961a4..adfbf4a 100644
--- a/libcutils/tests/sockets_test.cpp
+++ b/libcutils/tests/sockets_test.cpp
@@ -190,8 +190,16 @@
     EXPECT_EQ(-1, socket_send_buffers(INVALID_SOCKET, nullptr, 0));
 }
 
+#ifndef SOCK_NONBLOCK
+#define SOCK_NONBLOCK 0
+#endif
+
+#ifndef SOCK_CLOEXEC
+#define SOCK_CLOEXEC 0
+#endif
+
 TEST(SocketsTest, android_get_control_socket) {
-    static const char key[] = ANDROID_SOCKET_ENV_PREFIX "SocketsTest.android_get_control_socket";
+    static const char key[] = ANDROID_SOCKET_ENV_PREFIX "SocketsTest_android_get_control_socket";
     static const char* name = key + strlen(ANDROID_SOCKET_ENV_PREFIX);
 
     EXPECT_EQ(unsetenv(key), 0);
@@ -199,6 +207,11 @@
 
     int fd;
     ASSERT_GE(fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0), 0);
+#ifdef F_GETFL
+    int flags;
+    ASSERT_GE(flags = fcntl(fd, F_GETFL), 0);
+    ASSERT_GE(fcntl(fd, F_SETFL, flags | O_NONBLOCK), 0);
+#endif
     EXPECT_EQ(android_get_control_socket(name), -1);
 
     struct sockaddr_un addr;