From d236fbed3338996fd6ed7791178f5c1972864b50 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Wed, 23 Dec 2020 19:37:12 -0800 Subject: android: fix socket module, failing tests. * socket.c: Add missing #include . * tests/017/glob-carray.tl, tests/017/glob-zarray.tl: Use same definition for struct glob as Cygwin. Both are of BSD origin. * tests/017/realpath.tl: Do not test on Android. * tests/common.tl (os-symbol): Detect Android and return :android. (libc): Handle :android. --- tests/common.tl | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'tests/common.tl') diff --git a/tests/common.tl b/tests/common.tl index 3eef8d31..cdfc6c6a 100644 --- a/tests/common.tl +++ b/tests/common.tl @@ -24,16 +24,18 @@ ^(progn ,*(mapcar (op cons 'test) (tuples 2 pairs)))) (defun os-symbol () - (let ((u (uname))) - [(orf (iff (f^ #/Linux/) (ret :linux)) - (iff (f^ #/SunOS/) (ret :solaris)) - (iff (f^ #/CYGWIN/) (ret :cygwin)) - (iff (f^ #/CYGNAL/) (ret :cygnal)) - (iff (f^ #/Darwin/) (ret :macos)) - (ret :unknown)) - u.sysname])) + (if (ignerr (dlsym (dlopen "libandroid.so") "AAsset_close")) + :android + (let ((u (uname))) + [(orf (iff (f^ #/Linux/) (ret :linux)) + (iff (f^ #/SunOS/) (ret :solaris)) + (iff (f^ #/CYGWIN/) (ret :cygwin)) + (iff (f^ #/CYGNAL/) (ret :cygnal)) + (iff (f^ #/Darwin/) (ret :macos)) + (ret :unknown)) + u.sysname]))) (defun libc () (caseql (os-symbol) - ((:linux :solaris :macos) (dlopen nil)) + ((:linux :solaris :macos :android) (dlopen nil)) ((:cygwin) (dlopen "cygwin1.dll")))) -- cgit v1.2.3