android: exclude tests which don't build

Steven Jackson · metan-ucw · commit 34a7c82a7abd · 2017-01-31T10:38:42.000+01:00
Android's NDK is missing many features.

It implements s subset of libpthread and librt, but they'res contained
in libc. Rather than forcing existing and future tests to use a
conditional or variable to add -lpthread I've just created a stub
library.

Tests which don't work have been filtered out based on $(ANDROID) being
set, eventually they should be filtered via autotools checks. In most
cases I've excluded entire directories when only a few tests fail, it's
going to take time to go through them all and the patch would touch too
much of the code base in one go.

Signed-off-by: Steven Jackson &lt;sj@oscode.net&gt;
Acked-by: Cyril Hrubis &lt;chrubis@suse.cz&gt;
diff --git a/INSTALL b/INSTALL
@@ -250,6 +250,13 @@ uClinux Users
 Specify UCLINUX=1 when calling make; -DUCLINUX=1 use is deprecated and highly
 discouraged.
 
+Android Users
+-------------
+Specify ANDROID=1 when calling make. Many tests which would otherwise work are
+currently not built because they share a directory with an incompatible test.
+
+The shell scripts expect /bin/sh to exist, so create a symlink.
+
 Variables in Makefile
 ----------------------
 
diff --git a/include/mk/env_post.mk b/include/mk/env_post.mk
@@ -41,6 +41,15 @@ ifeq ($(UCLINUX),1)
 CPPFLAGS			+= -D__UCLIBC__ -DUCLINUX
 endif
 
