From 025b5528c8a83e6dc9ee58578592bc8b16b6dbb6 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 26 Jan 2019 18:55:39 +0100 Subject: [PATCH] nonblocking-socket-tests: Fix test failure on Android 4.3. * tests/test-nonblocking-socket.h (SOCKET_HAS_LARGE_BUFFER): Define to 1 also on Android. --- ChangeLog | 6 ++++++ tests/test-nonblocking-socket.h | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bf405663ec..2712e65d71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2019-01-26 Bruno Haible + nonblocking-socket-tests: Fix test failure on Android 4.3. + * tests/test-nonblocking-socket.h (SOCKET_HAS_LARGE_BUFFER): Define to 1 + also on Android. + +2019-01-26 Bruno Haible + sh-filename: Add support for Android 4.3. * m4/sh-filename.m4 (gl_SH_FILENAME): Set to "sh" on Android. diff --git a/tests/test-nonblocking-socket.h b/tests/test-nonblocking-socket.h index f0493006db..c3f9f54e5b 100644 --- a/tests/test-nonblocking-socket.h +++ b/tests/test-nonblocking-socket.h @@ -21,6 +21,7 @@ Platform SOCKET_DATA_BLOCK_SIZE Linux >= 7350000 (depends on circumstances) + Linux/Android >= 1700000 (approx.) FreeBSD >= 107521 OpenBSD >= 106430 (depends on circumstances) Mac OS X >= 680000 (depends on circumstances) @@ -44,7 +45,7 @@ sockets have very large buffers in the kernel, so that write() calls succeed before the reader has started reading, even if fd is blocking and the amount of data is larger than 1 MB. */ -#if defined __linux__ || (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __CYGWIN__ +#if defined __linux__ || defined __ANDROID__ || (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __CYGWIN__ # define SOCKET_HAS_LARGE_BUFFER 1 #else # define SOCKET_HAS_LARGE_BUFFER 0 -- 2.11.4.GIT