diff options
Diffstat (limited to 'package/ltp/patches')
8 files changed, 101 insertions, 37 deletions
diff --git a/package/ltp/patches/patch-runtest_sched b/package/ltp/patches/patch-runtest_sched index 38b8be05d..829b1b3dd 100644 --- a/package/ltp/patches/patch-runtest_sched +++ b/package/ltp/patches/patch-runtest_sched @@ -1,5 +1,5 @@ ---- ltp-5ad79b71f6df2f191f6a81c6ef71078781c0ab15.orig/runtest/sched 2015-12-06 17:03:41.000000000 +0100 -+++ ltp-5ad79b71f6df2f191f6a81c6ef71078781c0ab15/runtest/sched 2015-12-06 17:12:57.000000000 +0100 +--- 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 @@ -9,5 +9,5 @@ +#hackbench01 hackbench 50 process 500 +#hackbench02 hackbench 20 thread 500 - sched_setattr01 sched_setattr01 - sched_getattr01 sched_getattr01 + 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 index f370daca0..3137ed3dc 100644 --- a/package/ltp/patches/patch-runtest_syscalls +++ b/package/ltp/patches/patch-runtest_syscalls @@ -1,6 +1,6 @@ ---- ltp-full-20170929.orig/runtest/syscalls 2017-09-29 17:11:53.000000000 +0200 -+++ ltp-full-20170929/runtest/syscalls 2017-10-05 18:58:09.667414299 +0200 -@@ -301,7 +301,7 @@ fork08 fork08 +--- 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 diff --git a/package/ltp/patches/patch-scenario_groups_default b/package/ltp/patches/patch-scenario_groups_default deleted file mode 100644 index 62a07df6c..000000000 --- a/package/ltp/patches/patch-scenario_groups_default +++ /dev/null @@ -1,14 +0,0 @@ ---- ltp-full-20140422.orig/scenario_groups/default 2014-04-23 10:36:54.000000000 +0200 -+++ ltp-full-20140422/scenario_groups/default 2014-07-07 18:27:26.448313302 +0200 -@@ -19,11 +19,9 @@ fcntl-locktests - connectors - admin_tools - timers --power_management_tests - numa - hugetlb - commands --hyperthreading - kernel_misc - modules - fs_ext4 diff --git a/package/ltp/patches/patch-testcases_kernel_Makefile b/package/ltp/patches/patch-testcases_kernel_Makefile deleted file mode 100644 index 8268287dd..000000000 --- a/package/ltp/patches/patch-testcases_kernel_Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- ltp-full-20170929.orig/testcases/kernel/Makefile 2017-09-29 17:11:53.000000000 +0200 -+++ ltp-full-20170929/testcases/kernel/Makefile 2017-10-05 18:58:09.679412855 +0200 -@@ -50,7 +50,6 @@ SUBDIRS += connectors \ - numa \ - pty \ - sched \ -- security \ - timers \ - tracing \ - module \ diff --git a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c b/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c index 32ed42190..0244804de 100644 --- a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c +++ b/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c @@ -1,6 +1,6 @@ ---- ltp-full-20170929.orig/testcases/kernel/syscalls/fanotify/fanotify02.c 2017-09-29 17:11:54.000000000 +0200 -+++ ltp-full-20170929/testcases/kernel/syscalls/fanotify/fanotify02.c 2017-10-05 18:58:09.683412374 +0200 -@@ -28,6 +28,7 @@ +--- 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" diff --git a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c b/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c index 94571d0bb..89c03fc74 100644 --- a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c +++ b/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c @@ -1,6 +1,6 @@ ---- ltp-full-20170929.orig/testcases/kernel/syscalls/fanotify/fanotify04.c 2017-09-29 17:11:54.000000000 +0200 -+++ ltp-full-20170929/testcases/kernel/syscalls/fanotify/fanotify04.c 2017-10-05 18:58:09.691411411 +0200 -@@ -29,6 +29,7 @@ +--- 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" diff --git a/package/ltp/patches/patch-testcases_kernel_syscalls_pkeys_pkey01_c b/package/ltp/patches/patch-testcases_kernel_syscalls_pkeys_pkey01_c new file mode 100644 index 000000000..5f52235c1 --- /dev/null +++ b/package/ltp/patches/patch-testcases_kernel_syscalls_pkeys_pkey01_c @@ -0,0 +1,35 @@ +--- 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 new file mode 100644 index 000000000..219cd3699 --- /dev/null +++ b/package/ltp/patches/patch-testcases_kernel_syscalls_pkeys_pkey_h @@ -0,0 +1,53 @@ +--- 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 */ |