+ifeq ($(ANDROID),1)
+# There are many undeclared functions, it's best not to accidentally overlook
+# them.
+CFLAGS				+= -Werror-implicit-function-declaration
+
+LDFLAGS				+= -L$(top_builddir)/lib/android_libpthread
+LDFLAGS				+= -L$(top_builddir)/lib/android_librt
+endif
+
 MAKE_TARGETS			?= $(notdir $(patsubst %.c,%,$(wildcard $(abs_srcdir)/*.c)))
 
 MAKE_TARGETS			:= $(filter-out $(FILTER_OUT_MAKE_TARGETS),$(MAKE_TARGETS))
diff --git a/lib/Makefile b/lib/Makefile
@@ -26,6 +26,12 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 CFLAGS			+= -I.
 
+ifneq ($(ANDROID),1)
+FILTER_OUT_DIRS		+= android_libpthread android_librt
+else
+FILTER_OUT_LIBSRCS	+= tlibio.c tst_path_has_mnt_flags.c
+endif
+
 LIB			:= libltp.a
 
 pc_file			:= $(DESTDIR)/$(datarootdir)/pkgconfig/ltp.pc
diff --git a/lib/newlib_tests/Makefile b/lib/newlib_tests/Makefile
@@ -8,4 +8,9 @@ LDLIBS			+= -lltp
 test08: CFLAGS+=-pthread
 test09: CFLAGS+=-pthread
 
+ifeq ($(ANDROID),1)
+FILTER_OUT_MAKE_TARGETS	+= test08
+endif
+
+
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/lib/tst_res.c b/lib/tst_res.c
@@ -80,6 +80,10 @@ int TEST_ERRNO;
 	assert(strlen(buf) > 0);		\
 } while (0)
 
+#if defined(__ANDROID__) && !defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
+#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
+#endif
+
 static pthread_mutex_t tmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
 
 static void check_env(void);
diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile
@@ -61,6 +61,11 @@ endif
 
 endif
 
+ifeq ($(ANDROID),1)
+FILTER_OUT_DIRS		+= containers controllers device-drivers fs io ipc mem \
+				sched security timers
+endif
+
 MAKE_DEPS		:= include/linux_syscall_numbers.h
 
 include:
diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile
@@ -33,4 +33,16 @@ ifeq ($(UCLIBC),1)
 FILTER_OUT_DIRS	+= profil
 endif
 
+ifeq ($(ANDROID), 1)
+FILTER_OUT_DIRS	+= \
+	accept4 adjtimex cma confstr fcntl fmtmsg futex getcontext getcpu \
+	getdomainname getdtablesize gethostid getgroups get_mempolicy ipc \
+	linkat kill mallopt memmap mq_notify mq_open mq_timedreceive \
+	mq_timedsend mq_unlink mmap mremap open openat profil ptrace quotactl \
+	readahead remap_file_pages rt_sigsuspend rt_sigtimedwait \
+	sched_getaffinity sched_setaffinity sendmsg setgroups setns sighold \
+	sigrelse sigsuspend sigtimedwait sigwait sigwaitinfo stime \
+	setdomainname sethostname symlinkat ulimit ustat vfork vhangup vmsplice
+endif
+
 include $(top_srcdir)/include/mk/generic_trunk_target.mk
diff --git a/testcases/kernel/syscalls/creat/Makefile b/testcases/kernel/syscalls/creat/Makefile
@@ -20,4 +20,8 @@ top_srcdir		?= ../../../..
 
 include $(top_srcdir)/include/mk/testcases.mk
 
+ifeq ($(ANDROID),1)
+FILTER_OUT_MAKE_TARGETS	+= creat05
+endif
+
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/dup/Makefile b/testcases/kernel/syscalls/dup/Makefile
@@ -20,4 +20,8 @@ top_srcdir		?= ../../../..
 
 include $(top_srcdir)/include/mk/testcases.mk
 
+ifeq ($(ANDROID), 1)
+FILTER_OUT_MAKE_TARGETS	+= dup06
+endif
+
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/dup2/Makefile b/testcases/kernel/syscalls/dup2/Makefile
@@ -20,4 +20,8 @@ top_srcdir		?= ../../../..
 
 include $(top_srcdir)/include/mk/testcases.mk
 
+ifeq ($(ANDROID),1)
+FILTER_OUT_MAKE_TARGETS	+= dup201 dup205
+endif
+
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/gettid/Makefile b/testcases/kernel/syscalls/gettid/Makefile
@@ -24,4 +24,8 @@ top_srcdir		?= ../../../..
 
 include $(top_srcdir)/include/mk/testcases.mk
 
+ifeq ($(ANDROID), 1)
+FILTER_OUT_MAKE_TARGETS	+= gettid01
+endif
+
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/ioctl/Makefile b/testcases/kernel/syscalls/ioctl/Makefile
@@ -22,4 +22,8 @@ include $(top_srcdir)/include/mk/testcases.mk
 
 INSTALL_TARGETS		+= test_ioctl
 
+ifeq ($(ANDROID),1)
+FILTER_OUT_MAKE_TARGETS	+= ioctl02
+endif
+
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/pipe/Makefile b/testcases/kernel/syscalls/pipe/Makefile
@@ -20,4 +20,8 @@ top_srcdir		?= ../../../..
 
 include $(top_srcdir)/include/mk/testcases.mk
 
+ifeq ($(ANDROID),1)
+FILTER_OUT_MAKE_TARGETS	+= pipe06 pipe07
+endif
+
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/setrlimit/Makefile b/testcases/kernel/syscalls/setrlimit/Makefile
@@ -20,4 +20,8 @@ top_srcdir		?= ../../../..
 
 include $(top_srcdir)/include/mk/testcases.mk
 
+ifeq ($(ANDROID),1)
+FILTER_OUT_MAKE_TARGETS	+= setrlimit01
+endif
+
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/misc/math/Makefile b/testcases/misc/math/Makefile
@@ -22,6 +22,10 @@
 
 top_srcdir		?= ../../..
 
+ifeq ($(ANDROID),1)
+FILTER_OUT_DIRS		:= abs float
+endif
+
 include $(top_srcdir)/include/mk/env_pre.mk
 
 include $(top_srcdir)/include/mk/generic_trunk_target.mk
diff --git a/testcases/network/Makefile b/testcases/network/Makefile
@@ -35,6 +35,10 @@ INSTALL_TARGETS		+= $(addprefix $(DIR)/bin.,sm med lg jmb)
 
 RM			+= -r
 
+ifeq ($(ANDROID),1)
+FILTER_OUT_DIRS		+= lib6 rpc sockets
+endif
+
 $(INSTALL_TARGETS): | generate
 
 .PHONY: generate
diff --git a/testcases/network/multicast/Makefile b/testcases/network/multicast/Makefile
@@ -23,4 +23,9 @@
 top_srcdir		?= ../../..
 
 include $(top_srcdir)/include/mk/env_pre.mk
+
+ifeq ($(ANDROID),1)
+FILTER_OUT_DIRS		+= mc_gethost
+endif
+
 include $(top_srcdir)/include/mk/generic_trunk_target.mk
diff --git a/testcases/network/stress/Makefile b/testcases/network/stress/Makefile
@@ -23,4 +23,9 @@
 top_srcdir		?= ../../..
 
 include $(top_srcdir)/include/mk/env_pre.mk
+
+ifeq ($(ANDROID), 1)
+FILTER_OUT_DIRS		+= ns-tools
+endif
+
 include $(top_srcdir)/include/mk/generic_trunk_target.mk
diff --git a/utils/benchmark/Makefile b/utils/benchmark/Makefile
@@ -21,4 +21,9 @@
 top_srcdir		?= ../..
 
 include $(top_srcdir)/include/mk/env_pre.mk
+
+ifeq ($(ANDROID),1)
+FILTER_OUT_DIRS		+= ebizzy-0.3
+endif
+
 include $(top_srcdir)/include/mk/generic_trunk_target.mk
