ltp: Update to 20200930
PATCH v3 1/1 ltp: Update to 20200930
New patches (backported musl related fixes):
* cacheflush01-Rewrite-into-new-API.patch
* lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch
Dropped patches (not applicable)
* 0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch
Dropped patches from this release:
* 0001-ptrace01-Fix-missing-format-string.patch
* 0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch
* 0004-guard-mallocopt-with-__GLIBC__.patch
Rebased patches:
* 0001-Remove-OOM-tests-from-runtest-mm.patch
Add note to Upstream-Status for pending patches.
---
Changes v2->v3:
* fixed upstream status for new patches
* updated upstream status for pending patches
(v2 is the same as v1, sorry for the noise)
NOTE: I dropped '0001-'. It's not needed when we have determined order of the patches.
Kind regards,
Petr
.../ltp/0001-Add-more-musl-exclusions.patch | 4 +-
...001-Remove-OOM-tests-from-runtest-mm.patch | 26 +-
...option-to-select-libc-implementation.patch | 4 +-
...1-ptrace01-Fix-missing-format-string.patch | 33 ---
...not-run-invalid-undefined-test-cases.patch | 69 ------
...le_range02-Expect-EFBIG-in-subcase-m.patch | 57 -----
.../0004-guard-mallocopt-with-__GLIBC__.patch | 34 ---
.../cacheflush01-Rewrite-into-new-API.patch | 225 ++++++++++++++++++
...ysinfo.h-to-fix-build-with-MUSL-libc.patch | 203 ++++++++++++++++
.../ltp/{ltp_20200515.bb => ltp_20200930.bb} | 8 +-
10 files changed, 449 insertions(+), 214 deletions(-)
delete mode 100644 meta/recipes-extended/ltp/ltp/0001-ptrace01-Fix-missing-format-string.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0004-guard-mallocopt-with-__GLIBC__.patch
create mode 100644 meta/recipes-extended/ltp/ltp/cacheflush01-Rewrite-into-new-API.patch
create mode 100644 meta/recipes-extended/ltp/ltp/lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch
rename meta/recipes-extended/ltp/{ltp_20200515.bb => ltp_20200930.bb} (93%)meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +3 -1
@@ -3,7 +3,9 @@ From: Alexander Kanavin <[email protected]> Date: Fri, 20 Dec 2019 13:06:05 +0100 Subject: [PATCH] Add more musl exclusions -Upstream-Status: Pending +Upstream-Status: Pending [pvorel: this is not going to be merged, instead +each test needs to be fixed] + Signed-off-by: Alexander Kanavin <[email protected]> [ pvorel: rebase for 20200515: enable accept4_01 ] [ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ]
meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch +13 -13
@@ -1,25 +1,25 @@ -From 13ef88cdccfe3f58c53d57806866b91e310eb272 Mon Sep 17 00:00:00 2001 +From 5093e44f02be0a3f1a5a79987a90ad43a2bc26c5 Mon Sep 17 00:00:00 2001 From: "Mingde (Matthew) Zeng" <[email protected]> -Date: Wed, 29 Jul 2020 08:47:09 -0400 -Subject: [PATCH] Remove OOM tests from runtest/mm - -Disable OOM tests, as they might cause oeqa ssh connection lost +Date: Mon, 19 Oct 2020 12:31:23 +0200 +Subject: [PATCH] Disable OOM tests, as they might cause oeqa ssh connection + lost Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Mingde (Matthew) Zeng <[email protected]> - +[ pvorel: rebase for 20200930 ] +Signed-off-by: Petr Vorel <[email protected]> --- runtest/mm | 6 ------ 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,8 @@ index a09f39c1e..76fa82754 100644 -oom05 oom05 - swapping01 swapping01 -i 5 - + thp01 thp01 -I 120 --- +-- 2.27.0
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +2 -2
@@ -9,8 +9,8 @@ different and does not implement all GNU extensions. Disable tests specifically not building _yet_ on musl based systems -Upstream-Status: Pending (pvorel: this is not going to be fixed, instead -each test needs to be fixed) +Upstream-Status: Pending [pvorel: this is not going to be merged, instead +each test needs to be fixed] rt_tgsigqueueinfo fails with: rt_tgsigqueueinfo01.c: In function 'sigusr1_handler':
meta/recipes-extended/ltp/ltp/0001-ptrace01-Fix-missing-format-string.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From adb9587466a493fdd9d4410f1b8b130ebca06daa Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -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 <[email protected]> -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 -
meta/recipes-extended/ltp/ltp/0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch deleted +0 -69
69 lines not on this page · raw message
meta/recipes-extended/ltp/ltp/0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch deleted +0 -57
57 lines not on this page · raw message
meta/recipes-extended/ltp/ltp/0004-guard-mallocopt-with-__GLIBC__.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From d0fc9ca5d3366f9b8907e463222403cd2327be10 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -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 <[email protected]> -Reviewed-by: Petr Vorel <[email protected]> -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 -
meta/recipes-extended/ltp/ltp/cacheflush01-Rewrite-into-new-API.patch new file +225 -0
225 lines not on this page · raw message
meta/recipes-extended/ltp/ltp/lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch new file +203 -0
203 lines not on this page · raw message
meta/recipes-extended/ltp/ltp_20200930.bb renamed from meta/recipes-extended/ltp/ltp_20200515.bb +3 -5
@@ -27,17 +27,15 @@ 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 \ + file://cacheflush01-Rewrite-into-new-API.patch \ + file://lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch \ " S = "${WORKDIR}/git"
Signature · 1 line
2.28.0
meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch From: Alexander Kanavin <[email protected]> · line 7
Quoted 4 lines · Petr Vorel
meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +2
-1-Upstream-Status: Pending +Upstream-Status: Pending [pvorel: this is not going to be merged, instead +each test needs to be fixed]
Nearly there - this should say 'Inappropriate' then, and the status should be kept as a single line, with no line breaks. Same with the other status adjustment.
Alex
Quoted 10 lines · Petr Vorel
meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch From: Alexander Kanavin <[email protected]> · line 7
Quoted 4 lines
meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch +2
-1-Upstream-Status: Pending +Upstream-Status: Pending [pvorel: this is not going to be merged, instead +each test needs to be fixed]Nearly there - this should say 'Inappropriate' then, and the status should be kept as a single line, with no line breaks. Same with the other status adjustment.
Thanks, fixed! Hopefully we're there now.
Kind regards,
Petr
Quoted 1 line
Alex
Yes, seems fine now!
Alex
Quoted 19 lines · Petr Vorel
Quoted 4 lines · Petr Vorel
Review
Quoted 3 lines
(quoted diff) +1
-1-Upstream-Status: Pending +Upstream-Status: Pending [pvorel: this is not going to be merged,instead
Quoted 4 lines
Quoted 1 line
+each test needs to be fixed]
Nearly there - this should say 'Inappropriate' then, and the status
should
Quoted 2 lines
be kept as a single line, with no line breaks. Same with the other status adjustment.
Thanks, fixed! Hopefully we're there now.
Kind regards,
PetrQuoted 1 line
Alex