Andrew Geissler | 1e34c2d | 2020-05-29 16:02:59 -0500 | [diff] [blame] | 1 | From 74958c3e341de713b596c8cfd35b2391d6c7bc09 Mon Sep 17 00:00:00 2001 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 7 Jan 2016 18:19:03 +0000 |
Andrew Geissler | 1e34c2d | 2020-05-29 16:02:59 -0500 | [diff] [blame] | 4 | Subject: [PATCH] build: Add option to select libc implementation |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5 | |
| 6 | There are more than glibc for C library implementation available on |
| 7 | linux now a days, uclibc cloaked like glibc but musl e.g. is very |
Andrew Geissler | 1e34c2d | 2020-05-29 16:02:59 -0500 | [diff] [blame] | 8 | different and does not implement all GNU extensions. |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 9 | |
| 10 | Disable tests specifically not building _yet_ on musl based systems |
| 11 | |
Andrew Geissler | 1e34c2d | 2020-05-29 16:02:59 -0500 | [diff] [blame] | 12 | Upstream-Status: Pending (pvorel: this is not going to be fixed, instead |
| 13 | each test needs to be fixed) |
Brad Bishop | 96ff198 | 2019-08-19 13:50:42 -0400 | [diff] [blame] | 14 | |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 15 | rt_tgsigqueueinfo fails with: |
| 16 | rt_tgsigqueueinfo01.c: In function 'sigusr1_handler': |
| 17 | rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct <anonymous>'} has no member named '_sifields'; did you mean '__si_fields'? |
| 18 | 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr; |
| 19 | | ^~~~~~~~~ |
| 20 | | __si_fields |
| 21 | |
Brad Bishop | 96ff198 | 2019-08-19 13:50:42 -0400 | [diff] [blame] | 22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Andrew Geissler | 1e34c2d | 2020-05-29 16:02:59 -0500 | [diff] [blame] | 23 | [ pvorel: rebase for 20200515: enable pty, ioctl ] |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 24 | [ pvorel: rebase for 20200120: enable mallopt, profil, rpc016, |
| 25 | rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend, |
| 26 | testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo |
| 27 | from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ] |
| 28 | Signed-off-by: Petr Vorel <petr.vorel@gmail.com> |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 29 | --- |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 30 | Makefile | 5 +++++ |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 31 | testcases/kernel/sched/Makefile | 4 +++- |
| 32 | testcases/kernel/syscalls/Makefile | 4 ++++ |
Andrew Geissler | 1e34c2d | 2020-05-29 16:02:59 -0500 | [diff] [blame] | 33 | 3 files changed, 12 insertions(+), 1 deletion(-) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 34 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 35 | diff --git a/Makefile b/Makefile |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 36 | index 768ca4606..e9d679a71 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 37 | --- a/Makefile |
| 38 | +++ b/Makefile |
Brad Bishop | 96ff198 | 2019-08-19 13:50:42 -0400 | [diff] [blame] | 39 | @@ -41,6 +41,11 @@ vpath %.mk $(top_srcdir)/mk:$(top_srcdir)/mk/include |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 40 | UCLINUX ?= 0 |
| 41 | export UCLINUX |
| 42 | |
| 43 | +# System C library implementation (glibc,uclibc,musl etc.) |
| 44 | +# default to glibc if not set |
| 45 | +LIBC ?= glibc |
| 46 | +export LIBC |
| 47 | + |
| 48 | # CLEAN_TARGETS: Targets which exist solely in clean. |
| 49 | # COMMON_TARGETS: Targets which exist in all, clean, and install. |
| 50 | # INSTALL_TARGETS: Targets which exist in clean and install (contains |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 51 | diff --git a/testcases/kernel/sched/Makefile b/testcases/kernel/sched/Makefile |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 52 | index 6a57d79ee..74bb93370 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 53 | --- a/testcases/kernel/sched/Makefile |
| 54 | +++ b/testcases/kernel/sched/Makefile |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 55 | @@ -23,5 +23,7 @@ |
| 56 | top_srcdir ?= ../../.. |
| 57 | |
| 58 | include $(top_srcdir)/include/mk/env_pre.mk |
| 59 | - |
| 60 | +ifeq ($(LIBC),musl) |
| 61 | + FILTER_OUT_DIRS += process_stress |
| 62 | +endif |
| 63 | include $(top_srcdir)/include/mk/generic_trunk_target.mk |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 64 | diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile |
Andrew Geissler | 1e34c2d | 2020-05-29 16:02:59 -0500 | [diff] [blame] | 65 | index c6dc8d9e7..aa50761ea 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 66 | --- a/testcases/kernel/syscalls/Makefile |
| 67 | +++ b/testcases/kernel/syscalls/Makefile |
Andrew Geissler | 1e34c2d | 2020-05-29 16:02:59 -0500 | [diff] [blame] | 68 | @@ -15,6 +15,10 @@ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 69 | mincore mprotect nftw profil remap_file_pages sbrk |
| 70 | endif |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 71 | |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 72 | +ifeq ($(LIBC),musl) |
Andrew Geissler | 1e34c2d | 2020-05-29 16:02:59 -0500 | [diff] [blame] | 73 | +FILTER_OUT_DIRS += confstr fmtmsg getcontext rt_tgsigqueueinfo |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 74 | +endif |
| 75 | + |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 76 | ifeq ($(UCLIBC),1) |
| 77 | FILTER_OUT_DIRS += profil |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 78 | endif |
Andrew Geissler | 1e34c2d | 2020-05-29 16:02:59 -0500 | [diff] [blame] | 79 | -- |
| 80 | 2.26.2 |
| 81 | |