changeset 40142:ba80f688c0e7

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.
author Bruno Haible <bruno@clisp.org>
date Sat, 26 Jan 2019 18:55:39 +0100
parents 449e6729b53f
children 648fa64e008c
files ChangeLog tests/test-nonblocking-socket.h
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Jan 26 15:40:31 2019 +0100
+++ b/ChangeLog	Sat Jan 26 18:55:39 2019 +0100
@@ -1,3 +1,9 @@
+2019-01-26  Bruno Haible  <bruno@clisp.org>
+
+	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  <bruno@clisp.org>
 
 	sh-filename: Add support for Android 4.3.
--- a/tests/test-nonblocking-socket.h	Sat Jan 26 15:40:31 2019 +0100
+++ b/tests/test-nonblocking-socket.h	Sat Jan 26 18:55:39 2019 +0100
@@ -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