From 762afb815a81ca8d138aeecd1e0ce485f1c59473 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 6 Dec 2015 21:57:24 +0100 Subject: ltp: use latest git version, move to new section --- package/ltp/Makefile | 14 +++++--------- package/ltp/patches/patch-runltp | 8 ++++---- package/ltp/patches/patch-runtest_mm | 6 +++--- package/ltp/patches/patch-runtest_sched | 8 ++++---- package/ltp/patches/patch-runtest_syscalls | 6 +++--- .../patch-testcases_kernel_syscalls_fanotify_fanotify02_c | 10 ++++++++++ .../patch-testcases_kernel_syscalls_fanotify_fanotify04_c | 10 ++++++++++ 7 files changed, 39 insertions(+), 23 deletions(-) create mode 100644 package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c create mode 100644 package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c diff --git a/package/ltp/Makefile b/package/ltp/Makefile index 2e5fc8da3..42d6a18c0 100644 --- a/package/ltp/Makefile +++ b/package/ltp/Makefile @@ -4,20 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ltp -PKG_VERSION:= 20150903 +PKG_VERSION:= 5ad79b71f6df2f191f6a81c6ef71078781c0ab15 PKG_RELEASE:= 1 -PKG_HASH:= e670ae9f1e42bc8b500edd3c3a5cf09c6447c56d7738a22235c87a13739bcace PKG_DESCR:= linux test project +PKG_HASH:= 35ba9941368090a620bac6db8c964aaeb3b7a8a6551a73b74167ef8f7a418892 PKG_DEPENDS:= bash mke2fs mkfs PKG_NEEDS:= threads rt -PKG_SECTION:= sys/misc +PKG_SECTION:= base/tests PKG_URL:= http://linux-test-project.github.io -PKG_SITES:= https://github.com/linux-test-project/ltp/archive/ +PKG_SITES:= https://github.com/linux-test-project/ltp.git PKG_NOPARALLEL:= 1 -DISTFILES:= ${PKG_VERSION}.tar.gz -WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LTP,ltp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -27,14 +24,13 @@ TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) XAKE_FLAGS+= GCC_HONOUR_COPTS=s CONFIGURE_ARGS+= --with-open-posix-testsuite \ - --with-realtime-testsuite \ + --without-realtime-testsuite \ --without-power-management-testsuite \ --without-python \ --without-perl \ --without-expect pre-configure: - $(MAKE) -C $(WRKBUILD) distclean $(MAKE) -C $(WRKBUILD) autotools # bessel float version not implemented in uClibc diff --git a/package/ltp/patches/patch-runltp b/package/ltp/patches/patch-runltp index 94bc79e84..54728adfd 100644 --- a/package/ltp/patches/patch-runltp +++ b/package/ltp/patches/patch-runltp @@ -1,5 +1,5 @@ ---- ltp-full-20140828.orig/runltp 2014-08-28 12:11:45.000000000 +0200 -+++ ltp-full-20140828/runltp 2014-09-01 13:55:06.540554810 +0200 +--- ltp-5ad79b71f6df2f191f6a81c6ef71078781c0ab15.orig/runltp 2015-12-06 17:03:41.000000000 +0100 ++++ ltp-5ad79b71f6df2f191f6a81c6ef71078781c0ab15/runltp 2015-12-06 17:12:57.000000000 +0100 @@ -77,7 +77,7 @@ setup() exit 1 } @@ -8,8 +8,8 @@ + export TMPBASE="/opt/ltp/tmp" export PATH="${PATH}:${LTPROOT}/testcases/bin" - export LTP_DEV="" -@@ -669,11 +669,11 @@ main() + export LTP_DEV_FS_TYPE="ext2" +@@ -695,11 +695,11 @@ main() fi # check for required users and groups diff --git a/package/ltp/patches/patch-runtest_mm b/package/ltp/patches/patch-runtest_mm index 8f3181a24..6a94dde3f 100644 --- a/package/ltp/patches/patch-runtest_mm +++ b/package/ltp/patches/patch-runtest_mm @@ -1,6 +1,6 @@ ---- ltp-full-20140828.orig/runtest/mm 2014-08-28 12:11:45.000000000 +0200 -+++ ltp-full-20140828/runtest/mm 2014-09-01 13:55:06.548554854 +0200 -@@ -107,4 +107,4 @@ overcommit_memory06 overcommit_memory -R +--- ltp-5ad79b71f6df2f191f6a81c6ef71078781c0ab15.orig/runtest/mm 2015-12-06 17:03:41.000000000 +0100 ++++ ltp-5ad79b71f6df2f191f6a81c6ef71078781c0ab15/runtest/mm 2015-12-06 17:12:57.000000000 +0100 +@@ -102,4 +102,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 index d39872647..38b8be05d 100644 --- a/package/ltp/patches/patch-runtest_sched +++ b/package/ltp/patches/patch-runtest_sched @@ -1,5 +1,5 @@ ---- ltp-full-20140422.orig/runtest/sched 2014-04-23 10:36:54.000000000 +0200 -+++ ltp-full-20140422/runtest/sched 2014-07-09 18:50:14.482506093 +0200 +--- 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 @@ -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_cli_serv run_sched_cliserv.sh - # Run this stress test for 2 minutes + sched_setattr01 sched_setattr01 + sched_getattr01 sched_getattr01 diff --git a/package/ltp/patches/patch-runtest_syscalls b/package/ltp/patches/patch-runtest_syscalls index 5597697a4..32ca4fa5e 100644 --- a/package/ltp/patches/patch-runtest_syscalls +++ b/package/ltp/patches/patch-runtest_syscalls @@ -1,6 +1,6 @@ ---- ltp-full-20140828.orig/runtest/syscalls 2014-08-28 12:11:45.000000000 +0200 -+++ ltp-full-20140828/runtest/syscalls 2014-09-01 13:55:06.556554900 +0200 -@@ -281,7 +281,7 @@ fork08 fork08 +--- ltp-5ad79b71f6df2f191f6a81c6ef71078781c0ab15.orig/runtest/syscalls 2015-12-06 17:03:41.000000000 +0100 ++++ ltp-5ad79b71f6df2f191f6a81c6ef71078781c0ab15/runtest/syscalls 2015-12-06 17:12:57.000000000 +0100 +@@ -286,7 +286,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 new file mode 100644 index 000000000..1cfc1df7e --- /dev/null +++ b/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c @@ -0,0 +1,10 @@ +--- ltp-5ad79b71f6df2f191f6a81c6ef71078781c0ab15.orig/testcases/kernel/syscalls/fanotify/fanotify02.c 2015-12-06 17:03:41.000000000 +0100 ++++ ltp-5ad79b71f6df2f191f6a81c6ef71078781c0ab15/testcases/kernel/syscalls/fanotify/fanotify02.c 2015-12-06 17:47:14.000000000 +0100 +@@ -27,6 +27,7 @@ + */ + #include "config.h" + ++#define _GNU_SOURCE + #include + #include + #include diff --git a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c b/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c new file mode 100644 index 000000000..db277f87d --- /dev/null +++ b/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c @@ -0,0 +1,10 @@ +--- ltp-5ad79b71f6df2f191f6a81c6ef71078781c0ab15.orig/testcases/kernel/syscalls/fanotify/fanotify04.c 2015-12-06 17:03:41.000000000 +0100 ++++ ltp-5ad79b71f6df2f191f6a81c6ef71078781c0ab15/testcases/kernel/syscalls/fanotify/fanotify04.c 2015-12-06 17:51:52.000000000 +0100 +@@ -27,6 +27,7 @@ + */ + #include "config.h" + ++#define _GNU_SOURCE + #include + #include + #include -- cgit v1.2.3