ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libcutils: sockets_test breaks MAC build"

Browse source
This commit is contained in:
Mark Salyzyn 2016-11-04 19:43:47 +00:00 • committed by Gerrit Code Review
commit 8d339e940f
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libcutils/tests/sockets_test.cpp
View file

@ -190,8 +190,16 @@ TEST(SocketsTest, TestSocketSendBuffersFailure) {
EXPECT_EQ(-1, socket_send_buffers(INVALID_SOCKET, nullptr, 0)); 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) { 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); static const char* name = key + strlen(ANDROID_SOCKET_ENV_PREFIX);
EXPECT_EQ(unsetenv(key), 0); EXPECT_EQ(unsetenv(key), 0);
@ -199,6 +207,11 @@ TEST(SocketsTest, android_get_control_socket) {
int fd; int fd;
ASSERT_GE(fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0), 0); 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); EXPECT_EQ(android_get_control_socket(name), -1);
struct sockaddr_un addr; struct sockaddr_un addr;