From 67e37c0fc33e5d97222cb96138cea016081a7517 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Feb 2022 18:11:57 +0100 Subject: ltp: update to latest --- package/ltp/Makefile | 7 ++++--- package/ltp/patches/patch-Makefile | 11 +++++++++++ package/ltp/patches/patch-runtest_mm | 6 +++--- package/ltp/patches/patch-runtest_sched | 13 ------------- package/ltp/patches/patch-runtest_syscalls | 6 +++--- .../patch-testcases_kernel_syscalls_fanotify_fanotify02_c | 6 +++--- .../patch-testcases_kernel_syscalls_fanotify_fanotify04_c | 6 +++--- 7 files changed, 27 insertions(+), 28 deletions(-) create mode 100644 package/ltp/patches/patch-Makefile delete mode 100644 package/ltp/patches/patch-runtest_sched (limited to 'package') diff --git a/package/ltp/Makefile b/package/ltp/Makefile index c13b9489e..0c5a4664f 100644 --- a/package/ltp/Makefile +++ b/package/ltp/Makefile @@ -4,10 +4,10 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ltp -PKG_VERSION:= 20210524 +PKG_VERSION:= 20220121 PKG_RELEASE:= 1 PKG_DESCR:= linux test project -PKG_HASH:= 831678c64b85a8c24957c71632752537b2266890f2d2f352da9ed0ec45458189 +PKG_HASH:= ad002520616fac52362229ea0f1bb9d304fc03ff0096ccb5b1820cee9fc8413a PKG_DEPENDS:= bash mke2fs mkfs PKG_NEEDS:= threads PKG_SECTION:= base/tests @@ -28,7 +28,8 @@ CONFIGURE_ARGS+= --with-open-posix-testsuite \ --without-power-management-testsuite \ --without-python \ --without-perl \ - --without-expect + --without-expect \ + --disable-metadata pre-configure: PATH="$(HOST_PATH)" $(MAKE) -C $(WRKBUILD) autotools 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 index 968b15e1e..39e829377 100644 --- a/package/ltp/patches/patch-runtest_mm +++ b/package/ltp/patches/patch-runtest_mm @@ -1,6 +1,6 @@ ---- 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 +--- ltp-full-20220121.orig/runtest/mm 2022-01-21 20:33:16.000000000 +0100 ++++ ltp-full-20220121/runtest/mm 2022-02-23 14:13:22.672798426 +0100 +@@ -101,4 +101,4 @@ overcommit_memory06 overcommit_memory -R max_map_count max_map_count -i 10 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 index 3137ed3dc..24cf2017a 100644 --- a/package/ltp/patches/patch-runtest_syscalls +++ b/package/ltp/patches/patch-runtest_syscalls @@ -1,6 +1,6 @@ ---- 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 +--- ltp-full-20220121.orig/runtest/syscalls 2022-01-21 20:33:16.000000000 +0100 ++++ ltp-full-20220121/runtest/syscalls 2022-02-23 14:13:22.704797624 +0100 +@@ -369,7 +369,7 @@ fork08 fork08 fork09 fork09 fork10 fork10 fork11 fork11 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 0244804de..5befae030 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-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 @@ +--- ltp-full-20220121.orig/testcases/kernel/syscalls/fanotify/fanotify02.c 2022-01-21 20:33:16.000000000 +0100 ++++ ltp-full-20220121/testcases/kernel/syscalls/fanotify/fanotify02.c 2022-02-23 14:13:22.712797424 +0100 +@@ -13,6 +13,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 89c03fc74..d67ac8024 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-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 @@ +--- ltp-full-20220121.orig/testcases/kernel/syscalls/fanotify/fanotify04.c 2022-01-21 20:33:16.000000000 +0100 ++++ ltp-full-20220121/testcases/kernel/syscalls/fanotify/fanotify04.c 2022-02-23 14:13:22.724797124 +0100 +@@ -13,6 +13,7 @@ #define _GNU_SOURCE #include "config.h" -- cgit v1.2.3