mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
ltp: update 20200515 -> 20200930
Drop backports. Remove 0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch as upstream has removed the code being patched. (From OE-Core rev: 8d24f8e5278eedef987480bef151ce9ba7c05f1a) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
2d787812e8
commit
b443fc8207
@@ -1,4 +1,4 @@
|
||||
From 13ef88cdccfe3f58c53d57806866b91e310eb272 Mon Sep 17 00:00:00 2001
|
||||
From 93772c511d954d755cc9128c58ed8968a5af541b Mon Sep 17 00:00:00 2001
|
||||
From: "Mingde (Matthew) Zeng" <matthewzmd@gmail.com>
|
||||
Date: Wed, 29 Jul 2020 08:47:09 -0400
|
||||
Subject: [PATCH] Remove OOM tests from runtest/mm
|
||||
@@ -13,13 +13,13 @@ Signed-off-by: Mingde (Matthew) Zeng <matthew.zeng@windriver.com>
|
||||
1 file changed, 6 deletions(-)
|
||||
|
||||
diff --git a/runtest/mm b/runtest/mm
|
||||
index a09f39c1e..76fa82754 100644
|
||||
index 481d39691..cf207d10e 100644
|
||||
--- a/runtest/mm
|
||||
+++ b/runtest/mm
|
||||
@@ -73,12 +73,6 @@ ksm06 ksm06
|
||||
ksm06_1 ksm06 -n 10
|
||||
ksm06_2 ksm06 -n 10000
|
||||
|
||||
@@ -74,12 +74,6 @@ ksm06_2 ksm06 -n 10000
|
||||
|
||||
cpuset01 cpuset01
|
||||
|
||||
-oom01 oom01
|
||||
-oom02 oom02
|
||||
-oom03 oom03
|
||||
@@ -27,8 +27,5 @@ index a09f39c1e..76fa82754 100644
|
||||
-oom05 oom05
|
||||
-
|
||||
swapping01 swapping01 -i 5
|
||||
|
||||
|
||||
thp01 thp01 -I 120
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From adb9587466a493fdd9d4410f1b8b130ebca06daa Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 19 May 2020 22:21:23 -0700
|
||||
Subject: [PATCH] ptrace01: Fix missing format string
|
||||
|
||||
Fixes
|
||||
| ptrace01.c:89:2: error: format string is not a string literal
|
||||
(potentially insecure) [-Werror,-Wformat-security]
|
||||
| tst_res(TINFO, tc->message);
|
||||
| ^ ~~~~~~~~~~~
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Upstream-Status: Backport [58424835952641f4fd60c0ae3ab6c64decca3f8a]
|
||||
---
|
||||
testcases/kernel/syscalls/ptrace/ptrace01.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/testcases/kernel/syscalls/ptrace/ptrace01.c b/testcases/kernel/syscalls/ptrace/ptrace01.c
|
||||
index 87a99e4150..9071bbabaf 100644
|
||||
--- a/testcases/kernel/syscalls/ptrace/ptrace01.c
|
||||
+++ b/testcases/kernel/syscalls/ptrace/ptrace01.c
|
||||
@@ -86,7 +86,7 @@ static void run(unsigned int i)
|
||||
|
||||
got_signal = 0;
|
||||
|
||||
- tst_res(TINFO, tc->message);
|
||||
+ tst_res(TINFO, "%s", tc->message);
|
||||
|
||||
if (tc->handler == 1) {
|
||||
parent_act.sa_handler = parent_handler;
|
||||
--
|
||||
2.26.2
|
||||
|
||||
-69
@@ -1,69 +0,0 @@
|
||||
From e0a63deb1857eb90288e90d6368df70cdd0c0ec9 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 28 May 2020 13:04:33 -0700
|
||||
Subject: [PATCH] sigwaitinfo: Do not run invalid/undefined test cases
|
||||
|
||||
These testcases run for eternity on musl
|
||||
|
||||
test_bad_address* cases are passing invalid pointers to a function; that's always UB
|
||||
empty_set and timeout rely on the implementation-defined "may fail" for EINTR in sigtimedwait [1]
|
||||
|
||||
normally "may fail" is an "unspecified" but here the impl
|
||||
is supposed to document it so it's "impl-defined"
|
||||
|
||||
[1] https://pubs.opengroup.org/onlinepubs/9699919799/functions/sigtimedwait.html
|
||||
|
||||
Upstream-Status: Submitted [https://patchwork.ozlabs.org/project/ltp/patch/20200528204556.2444156-1-raj.khem@gmail.com/]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Cc: Rich Felker <dalias@aerifal.cx>
|
||||
---
|
||||
.../kernel/syscalls/sigwaitinfo/sigwaitinfo01.c | 12 ++----------
|
||||
1 file changed, 2 insertions(+), 10 deletions(-)
|
||||
|
||||
--- a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
|
||||
+++ b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
|
||||
@@ -422,15 +422,10 @@ struct test_desc {
|
||||
} tests[] = {
|
||||
#ifdef TEST_RT_SIGTIMEDWAIT
|
||||
{
|
||||
- test_empty_set, my_rt_sigtimedwait, SIGUSR1}, {
|
||||
test_unmasked_matching, my_rt_sigtimedwait, SIGUSR1}, {
|
||||
test_masked_matching, my_rt_sigtimedwait, SIGUSR1}, {
|
||||
test_unmasked_matching_noinfo, my_rt_sigtimedwait, SIGUSR1}, {
|
||||
- test_masked_matching_noinfo, my_rt_sigtimedwait, SIGUSR1}, {
|
||||
- test_bad_address, my_rt_sigtimedwait, SIGUSR1}, {
|
||||
- test_bad_address2, my_rt_sigtimedwait, SIGUSR1}, {
|
||||
- test_bad_address3, my_rt_sigtimedwait, SIGUSR1}, {
|
||||
- test_timeout, my_rt_sigtimedwait, 0},
|
||||
+ test_masked_matching_noinfo, my_rt_sigtimedwait, SIGUSR1},
|
||||
/* Special cases */
|
||||
/* 1: sigwaitinfo does respond to ignored signal */
|
||||
{
|
||||
@@ -452,25 +447,17 @@ struct test_desc {
|
||||
#endif
|
||||
#if defined TEST_SIGWAITINFO
|
||||
{
|
||||
- test_empty_set, my_sigwaitinfo, SIGUSR1}, {
|
||||
test_unmasked_matching, my_sigwaitinfo, SIGUSR1}, {
|
||||
test_masked_matching, my_sigwaitinfo, SIGUSR1}, {
|
||||
test_unmasked_matching_noinfo, my_sigwaitinfo, SIGUSR1}, {
|
||||
- test_masked_matching_noinfo, my_sigwaitinfo, SIGUSR1}, {
|
||||
- test_bad_address, my_sigwaitinfo, SIGUSR1}, {
|
||||
- test_bad_address2, my_sigwaitinfo, SIGUSR1},
|
||||
+ test_masked_matching_noinfo, my_sigwaitinfo, SIGUSR1},
|
||||
#endif
|
||||
#if defined TEST_SIGTIMEDWAIT
|
||||
{
|
||||
- test_empty_set, my_sigtimedwait, SIGUSR1}, {
|
||||
test_unmasked_matching, my_sigtimedwait, SIGUSR1}, {
|
||||
test_masked_matching, my_sigtimedwait, SIGUSR1}, {
|
||||
test_unmasked_matching_noinfo, my_sigtimedwait, SIGUSR1}, {
|
||||
- test_masked_matching_noinfo, my_sigtimedwait, SIGUSR1}, {
|
||||
- test_bad_address, my_sigtimedwait, SIGUSR1}, {
|
||||
- test_bad_address2, my_sigtimedwait, SIGUSR1}, {
|
||||
- test_bad_address3, my_sigtimedwait, SIGUSR1}, {
|
||||
- test_timeout, my_sigtimedwait, 0},
|
||||
+ test_masked_matching_noinfo, my_sigtimedwait, SIGUSR1},
|
||||
#endif
|
||||
};
|
||||
|
||||
-57
@@ -1,57 +0,0 @@
|
||||
From 99687ab002f9f750f6f18fa1d70a91f0aa4f8ba2 Mon Sep 17 00:00:00 2001
|
||||
From: He Zhe <zhe.he@windriver.com>
|
||||
Date: Thu, 18 Jun 2020 17:18:27 +0800
|
||||
Subject: [PATCH] syscalls/copy_file_range02: Expect EFBIG in subcase max
|
||||
length on 32-bit architectures
|
||||
|
||||
For syscall
|
||||
ssize_t copy_file_range(int fd_in, loff_t *off_in,
|
||||
int fd_out, loff_t *off_out,
|
||||
size_t len, unsigned int flags);
|
||||
off_out is loff_t* that is long long, 64 bits on 32-bit architectures,
|
||||
while len is size_t that unsigned int, 32 bits on 32-bit architectures.
|
||||
|
||||
In subcase "max length", simplified as below,
|
||||
|
||||
dst = tst_max_lfs_filesize();
|
||||
TEST(sys_copy_file_range(fd_src, 0, *tc->copy_to_fd, &dst, tc->len, tc->flags));
|
||||
|
||||
where dst is 4K*4G and len is 4G, so (4K+1)*4G is always smaller than 4G*4G,
|
||||
it can never match the following kernel condition on 32-bit architectures.
|
||||
|
||||
if (pos_in + count < pos_in || pos_out + count < pos_out)
|
||||
return -EOVERFLOW;
|
||||
|
||||
And thus we would get error like
|
||||
copy_file_range02.c:139: FAIL: copy_file_range failed unexpectedly; expected EOVERFLOW, but got: EFBIG (27)
|
||||
|
||||
Also correct a typo.
|
||||
|
||||
Upstream-Status: Backport [http://lists.linux.it/pipermail/ltp/2020-June/017716.html]
|
||||
|
||||
Signed-off-by: He Zhe <zhe.he@windriver.com>
|
||||
Acked-by: Li Wang <liwang@redhat.com>
|
||||
---
|
||||
.../kernel/syscalls/copy_file_range/copy_file_range02.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c b/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c
|
||||
index fa679c4d3..bc27fbe57 100644
|
||||
--- a/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c
|
||||
+++ b/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c
|
||||
@@ -78,7 +78,11 @@ static struct tcase {
|
||||
{&fd_chrdev, 0, EINVAL, CONTSIZE, "char device", 0},
|
||||
{&fd_fifo, 0, EINVAL, CONTSIZE, "fifo", 0},
|
||||
{&fd_pipe[0], 0, EINVAL, CONTSIZE, "pipe", 0},
|
||||
- {&fd_copy, 0, EOVERFLOW, ULLONG_MAX, "max length lenght", 1},
|
||||
+#ifdef TST_ABI64
|
||||
+ {&fd_copy, 0, EOVERFLOW, ULLONG_MAX, "max length", 1},
|
||||
+#else
|
||||
+ {&fd_copy, 0, EFBIG, ULLONG_MAX, "max length", 1},
|
||||
+#endif
|
||||
{&fd_copy, 0, EFBIG, MIN_OFF, "max file size", 1},
|
||||
};
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
From d0fc9ca5d3366f9b8907e463222403cd2327be10 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 8 Jan 2016 06:51:20 +0000
|
||||
Subject: [PATCH] guard mallocopt() with __GLIBC__
|
||||
|
||||
mallocopt is not available on non glibc implementations
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
|
||||
Upstream-Status: Accepted [967612c454aea66770b64f69287671037fe895b3]
|
||||
---
|
||||
utils/benchmark/ebizzy-0.3/ebizzy.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/utils/benchmark/ebizzy-0.3/ebizzy.c b/utils/benchmark/ebizzy-0.3/ebizzy.c
|
||||
index 5bb8eff..934d951 100644
|
||||
--- a/utils/benchmark/ebizzy-0.3/ebizzy.c
|
||||
+++ b/utils/benchmark/ebizzy-0.3/ebizzy.c
|
||||
@@ -215,10 +215,10 @@ static void read_options(int argc, char *argv[])
|
||||
"\"never mmap\" option specified\n");
|
||||
usage();
|
||||
}
|
||||
-
|
||||
+#ifdef __GLIBC__
|
||||
if (never_mmap)
|
||||
mallopt(M_MMAP_MAX, 0);
|
||||
-
|
||||
+#endif
|
||||
if (chunk_size < record_size) {
|
||||
fprintf(stderr, "Chunk size %u smaller than record size %u\n",
|
||||
chunk_size, record_size);
|
||||
--
|
||||
2.7.4
|
||||
|
||||
+1
-5
@@ -27,16 +27,12 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer"
|
||||
|
||||
CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
|
||||
CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
|
||||
SRCREV = "0d79a93e6ca44d9bc95973faea6bcd7b0c6d1f43"
|
||||
SRCREV = "da2f34028f046a208aa2fed5e287df2538e69f91"
|
||||
|
||||
SRC_URI = "git://github.com/linux-test-project/ltp.git \
|
||||
file://0001-build-Add-option-to-select-libc-implementation.patch \
|
||||
file://0004-guard-mallocopt-with-__GLIBC__.patch \
|
||||
file://0007-Fix-test_proc_kill-hanging.patch \
|
||||
file://0001-Add-more-musl-exclusions.patch \
|
||||
file://0001-ptrace01-Fix-missing-format-string.patch \
|
||||
file://0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch \
|
||||
file://0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch \
|
||||
file://0001-Remove-OOM-tests-from-runtest-mm.patch \
|
||||
"
|
||||
|
||||
Reference in New Issue
Block a user