mirror of
https://git.yoctoproject.org/poky
synced 2026-04-19 06:32:13 +02:00
ltp: Update to 20200515
Inherit also pkgconfig (required for TI-RPC and Netlink based route tests), to fix: configure:6045: error: possibly undefined macro: AC_DEFINE Refreshed patches (some tests have been fixed for musl) * 0001-build-Add-option-to-select-libc-implementation.patch (add a note here) * 0001-Add-more-musl-exclusions.patch Removed patches (different fix in upstream) * 0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch Removed patches (accepted upstream) * 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch * 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch Update upstream status * 0004-guard-mallocopt-with-__GLIBC__.patch (From OE-Core rev: b31adfccbcdf88f2a9cdca59dcb4725356d30a7f) Signed-off-by: Petr Vorel <petr.vorel@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Petr Vorel
committed by
Richard Purdie
Richard Purdie
parent
c4087787bc
commit
82346d35e4
@@ -1,35 +1,22 @@
|
||||
From 788c47ceef7f115ab7f7aa17f918e58795f4e6c7 Mon Sep 17 00:00:00 2001
|
||||
From ad8e73306cb8293f7d32841e1599fd9048801f1f Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 20 Dec 2019 13:06:05 +0100
|
||||
Subject: [PATCH] Add more musl exclusions
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
[ pvorel: rebase for 20200515: enable accept4_01 ]
|
||||
[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ]
|
||||
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
|
||||
---
|
||||
testcases/kernel/syscalls/accept4/Makefile | 4 ++++
|
||||
testcases/kernel/syscalls/timer_create/Makefile | 4 ++++
|
||||
2 files changed, 8 insertions(+)
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/testcases/kernel/syscalls/accept4/Makefile b/testcases/kernel/syscalls/accept4/Makefile
|
||||
index 504042e11..94db06266 100644
|
||||
--- a/testcases/kernel/syscalls/accept4/Makefile
|
||||
+++ b/testcases/kernel/syscalls/accept4/Makefile
|
||||
@@ -20,4 +20,8 @@ top_srcdir ?= ../../../..
|
||||
|
||||
include $(top_srcdir)/include/mk/testcases.mk
|
||||
|
||||
+ifeq ($(LIBC),musl)
|
||||
+FILTER_OUT_MAKE_TARGETS := accept4_01
|
||||
+endif
|
||||
+
|
||||
include $(top_srcdir)/include/mk/generic_leaf_target.mk
|
||||
diff --git a/testcases/kernel/syscalls/timer_create/Makefile b/testcases/kernel/syscalls/timer_create/Makefile
|
||||
index 8de247075..eb240f432 100644
|
||||
index ada241fe1..d454b01e7 100644
|
||||
--- a/testcases/kernel/syscalls/timer_create/Makefile
|
||||
+++ b/testcases/kernel/syscalls/timer_create/Makefile
|
||||
@@ -20,6 +20,10 @@ top_srcdir ?= ../../../..
|
||||
@@ -5,6 +5,10 @@ top_srcdir ?= ../../../..
|
||||
|
||||
include $(top_srcdir)/include/mk/testcases.mk
|
||||
|
||||
@@ -40,5 +27,6 @@ index 8de247075..eb240f432 100644
|
||||
CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include
|
||||
|
||||
LDLIBS += -lpthread -lrt
|
||||
--
|
||||
2.25.1
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
From be453d1be826b862d47e08663fd69eea9dd62730 Mon Sep 17 00:00:00 2001
|
||||
From 74958c3e341de713b596c8cfd35b2391d6c7bc09 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 7 Jan 2016 18:19:03 +0000
|
||||
Subject: [PATCH 1/6] build: Add option to select libc implementation
|
||||
Subject: [PATCH] build: Add option to select libc implementation
|
||||
|
||||
There are more than glibc for C library implementation available on
|
||||
linux now a days, uclibc cloaked like glibc but musl e.g. is very
|
||||
different and does not implement all GNU extentions
|
||||
different and does not implement all GNU extensions.
|
||||
|
||||
Disable tests specifically not building _yet_ on musl based systems
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Pending (pvorel: this is not going to be fixed, instead
|
||||
each test needs to be fixed)
|
||||
|
||||
rt_tgsigqueueinfo fails with:
|
||||
rt_tgsigqueueinfo01.c: In function 'sigusr1_handler':
|
||||
@@ -19,18 +20,17 @@ rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct <anonymous>'} has n
|
||||
| __si_fields
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
[ pvorel: rebase for 20200515: enable pty, ioctl ]
|
||||
[ pvorel: rebase for 20200120: enable mallopt, profil, rpc016,
|
||||
rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend,
|
||||
testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo
|
||||
from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ]
|
||||
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
|
||||
Signed-off-by: Petr Vorel <pvorel@suse.cz>
|
||||
---
|
||||
Makefile | 5 +++++
|
||||
testcases/kernel/Makefile | 5 ++++-
|
||||
testcases/kernel/sched/Makefile | 4 +++-
|
||||
testcases/kernel/syscalls/Makefile | 4 ++++
|
||||
4 files changed, 16 insertions(+), 2 deletions(-)
|
||||
3 files changed, 12 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 768ca4606..e9d679a71 100644
|
||||
@@ -48,28 +48,6 @@ index 768ca4606..e9d679a71 100644
|
||||
# CLEAN_TARGETS: Targets which exist solely in clean.
|
||||
# COMMON_TARGETS: Targets which exist in all, clean, and install.
|
||||
# INSTALL_TARGETS: Targets which exist in clean and install (contains
|
||||
diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile
|
||||
index 3319b3163..94ea362c8 100644
|
||||
--- a/testcases/kernel/Makefile
|
||||
+++ b/testcases/kernel/Makefile
|
||||
@@ -49,13 +49,16 @@ SUBDIRS += connectors \
|
||||
logging \
|
||||
mem \
|
||||
numa \
|
||||
- pty \
|
||||
sched \
|
||||
security \
|
||||
sound \
|
||||
tracing \
|
||||
uevents \
|
||||
|
||||
+ifneq ($(LIBC),musl)
|
||||
+SUBDIRS += pty
|
||||
+endif
|
||||
+
|
||||
ifeq ($(WITH_POWER_MANAGEMENT_TESTSUITE),yes)
|
||||
SUBDIRS += power_management
|
||||
endif
|
||||
diff --git a/testcases/kernel/sched/Makefile b/testcases/kernel/sched/Makefile
|
||||
index 6a57d79ee..74bb93370 100644
|
||||
--- a/testcases/kernel/sched/Makefile
|
||||
@@ -84,19 +62,20 @@ index 6a57d79ee..74bb93370 100644
|
||||
+endif
|
||||
include $(top_srcdir)/include/mk/generic_trunk_target.mk
|
||||
diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile
|
||||
index 45a00cf7d..af5a591a0 100644
|
||||
index c6dc8d9e7..aa50761ea 100644
|
||||
--- a/testcases/kernel/syscalls/Makefile
|
||||
+++ b/testcases/kernel/syscalls/Makefile
|
||||
@@ -29,6 +29,10 @@ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \
|
||||
@@ -15,6 +15,10 @@ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \
|
||||
mincore mprotect nftw profil remap_file_pages sbrk
|
||||
endif
|
||||
|
||||
+ifeq ($(LIBC),musl)
|
||||
+FILTER_OUT_DIRS += confstr fmtmsg getcontext ioctl rt_tgsigqueueinfo
|
||||
+FILTER_OUT_DIRS += confstr fmtmsg getcontext rt_tgsigqueueinfo
|
||||
+endif
|
||||
+
|
||||
ifeq ($(UCLIBC),1)
|
||||
FILTER_OUT_DIRS += profil
|
||||
endif
|
||||
--
|
||||
2.25.1
|
||||
--
|
||||
2.26.2
|
||||
|
||||
|
||||
@@ -1,122 +0,0 @@
|
||||
From 89c5841bd148a7ae70c65f4a1ca5996b7f0cddfa Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 19 Feb 2020 22:52:04 -0800
|
||||
Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them
|
||||
|
||||
musl is using 64bit time_t now on 32bit architectures and these syscalls
|
||||
no longer exist, therefore its better to check for them being available
|
||||
before using them
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Reviewed-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
|
||||
Reviewed-by: Petr Vorel <pvorel@suse.cz>
|
||||
Signed-off-by: Petr Vorel <pvorel@suse.cz>
|
||||
Upstream-Status: accepted as 5b57ae2913e2d2d167cbd3822784b4c4ba336812
|
||||
---
|
||||
lib/tst_clocks.c | 16 ++++++----------
|
||||
.../syscalls/gettimeofday/gettimeofday01.c | 6 ++----
|
||||
.../syscalls/gettimeofday/gettimeofday02.c | 8 +++-----
|
||||
3 files changed, 11 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c
|
||||
index 5195da38f..fa2f1cb84 100644
|
||||
--- a/lib/tst_clocks.c
|
||||
+++ b/lib/tst_clocks.c
|
||||
@@ -3,28 +3,24 @@
|
||||
* Copyright (c) 2017 Cyril Hrubis <chrubis@suse.cz>
|
||||
*/
|
||||
|
||||
-/*
|
||||
- * clock_gettime() and clock_getres() functions
|
||||
- */
|
||||
-
|
||||
-#define _GNU_SOURCE
|
||||
-#include <unistd.h>
|
||||
#include <time.h>
|
||||
-#include <sys/syscall.h>
|
||||
|
||||
+#define TST_NO_DEFAULT_MAIN
|
||||
+#include "tst_test.h"
|
||||
#include "tst_clocks.h"
|
||||
+#include "lapi/syscalls.h"
|
||||
|
||||
int tst_clock_getres(clockid_t clk_id, struct timespec *res)
|
||||
{
|
||||
- return syscall(SYS_clock_getres, clk_id, res);
|
||||
+ return tst_syscall(__NR_clock_getres, clk_id, res);
|
||||
}
|
||||
|
||||
int tst_clock_gettime(clockid_t clk_id, struct timespec *ts)
|
||||
{
|
||||
- return syscall(SYS_clock_gettime, clk_id, ts);
|
||||
+ return tst_syscall(__NR_clock_gettime, clk_id, ts);
|
||||
}
|
||||
|
||||
int tst_clock_settime(clockid_t clk_id, struct timespec *ts)
|
||||
{
|
||||
- return syscall(SYS_clock_settime, clk_id, ts);
|
||||
+ return tst_syscall(__NR_clock_settime, clk_id, ts);
|
||||
}
|
||||
diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c
|
||||
index 583d8f7b9..08ea1673a 100644
|
||||
--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c
|
||||
+++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c
|
||||
@@ -38,10 +38,8 @@
|
||||
#include <sys/time.h>
|
||||
#include <errno.h>
|
||||
#include "test.h"
|
||||
-#include <sys/syscall.h>
|
||||
#include <unistd.h>
|
||||
-
|
||||
-#define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b)
|
||||
+#include "lapi/syscalls.h"
|
||||
|
||||
char *TCID = "gettimeofday01";
|
||||
int TST_TOTAL = 1;
|
||||
@@ -63,7 +61,7 @@ int main(int ac, char **av)
|
||||
for (lc = 0; TEST_LOOPING(lc); lc++) {
|
||||
tst_count = 0;
|
||||
|
||||
- TEST(gettimeofday((void *)-1, (void *)-1));
|
||||
+ TEST(ltp_syscall(__NR_gettimeofday, (void *)-1, (void *)-1));
|
||||
|
||||
/* gettimeofday returns an int, so we need to turn the long
|
||||
* TEST_RETURN into an int to test with */
|
||||
diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c
|
||||
index 1d60f448e..5170ad2f7 100644
|
||||
--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c
|
||||
+++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c
|
||||
@@ -16,14 +16,12 @@
|
||||
#include <stdint.h>
|
||||
#include <sys/time.h>
|
||||
#include <stdlib.h>
|
||||
-#include <sys/syscall.h>
|
||||
#include <unistd.h>
|
||||
#include <time.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include "tst_test.h"
|
||||
-
|
||||
-#define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b)
|
||||
+#include "lapi/syscalls.h"
|
||||
|
||||
static volatile sig_atomic_t done;
|
||||
static char *str_rtime;
|
||||
@@ -48,13 +46,13 @@ static void verify_gettimeofday(void)
|
||||
|
||||
alarm(rtime);
|
||||
|
||||
- if (gettimeofday(&tv1, NULL)) {
|
||||
+ if (tst_syscall(__NR_gettimeofday, &tv1, NULL)) {
|
||||
tst_res(TBROK | TERRNO, "gettimeofday() failed");
|
||||
return;
|
||||
}
|
||||
|
||||
while (!done) {
|
||||
- if (gettimeofday(&tv2, NULL)) {
|
||||
+ if (tst_syscall(__NR_gettimeofday, &tv2, NULL)) {
|
||||
tst_res(TBROK | TERRNO, "gettimeofday() failed");
|
||||
return;
|
||||
}
|
||||
--
|
||||
2.25.1
|
||||
@@ -1,55 +0,0 @@
|
||||
From 1ce47a6ed811fd78ed04ea2f82e6321c6bca57b6 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 7 Jan 2016 19:40:08 +0000
|
||||
Subject: [PATCH] Check if __GLIBC_PREREQ is defined before using it
|
||||
|
||||
__GLIBC_PREREQ is specific to glibc so it should be checked if it is
|
||||
defined or not.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
|
||||
---
|
||||
testcases/kernel/syscalls/accept4/accept4_01.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/testcases/kernel/syscalls/accept4/accept4_01.c b/testcases/kernel/syscalls/accept4/accept4_01.c
|
||||
index 29e18f27d..07444a46f 100644
|
||||
--- a/testcases/kernel/syscalls/accept4/accept4_01.c
|
||||
+++ b/testcases/kernel/syscalls/accept4/accept4_01.c
|
||||
@@ -38,6 +38,7 @@
|
||||
static struct sockaddr_in *conn_addr, *accept_addr;
|
||||
static int listening_fd;
|
||||
|
||||
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
|
||||
#if !(__GLIBC_PREREQ(2, 10))
|
||||
static int
|
||||
accept4_01(int fd, struct sockaddr *sockaddr, socklen_t *addrlen, int flags)
|
||||
@@ -56,6 +57,7 @@ accept4_01(int fd, struct sockaddr *sockaddr, socklen_t *addrlen, int flags)
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
static int create_listening_socket(void)
|
||||
{
|
||||
@@ -114,12 +116,17 @@ static void verify_accept4(unsigned int nr)
|
||||
SAFE_CONNECT(connfd, (struct sockaddr *)conn_addr, sizeof(*conn_addr));
|
||||
addrlen = sizeof(*accept_addr);
|
||||
|
||||
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
|
||||
#if !(__GLIBC_PREREQ(2, 10))
|
||||
TEST(accept4_01(listening_fd, (struct sockaddr *)accept_addr, &addrlen,
|
||||
tcase->cloexec | tcase->nonblock));
|
||||
#else
|
||||
TEST(accept4(listening_fd, (struct sockaddr *)accept_addr, &addrlen,
|
||||
tcase->cloexec | tcase->nonblock));
|
||||
+#endif
|
||||
+#else
|
||||
+ TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen,
|
||||
+ tcase->cloexec | tcase->nonblock));
|
||||
#endif
|
||||
if (TST_RET == -1) {
|
||||
if (TST_ERR == ENOSYS)
|
||||
@@ -5,9 +5,9 @@ Subject: [PATCH] guard mallocopt() with __GLIBC__
|
||||
|
||||
mallocopt is not available on non glibc implementations
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
|
||||
[ Upstream-Status: accepted in 967612c454aea66770b64f69287671037fe895b3 ]
|
||||
---
|
||||
utils/benchmark/ebizzy-0.3/ebizzy.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
From 4b7db094d6fc5659001ae8dc17078bb65d46b9c9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
|
||||
Date: Fri, 13 May 2016 11:11:28 -0500
|
||||
Subject: [PATCH] acl: Security fix on string printf
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Fixes build error when compiled with -Werror=format-security:
|
||||
|
||||
acl1.c: In function ‘test_acl_default’:
|
||||
acl1.c:305:2: error: format not a string literal and no format arguments [-Werror=format-security]
|
||||
305 | printf(cmd);
|
||||
|
||||
Patch taken from openembedded-core,
|
||||
original bug report: https://bugzilla.yoctoproject.org/9548
|
||||
|
||||
[YOCTO #9548]
|
||||
|
||||
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
|
||||
Signed-off-by: Petr Vorel <pvorel@suse.cz>
|
||||
Upstream-Status: accepted in 4b7db094d6fc5659001ae8dc17078bb65d46b9c9
|
||||
---
|
||||
testcases/network/nfsv4/acl/acl1.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/testcases/network/nfsv4/acl/acl1.c b/testcases/network/nfsv4/acl/acl1.c
|
||||
index aae9484e5..ad778cd33 100644
|
||||
--- a/testcases/network/nfsv4/acl/acl1.c
|
||||
+++ b/testcases/network/nfsv4/acl/acl1.c
|
||||
@@ -302,7 +302,7 @@ void test_acl_default(char *dir, acl_t acl)
|
||||
char *cmd = malloc(256);
|
||||
|
||||
strcpy(cmd, "chmod 7777 ");
|
||||
- printf(cmd);
|
||||
+ printf(cmd, NULL);
|
||||
strcat(cmd, dir);
|
||||
system(cmd);
|
||||
acl2 = acl_get_file(path, ACL_TYPE_ACCESS);
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -27,21 +27,18 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer"
|
||||
|
||||
CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
|
||||
CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
|
||||
SRCREV = "4079aaf264d0e9ead042b59d1c5f4e643620d0d5"
|
||||
SRCREV = "0d79a93e6ca44d9bc95973faea6bcd7b0c6d1f43"
|
||||
|
||||
SRC_URI = "git://github.com/linux-test-project/ltp.git \
|
||||
file://0001-build-Add-option-to-select-libc-implementation.patch \
|
||||
file://0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \
|
||||
file://0004-guard-mallocopt-with-__GLIBC__.patch \
|
||||
file://0007-Fix-test_proc_kill-hanging.patch \
|
||||
file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
|
||||
file://0001-Add-more-musl-exclusions.patch \
|
||||
file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit autotools-brokensep
|
||||
inherit autotools-brokensep pkgconfig
|
||||
|
||||
TARGET_CC_ARCH += "${LDFLAGS}"
|
||||
|
||||
Reference in New Issue
Block a user