summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2019-07-19 13:13:18 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-19 16:19:14 +0100
commita921c2f9dbefde3592bfe65c80ff1ce973aac89b (patch)
tree26b492438631afde3c24b777ed7f960a750c26d7 /meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch
parent161d036569c17d28a1ce625a1c2e258fb6cb18c3 (diff)
downloadpoky-a921c2f9dbefde3592bfe65c80ff1ce973aac89b.tar.gz
ltp: upgrade 20190115 -> 20190517
Drop the following patches since the issues have been fixed upstream: 0001-file01.sh-Fix-in-was-not-recognized.patch 0001-lapi-Define-TST_ABI-32-64-to-detect-target-type.patch 0001-syscalls-setrlimit03.c-read-proc-sys-fs-nr_open-for-.patch 0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch 0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch 0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch 0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch 0024-rt_sigaction-rt_sigprocmark-Define-_GNU_SOURCE.patch 0026-crash01-Define-_GNU_SOURCE.patch 0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch 0034-periodic_output.patch 0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch define-sigrtmin-and-sigrtmax-for-musl.patch setregid01-security-string-formatting.patch Refresh the following patches: 0004-build-Add-option-to-select-libc-implementation.patch 0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch 0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch 0018-guard-mallocopt-with-__GLIBC__.patch 0020-getdents-define-getdents-getdents64-only-for-glibc.patch 0035-fix-test_proc_kill-hang.patch 0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch 0001-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch 0001-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch 0001-diotest4-Let-kernel-pick-an-address-when-calling-mma.patch 0001-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch Add patch: 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (From OE-Core rev: eb59546c83f4c217de6272a8d3b2fa65e3c84e7f) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch')
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch149
1 files changed, 149 insertions, 0 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch
new file mode 100644
index 0000000000..b5c25c56a5
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch
@@ -0,0 +1,149 @@
1From ec282980e6eee96f5b74aba464141f86049263e6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 7 Jan 2016 18:19:03 +0000
4Subject: [PATCH] build: Add option to select libc implementation
5
6There are more than glibc for C library implementation available on
7linux now a days, uclibc cloaked like glibc but musl e.g. is very
8different and does not implement all GNU extentions
9
10Disable tests specifically not building _yet_ on musl based systems
11
12Upstream-Status: Pending
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 Makefile | 5 +++++
17 testcases/kernel/Makefile | 5 ++++-
18 testcases/kernel/sched/Makefile | 4 +++-
19 testcases/kernel/syscalls/Makefile | 5 +++++
20 testcases/network/nfsv4/acl/Makefile | 4 ++++
21 testcases/network/rpc/basic_tests/Makefile | 5 +++++
22 testcases/realtime/func/pi-tests/Makefile | 4 ++++
23 testcases/realtime/stress/pi-tests/Makefile | 5 +++++
24 8 files changed, 35 insertions(+), 2 deletions(-)
25
26diff --git a/Makefile b/Makefile
27index 768ca46..e9d679a 100644
28--- a/Makefile
29+++ b/Makefile
30@@ -41,6 +41,11 @@ vpath %.mk $(top_srcdir)/mk:$(top_srcdir)/mk/include
31 UCLINUX ?= 0
32 export UCLINUX
33
34+# System C library implementation (glibc,uclibc,musl etc.)
35+# default to glibc if not set
36+LIBC ?= glibc
37+export LIBC
38+
39 # CLEAN_TARGETS: Targets which exist solely in clean.
40 # COMMON_TARGETS: Targets which exist in all, clean, and install.
41 # INSTALL_TARGETS: Targets which exist in clean and install (contains
42diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile
43index 39d79c7..24a57d9 100644
44--- a/testcases/kernel/Makefile
45+++ b/testcases/kernel/Makefile
46@@ -49,12 +49,15 @@ SUBDIRS += connectors \
47 logging \
48 mem \
49 numa \
50- pty \
51 sched \
52 security \
53 timers \
54 tracing \
55
56+ifneq ($(LIBC),musl)
57+SUBDIRS += pty
58+endif
59+
60 ifeq ($(WITH_POWER_MANAGEMENT_TESTSUITE),yes)
61 SUBDIRS += power_management
62 endif
63diff --git a/testcases/kernel/sched/Makefile b/testcases/kernel/sched/Makefile
64index 6a57d79..74bb933 100644
65--- a/testcases/kernel/sched/Makefile
66+++ b/testcases/kernel/sched/Makefile
67@@ -23,5 +23,7 @@
68 top_srcdir ?= ../../..
69
70 include $(top_srcdir)/include/mk/env_pre.mk
71-
72+ifeq ($(LIBC),musl)
73+ FILTER_OUT_DIRS += process_stress
74+endif
75 include $(top_srcdir)/include/mk/generic_trunk_target.mk
76diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile
77index 45a00cf..d1becd0 100644
78--- a/testcases/kernel/syscalls/Makefile
79+++ b/testcases/kernel/syscalls/Makefile
80@@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1)
81 FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \
82 mincore mprotect nftw profil remap_file_pages sbrk
83 endif
84+ifeq ($(LIBC),musl)
85+FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl mallopt profil \
86+ rt_sigsuspend setdomainname sethostname sigsuspend \
87+ ustat
88+endif
89
90 ifeq ($(UCLIBC),1)
91 FILTER_OUT_DIRS += profil
92diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile
93index 8c55a6b..f7cda62 100644
94--- a/testcases/network/nfsv4/acl/Makefile
95+++ b/testcases/network/nfsv4/acl/Makefile
96@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk
97
98 LDLIBS += $(ACL_LIBS)
99
100+ifeq ($(LIBC),musl)
101+FILTER_OUT_MAKE_TARGETS := acl1
102+endif
103+
104 include $(top_srcdir)/include/mk/generic_leaf_target.mk
105diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile
106index 66e9d56..ea8eb8a 100644
107--- a/testcases/network/rpc/basic_tests/Makefile
108+++ b/testcases/network/rpc/basic_tests/Makefile
109@@ -23,4 +23,9 @@
110 top_srcdir ?= ../../../..
111
112 include $(top_srcdir)/include/mk/env_pre.mk
113+
114+ifeq ($(LIBC),musl)
115+FILTER_OUT_DIRS += rpc01
116+endif
117+
118 include $(top_srcdir)/include/mk/generic_trunk_target.mk
119diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile
120index 68616a7..748754b 100644
121--- a/testcases/realtime/func/pi-tests/Makefile
122+++ b/testcases/realtime/func/pi-tests/Makefile
123@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk
124 include $(abs_srcdir)/../../config.mk
125
126 MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex
127+ifeq ($(LIBC),musl)
128+FILTER_OUT_MAKE_TARGETS := testpi-5 testpi-6 sbrk_mutex
129+endif
130+
131
132 include $(top_srcdir)/include/mk/generic_leaf_target.mk
133diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile
134index 1881f75..266e0b8 100644
135--- a/testcases/realtime/stress/pi-tests/Makefile
136+++ b/testcases/realtime/stress/pi-tests/Makefile
137@@ -24,4 +24,9 @@ top_srcdir ?= ../../../..
138
139 include $(top_srcdir)/include/mk/env_pre.mk
140 include $(abs_srcdir)/../../config.mk
141+
142+ifeq ($(LIBC),musl)
143+FILTER_OUT_MAKE_TARGETS := testpi-3
144+endif
145+
146 include $(top_srcdir)/include/mk/generic_leaf_target.mk
147--
1482.7.4
149