diff options
Diffstat (limited to 'package/ltp/patches')
8 files changed, 11 insertions, 140 deletions
diff --git a/package/ltp/patches/patch-Makefile b/package/ltp/patches/patch-Makefile new file mode 100644 index 000000000..0c47a972d --- /dev/null +++ b/package/ltp/patches/patch-Makefile @@ -0,0 +1,11 @@ +--- ltp-full-20220121.orig/Makefile 2022-01-21 20:33:16.000000000 +0100 ++++ ltp-full-20220121/Makefile 2022-02-23 15:14:48.211207957 +0100 +@@ -62,7 +62,7 @@ $(1):: | $$(abs_top_builddir)/$$(basenam + endif + endef + +-COMMON_TARGETS += testcases tools metadata ++COMMON_TARGETS += testcases tools + + # Don't want to nuke the original files if we're installing in-build-tree. + ifneq ($(BUILD_TREE_STATE),$(BUILD_TREE_SRCDIR_INSTALL)) diff --git a/package/ltp/patches/patch-runtest_mm b/package/ltp/patches/patch-runtest_mm deleted file mode 100644 index 968b15e1e..000000000 --- a/package/ltp/patches/patch-runtest_mm +++ /dev/null @@ -1,8 +0,0 @@ ---- ltp-full-20170929.orig/runtest/mm 2017-09-29 17:11:53.000000000 +0200 -+++ ltp-full-20170929/runtest/mm 2017-10-05 18:58:09.655415743 +0200 -@@ -100,4 +100,4 @@ overcommit_memory06 overcommit_memory -R - - max_map_count max_map_count -i 10 - --min_free_kbytes min_free_kbytes -+#min_free_kbytes min_free_kbytes diff --git a/package/ltp/patches/patch-runtest_sched b/package/ltp/patches/patch-runtest_sched deleted file mode 100644 index 829b1b3dd..000000000 --- a/package/ltp/patches/patch-runtest_sched +++ /dev/null @@ -1,13 +0,0 @@ ---- ltp-full-20190930.orig/runtest/sched 2019-09-30 13:30:25.000000000 +0200 -+++ ltp-full-20190930/runtest/sched 2019-10-29 14:36:35.718142489 +0100 -@@ -6,8 +6,8 @@ pth_str03 pth_str03 - time-schedule01 time-schedule - trace_sched01 trace_sched -c 1 - --hackbench01 hackbench 50 process 1000 --hackbench02 hackbench 20 thread 1000 -+#hackbench01 hackbench 50 process 500 -+#hackbench02 hackbench 20 thread 500 - - sched_cli_serv run_sched_cliserv.sh - # Run this stress test for 2 minutes diff --git a/package/ltp/patches/patch-runtest_syscalls b/package/ltp/patches/patch-runtest_syscalls deleted file mode 100644 index 3137ed3dc..000000000 --- a/package/ltp/patches/patch-runtest_syscalls +++ /dev/null @@ -1,11 +0,0 @@ ---- ltp-full-20190930.orig/runtest/syscalls 2019-09-30 13:30:25.000000000 +0200 -+++ ltp-full-20190930/runtest/syscalls 2019-10-29 14:36:35.746144285 +0100 -@@ -330,7 +330,7 @@ fork08 fork08 - fork09 fork09 - fork10 fork10 - fork11 fork11 --fork13 fork13 -i 1000000 -+fork13 fork13 -i 10000 - fork14 fork14 - - fpathconf01 fpathconf01 diff --git a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c b/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c deleted file mode 100644 index 0244804de..000000000 --- a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c +++ /dev/null @@ -1,10 +0,0 @@ ---- ltp-full-20190930.orig/testcases/kernel/syscalls/fanotify/fanotify02.c 2019-09-30 13:30:25.000000000 +0200 -+++ ltp-full-20190930/testcases/kernel/syscalls/fanotify/fanotify02.c 2019-10-29 14:36:35.762145321 +0100 -@@ -10,6 +10,7 @@ - #define _GNU_SOURCE - #include "config.h" - -+#define _GNU_SOURCE - #include <stdio.h> - #include <sys/stat.h> - #include <sys/types.h> diff --git a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c b/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c deleted file mode 100644 index 89c03fc74..000000000 --- a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c +++ /dev/null @@ -1,10 +0,0 @@ ---- ltp-full-20190930.orig/testcases/kernel/syscalls/fanotify/fanotify04.c 2019-09-30 13:30:25.000000000 +0200 -+++ ltp-full-20190930/testcases/kernel/syscalls/fanotify/fanotify04.c 2019-10-29 14:36:35.806148130 +0100 -@@ -11,6 +11,7 @@ - #define _GNU_SOURCE - #include "config.h" - -+#define _GNU_SOURCE - #include <stdio.h> - #include <sys/stat.h> - #include <sys/types.h> diff --git a/package/ltp/patches/patch-testcases_kernel_syscalls_pkeys_pkey01_c b/package/ltp/patches/patch-testcases_kernel_syscalls_pkeys_pkey01_c deleted file mode 100644 index 5f52235c1..000000000 --- a/package/ltp/patches/patch-testcases_kernel_syscalls_pkeys_pkey01_c +++ /dev/null @@ -1,35 +0,0 @@ ---- ltp-full-20190930.orig/testcases/kernel/syscalls/pkeys/pkey01.c 2019-09-30 13:30:26.000000000 +0200 -+++ ltp-full-20190930/testcases/kernel/syscalls/pkeys/pkey01.c 2019-10-29 15:02:09.524423510 +0100 -@@ -157,12 +157,12 @@ static void pkey_test(struct tcase *tc, - - buffer = SAFE_MMAP(NULL, size, mpa->prot, mpa->flags, fd, 0); - -- pkey = pkey_alloc(tc->flags, tc->access_rights); -+ pkey = ltp_pkey_alloc(tc->flags, tc->access_rights); - if (pkey == -1) - tst_brk(TBROK | TERRNO, "pkey_alloc failed"); - - tst_res(TINFO, "Set %s on (%s) buffer", tc->name, flag_to_str(mpa->flags)); -- if (pkey_mprotect(buffer, size, mpa->prot, pkey) == -1) -+ if (ltp_pkey_mprotect(buffer, size, mpa->prot, pkey) == -1) - tst_brk(TBROK | TERRNO, "pkey_mprotect failed"); - - pid = SAFE_FORK(); -@@ -189,7 +189,7 @@ static void pkey_test(struct tcase *tc, - tst_res(TFAIL, "Child: %s", tst_strstatus(status)); - - tst_res(TINFO, "Remove %s from the buffer", tc->name); -- if (pkey_mprotect(buffer, size, mpa->prot, 0x0) == -1) -+ if (ltp_pkey_mprotect(buffer, size, mpa->prot, 0x0) == -1) - tst_brk(TBROK | TERRNO, "pkey_mprotect failed"); - - switch (mpa->prot) { -@@ -211,7 +211,7 @@ static void pkey_test(struct tcase *tc, - - SAFE_MUNMAP(buffer, size); - -- if (pkey_free(pkey) == -1) -+ if (ltp_pkey_free(pkey) == -1) - tst_brk(TBROK | TERRNO, "pkey_free failed"); - } - diff --git a/package/ltp/patches/patch-testcases_kernel_syscalls_pkeys_pkey_h b/package/ltp/patches/patch-testcases_kernel_syscalls_pkeys_pkey_h deleted file mode 100644 index 219cd3699..000000000 --- a/package/ltp/patches/patch-testcases_kernel_syscalls_pkeys_pkey_h +++ /dev/null @@ -1,53 +0,0 @@ ---- ltp-full-20190930.orig/testcases/kernel/syscalls/pkeys/pkey.h 2019-09-30 13:30:26.000000000 +0200 -+++ ltp-full-20190930/testcases/kernel/syscalls/pkeys/pkey.h 2019-10-29 15:02:09.524423510 +0100 -@@ -1,6 +1,7 @@ - // SPDX-License-Identifier: GPL-2.0-or-later - /* - * Copyright (c) 2019 Red Hat, Inc. -+ * Copyright (c) Linux Test Project, 2019 - */ - - #ifndef PKEYS_H -@@ -15,25 +16,29 @@ - #endif - - #ifndef HAVE_PKEY_MPROTECT --static inline int pkey_mprotect(void *addr, size_t len, int prot, int pkey) -+inline int ltp_pkey_mprotect(void *addr, size_t len, int prot, int pkey) - { - return tst_syscall(__NR_pkey_mprotect, addr, len, prot, pkey); - } - --static inline int pkey_alloc(unsigned int flags, unsigned int access_rights) -+inline int ltp_pkey_alloc(unsigned int flags, unsigned int access_rights) - { - return tst_syscall(__NR_pkey_alloc, flags, access_rights); - } - --static inline int pkey_free(int pkey) -+inline int ltp_pkey_free(int pkey) - { - return tst_syscall(__NR_pkey_free, pkey); - } -+#else -+#define ltp_pkey_alloc pkey_alloc -+#define ltp_pkey_free pkey_free -+#define ltp_pkey_mprotect pkey_mprotect - #endif /* HAVE_PKEY_MPROTECT */ - - static inline void check_pkey_support(void) - { -- int pkey = pkey_alloc(0, 0); -+ int pkey = ltp_pkey_alloc(0, 0); - - if (pkey == -1) { - if (errno == ENOSYS) -@@ -44,7 +49,7 @@ static inline void check_pkey_support(vo - tst_brk(TCONF, "pkeys are not available for test"); - } - -- pkey_free(pkey); -+ ltp_pkey_free(pkey); - } - - #endif /* PKEYS_H */ |