Skip to contentSkip to conversation

ltp: Update to 20200930

PATCH Superseded Petr Vorel 1 participant 1 message Oct 20, 2020

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH v2 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 v1->v2:
* fixed upstream status for new patches
* updated upstream status for pending patches

NOTE: I dropped '0001-'. It's not needed when we have determined order of the patches.

Kind regards,
Petr

 ...001-Remove-OOM-tests-from-runtest-mm.patch |  26 +-
 ...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 +-
 8 files changed, 444 insertions(+), 211 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-Remove-OOM-tests-from-runtest-mm.patch +13 -13
index 6b665030c3..95366aee37 100644
@@ -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-ptrace01-Fix-missing-format-string.patch deleted +0 -33
deleted file mode 100644
index 27b890e22b..0000000000
@@ -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
deleted file mode 100644
index a187f61f08..0000000000
@@ -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
similarity index 93%
rename from meta/recipes-extended/ltp/ltp_20200515.bb
rename to meta/recipes-extended/ltp/ltp_20200930.bb
index 0c7044d044..84fe734bc4 100644
@@ -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