summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch17
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-ptrace01-Fix-missing-format-string.patch33
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch69
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch57
-rw-r--r--meta/recipes-extended/ltp/ltp/0004-guard-mallocopt-with-__GLIBC__.patch34
-rw-r--r--meta/recipes-extended/ltp/ltp_20200930.bb (renamed from meta/recipes-extended/ltp/ltp_20200515.bb)6
6 files changed, 8 insertions, 208 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
index 6b665030c3..e51950f153 100644
--- a/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
+++ b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
@@ -1,4 +1,4 @@
1From 13ef88cdccfe3f58c53d57806866b91e310eb272 Mon Sep 17 00:00:00 2001 1From 93772c511d954d755cc9128c58ed8968a5af541b Mon Sep 17 00:00:00 2001
2From: "Mingde (Matthew) Zeng" <matthewzmd@gmail.com> 2From: "Mingde (Matthew) Zeng" <matthewzmd@gmail.com>
3Date: Wed, 29 Jul 2020 08:47:09 -0400 3Date: Wed, 29 Jul 2020 08:47:09 -0400
4Subject: [PATCH] Remove OOM tests from runtest/mm 4Subject: [PATCH] Remove OOM tests from runtest/mm
@@ -13,13 +13,13 @@ Signed-off-by: Mingde (Matthew) Zeng <matthew.zeng@windriver.com>
13 1 file changed, 6 deletions(-) 13 1 file changed, 6 deletions(-)
14 14
15diff --git a/runtest/mm b/runtest/mm 15diff --git a/runtest/mm b/runtest/mm
16index a09f39c1e..76fa82754 100644 16index 481d39691..cf207d10e 100644
17--- a/runtest/mm 17--- a/runtest/mm
18+++ b/runtest/mm 18+++ b/runtest/mm
19@@ -73,12 +73,6 @@ ksm06 ksm06 19@@ -74,12 +74,6 @@ ksm06_2 ksm06 -n 10000
20 ksm06_1 ksm06 -n 10 20
21 ksm06_2 ksm06 -n 10000 21 cpuset01 cpuset01
22 22
23-oom01 oom01 23-oom01 oom01
24-oom02 oom02 24-oom02 oom02
25-oom03 oom03 25-oom03 oom03
@@ -27,8 +27,5 @@ index a09f39c1e..76fa82754 100644
27-oom05 oom05 27-oom05 oom05
28- 28-
29 swapping01 swapping01 -i 5 29 swapping01 swapping01 -i 5
30 30
31 thp01 thp01 -I 120 31 thp01 thp01 -I 120
32--
332.27.0
34
diff --git a/meta/recipes-extended/ltp/ltp/0001-ptrace01-Fix-missing-format-string.patch b/meta/recipes-extended/ltp/ltp/0001-ptrace01-Fix-missing-format-string.patch
deleted file mode 100644
index 27b890e22b..0000000000
--- a/meta/recipes-extended/ltp/ltp/0001-ptrace01-Fix-missing-format-string.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From adb9587466a493fdd9d4410f1b8b130ebca06daa Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 19 May 2020 22:21:23 -0700
4Subject: [PATCH] ptrace01: Fix missing format string
5
6Fixes
7| ptrace01.c:89:2: error: format string is not a string literal
8(potentially insecure) [-Werror,-Wformat-security]
9| tst_res(TINFO, tc->message);
10| ^ ~~~~~~~~~~~
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13Upstream-Status: Backport [58424835952641f4fd60c0ae3ab6c64decca3f8a]
14---
15 testcases/kernel/syscalls/ptrace/ptrace01.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/testcases/kernel/syscalls/ptrace/ptrace01.c b/testcases/kernel/syscalls/ptrace/ptrace01.c
19index 87a99e4150..9071bbabaf 100644
20--- a/testcases/kernel/syscalls/ptrace/ptrace01.c
21+++ b/testcases/kernel/syscalls/ptrace/ptrace01.c
22@@ -86,7 +86,7 @@ static void run(unsigned int i)
23
24 got_signal = 0;
25
26- tst_res(TINFO, tc->message);
27+ tst_res(TINFO, "%s", tc->message);
28
29 if (tc->handler == 1) {
30 parent_act.sa_handler = parent_handler;
31--
322.26.2
33
diff --git a/meta/recipes-extended/ltp/ltp/0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch b/meta/recipes-extended/ltp/ltp/0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch
deleted file mode 100644
index 17d5af89e2..0000000000
--- a/meta/recipes-extended/ltp/ltp/0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1From e0a63deb1857eb90288e90d6368df70cdd0c0ec9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 28 May 2020 13:04:33 -0700
4Subject: [PATCH] sigwaitinfo: Do not run invalid/undefined test cases
5
6These testcases run for eternity on musl
7
8test_bad_address* cases are passing invalid pointers to a function; that's always UB
9empty_set and timeout rely on the implementation-defined "may fail" for EINTR in sigtimedwait [1]
10
11normally "may fail" is an "unspecified" but here the impl
12is supposed to document it so it's "impl-defined"
13
14[1] https://pubs.opengroup.org/onlinepubs/9699919799/functions/sigtimedwait.html
15
16Upstream-Status: Submitted [https://patchwork.ozlabs.org/project/ltp/patch/20200528204556.2444156-1-raj.khem@gmail.com/]
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18Cc: Rich Felker <dalias@aerifal.cx>
19---
20 .../kernel/syscalls/sigwaitinfo/sigwaitinfo01.c | 12 ++----------
21 1 file changed, 2 insertions(+), 10 deletions(-)
22
23--- a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
24+++ b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
25@@ -422,15 +422,10 @@ struct test_desc {
26 } tests[] = {
27 #ifdef TEST_RT_SIGTIMEDWAIT
28 {
29- test_empty_set, my_rt_sigtimedwait, SIGUSR1}, {
30 test_unmasked_matching, my_rt_sigtimedwait, SIGUSR1}, {
31 test_masked_matching, my_rt_sigtimedwait, SIGUSR1}, {
32 test_unmasked_matching_noinfo, my_rt_sigtimedwait, SIGUSR1}, {
33- test_masked_matching_noinfo, my_rt_sigtimedwait, SIGUSR1}, {
34- test_bad_address, my_rt_sigtimedwait, SIGUSR1}, {
35- test_bad_address2, my_rt_sigtimedwait, SIGUSR1}, {
36- test_bad_address3, my_rt_sigtimedwait, SIGUSR1}, {
37- test_timeout, my_rt_sigtimedwait, 0},
38+ test_masked_matching_noinfo, my_rt_sigtimedwait, SIGUSR1},
39 /* Special cases */
40 /* 1: sigwaitinfo does respond to ignored signal */
41 {
42@@ -452,25 +447,17 @@ struct test_desc {
43 #endif
44 #if defined TEST_SIGWAITINFO
45 {
46- test_empty_set, my_sigwaitinfo, SIGUSR1}, {
47 test_unmasked_matching, my_sigwaitinfo, SIGUSR1}, {
48 test_masked_matching, my_sigwaitinfo, SIGUSR1}, {
49 test_unmasked_matching_noinfo, my_sigwaitinfo, SIGUSR1}, {
50- test_masked_matching_noinfo, my_sigwaitinfo, SIGUSR1}, {
51- test_bad_address, my_sigwaitinfo, SIGUSR1}, {
52- test_bad_address2, my_sigwaitinfo, SIGUSR1},
53+ test_masked_matching_noinfo, my_sigwaitinfo, SIGUSR1},
54 #endif
55 #if defined TEST_SIGTIMEDWAIT
56 {
57- test_empty_set, my_sigtimedwait, SIGUSR1}, {
58 test_unmasked_matching, my_sigtimedwait, SIGUSR1}, {
59 test_masked_matching, my_sigtimedwait, SIGUSR1}, {
60 test_unmasked_matching_noinfo, my_sigtimedwait, SIGUSR1}, {
61- test_masked_matching_noinfo, my_sigtimedwait, SIGUSR1}, {
62- test_bad_address, my_sigtimedwait, SIGUSR1}, {
63- test_bad_address2, my_sigtimedwait, SIGUSR1}, {
64- test_bad_address3, my_sigtimedwait, SIGUSR1}, {
65- test_timeout, my_sigtimedwait, 0},
66+ test_masked_matching_noinfo, my_sigtimedwait, SIGUSR1},
67 #endif
68 };
69
diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch
deleted file mode 100644
index 09b6f54874..0000000000
--- a/meta/recipes-extended/ltp/ltp/0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From 99687ab002f9f750f6f18fa1d70a91f0aa4f8ba2 Mon Sep 17 00:00:00 2001
2From: He Zhe <zhe.he@windriver.com>
3Date: Thu, 18 Jun 2020 17:18:27 +0800
4Subject: [PATCH] syscalls/copy_file_range02: Expect EFBIG in subcase max
5 length on 32-bit architectures
6
7For syscall
8ssize_t copy_file_range(int fd_in, loff_t *off_in,
9 int fd_out, loff_t *off_out,
10 size_t len, unsigned int flags);
11off_out is loff_t* that is long long, 64 bits on 32-bit architectures,
12while len is size_t that unsigned int, 32 bits on 32-bit architectures.
13
14In subcase "max length", simplified as below,
15
16dst = tst_max_lfs_filesize();
17TEST(sys_copy_file_range(fd_src, 0, *tc->copy_to_fd, &dst, tc->len, tc->flags));
18
19where dst is 4K*4G and len is 4G, so (4K+1)*4G is always smaller than 4G*4G,
20it can never match the following kernel condition on 32-bit architectures.
21
22if (pos_in + count < pos_in || pos_out + count < pos_out)
23 return -EOVERFLOW;
24
25And thus we would get error like
26copy_file_range02.c:139: FAIL: copy_file_range failed unexpectedly; expected EOVERFLOW, but got: EFBIG (27)
27
28Also correct a typo.
29
30Upstream-Status: Backport [http://lists.linux.it/pipermail/ltp/2020-June/017716.html]
31
32Signed-off-by: He Zhe <zhe.he@windriver.com>
33Acked-by: Li Wang <liwang@redhat.com>
34---
35 .../kernel/syscalls/copy_file_range/copy_file_range02.c | 6 +++++-
36 1 file changed, 5 insertions(+), 1 deletion(-)
37
38diff --git a/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c b/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c
39index fa679c4d3..bc27fbe57 100644
40--- a/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c
41+++ b/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c
42@@ -78,7 +78,11 @@ static struct tcase {
43 {&fd_chrdev, 0, EINVAL, CONTSIZE, "char device", 0},
44 {&fd_fifo, 0, EINVAL, CONTSIZE, "fifo", 0},
45 {&fd_pipe[0], 0, EINVAL, CONTSIZE, "pipe", 0},
46- {&fd_copy, 0, EOVERFLOW, ULLONG_MAX, "max length lenght", 1},
47+#ifdef TST_ABI64
48+ {&fd_copy, 0, EOVERFLOW, ULLONG_MAX, "max length", 1},
49+#else
50+ {&fd_copy, 0, EFBIG, ULLONG_MAX, "max length", 1},
51+#endif
52 {&fd_copy, 0, EFBIG, MIN_OFF, "max file size", 1},
53 };
54
55--
562.17.1
57
diff --git a/meta/recipes-extended/ltp/ltp/0004-guard-mallocopt-with-__GLIBC__.patch b/meta/recipes-extended/ltp/ltp/0004-guard-mallocopt-with-__GLIBC__.patch
deleted file mode 100644
index a187f61f08..0000000000
--- a/meta/recipes-extended/ltp/ltp/0004-guard-mallocopt-with-__GLIBC__.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From d0fc9ca5d3366f9b8907e463222403cd2327be10 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 8 Jan 2016 06:51:20 +0000
4Subject: [PATCH] guard mallocopt() with __GLIBC__
5
6mallocopt is not available on non glibc implementations
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
10Upstream-Status: Accepted [967612c454aea66770b64f69287671037fe895b3]
11---
12 utils/benchmark/ebizzy-0.3/ebizzy.c | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/utils/benchmark/ebizzy-0.3/ebizzy.c b/utils/benchmark/ebizzy-0.3/ebizzy.c
16index 5bb8eff..934d951 100644
17--- a/utils/benchmark/ebizzy-0.3/ebizzy.c
18+++ b/utils/benchmark/ebizzy-0.3/ebizzy.c
19@@ -215,10 +215,10 @@ static void read_options(int argc, char *argv[])
20 "\"never mmap\" option specified\n");
21 usage();
22 }
23-
24+#ifdef __GLIBC__
25 if (never_mmap)
26 mallopt(M_MMAP_MAX, 0);
27-
28+#endif
29 if (chunk_size < record_size) {
30 fprintf(stderr, "Chunk size %u smaller than record size %u\n",
31 chunk_size, record_size);
32--
332.7.4
34
diff --git a/meta/recipes-extended/ltp/ltp_20200515.bb b/meta/recipes-extended/ltp/ltp_20200930.bb
index 0c7044d044..7acf15b360 100644
--- a/meta/recipes-extended/ltp/ltp_20200515.bb
+++ b/meta/recipes-extended/ltp/ltp_20200930.bb
@@ -27,16 +27,12 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer"
27 27
28CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" 28CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
29CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" 29CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
30SRCREV = "0d79a93e6ca44d9bc95973faea6bcd7b0c6d1f43" 30SRCREV = "da2f34028f046a208aa2fed5e287df2538e69f91"
31 31
32SRC_URI = "git://github.com/linux-test-project/ltp.git \ 32SRC_URI = "git://github.com/linux-test-project/ltp.git \
33 file://0001-build-Add-option-to-select-libc-implementation.patch \ 33 file://0001-build-Add-option-to-select-libc-implementation.patch \
34 file://0004-guard-mallocopt-with-__GLIBC__.patch \
35 file://0007-Fix-test_proc_kill-hanging.patch \ 34 file://0007-Fix-test_proc_kill-hanging.patch \
36 file://0001-Add-more-musl-exclusions.patch \ 35 file://0001-Add-more-musl-exclusions.patch \
37 file://0001-ptrace01-Fix-missing-format-string.patch \
38 file://0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch \
39 file://0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch \
40 file://0001-Remove-OOM-tests-from-runtest-mm.patch \ 36 file://0001-Remove-OOM-tests-from-runtest-mm.patch \
41 " 37 "
42 38
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 06:44:19 +0000