From 6473d101da4e151ef09d27fb86c086dc8482736f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 5 Oct 2017 20:03:46 +0200 Subject: ltp: update to 20170929 --- package/ltp/Makefile | 4 +- package/ltp/patches/patch-runltp | 6 +-- package/ltp/patches/patch-runtest_mm | 6 +-- package/ltp/patches/patch-runtest_syscalls | 6 +-- .../ltp/patches/patch-testcases_kernel_Makefile | 6 +-- ...testcases_kernel_syscalls_fanotify_fanotify02_c | 8 ++-- ...testcases_kernel_syscalls_fanotify_fanotify04_c | 8 ++-- package/ltp/patches/patch-ver_linux | 45 ++++++++++++++-------- 8 files changed, 50 insertions(+), 39 deletions(-) (limited to 'package') diff --git a/package/ltp/Makefile b/package/ltp/Makefile index d8cc7178f..c3339afc2 100644 --- a/package/ltp/Makefile +++ b/package/ltp/Makefile @@ -4,10 +4,10 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ltp -PKG_VERSION:= 20170516 +PKG_VERSION:= 20170929 PKG_RELEASE:= 1 PKG_DESCR:= linux test project -PKG_HASH:= ecf3de99dec1b506818f2d8cb449fe0c4a42ed23b2c2f3a965e0e0e7fd46c8d3 +PKG_HASH:= 8cc9d5a2ba206f47e757b2203a5fa7a1ef95f8bf841bec1dd7878699dc27b258 PKG_DEPENDS:= bash mke2fs mkfs PKG_NEEDS:= threads PKG_SECTION:= base/tests diff --git a/package/ltp/patches/patch-runltp b/package/ltp/patches/patch-runltp index 54728adfd..cd33cdd79 100644 --- a/package/ltp/patches/patch-runltp +++ b/package/ltp/patches/patch-runltp @@ -1,5 +1,5 @@ ---- ltp-5ad79b71f6df2f191f6a81c6ef71078781c0ab15.orig/runltp 2015-12-06 17:03:41.000000000 +0100 -+++ ltp-5ad79b71f6df2f191f6a81c6ef71078781c0ab15/runltp 2015-12-06 17:12:57.000000000 +0100 +--- ltp-full-20170929.orig/runltp 2017-09-29 17:11:53.000000000 +0200 ++++ ltp-full-20170929/runltp 2017-10-05 18:58:09.651416224 +0200 @@ -77,7 +77,7 @@ setup() exit 1 } @@ -9,7 +9,7 @@ export PATH="${PATH}:${LTPROOT}/testcases/bin" export LTP_DEV_FS_TYPE="ext2" -@@ -695,11 +695,11 @@ main() +@@ -700,11 +700,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 6a94dde3f..968b15e1e 100644 --- a/package/ltp/patches/patch-runtest_mm +++ b/package/ltp/patches/patch-runtest_mm @@ -1,6 +1,6 @@ ---- 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 +--- 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 diff --git a/package/ltp/patches/patch-runtest_syscalls b/package/ltp/patches/patch-runtest_syscalls index 32ca4fa5e..f370daca0 100644 --- a/package/ltp/patches/patch-runtest_syscalls +++ b/package/ltp/patches/patch-runtest_syscalls @@ -1,6 +1,6 @@ ---- 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 +--- 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 fork09 fork09 fork10 fork10 fork11 fork11 diff --git a/package/ltp/patches/patch-testcases_kernel_Makefile b/package/ltp/patches/patch-testcases_kernel_Makefile index a476df742..8268287dd 100644 --- a/package/ltp/patches/patch-testcases_kernel_Makefile +++ b/package/ltp/patches/patch-testcases_kernel_Makefile @@ -1,6 +1,6 @@ ---- ltp-full-20140828.orig/testcases/kernel/Makefile 2014-08-28 12:11:45.000000000 +0200 -+++ ltp-full-20140828/testcases/kernel/Makefile 2014-09-01 13:55:06.564554944 +0200 -@@ -49,7 +49,6 @@ SUBDIRS += connectors \ +--- 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 \ 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 1cfc1df7e..32ed42190 100644 --- a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c +++ b/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify02_c @@ -1,7 +1,7 @@ ---- 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 @@ - */ +--- 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 @@ + #define _GNU_SOURCE #include "config.h" +#define _GNU_SOURCE 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 db277f87d..94571d0bb 100644 --- a/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c +++ b/package/ltp/patches/patch-testcases_kernel_syscalls_fanotify_fanotify04_c @@ -1,7 +1,7 @@ ---- 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 @@ - */ +--- 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 @@ + #define _GNU_SOURCE #include "config.h" +#define _GNU_SOURCE diff --git a/package/ltp/patches/patch-ver_linux b/package/ltp/patches/patch-ver_linux index f1856a367..736036730 100644 --- a/package/ltp/patches/patch-ver_linux +++ b/package/ltp/patches/patch-ver_linux @@ -1,16 +1,15 @@ ---- ltp-full-20140422.orig/ver_linux 2014-04-23 10:37:00.000000000 +0200 -+++ ltp-full-20140422/ver_linux 2014-07-10 23:24:06.016401603 +0200 -@@ -5,9 +5,6 @@ - # differ on your system. - # - PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH --echo 'If some fields are empty or look unusual you may have an old version.' --echo 'Compare to the current minimal requirements in Documentation/Changes.' --echo ' ' +--- ltp-full-20170929.orig/ver_linux 2017-09-29 17:11:55.000000000 +0200 ++++ ltp-full-20170929/ver_linux 2017-10-05 19:42:02.235455965 +0200 +@@ -9,84 +9,9 @@ echo 'If some fields are empty or look u + echo 'Compare to the current minimal requirements in Documentation/Changes.' + echo ' ' - cat /etc/*release 2> /dev/null - if [ $? = 1 ]; then -@@ -18,62 +15,7 @@ fi +-cat /etc/*release 2> /dev/null +-if [ $? = 1 ]; then +- echo '/etc/issue:' +- cat /etc/issue 2> /dev/null +-fi +- uname -a echo ' ' @@ -59,7 +58,10 @@ -'NR==1{print "Net-tools ", $NF}' - -ip -V 2>&1 | awk \ --'NR==1{print "iproute2 ", $NF}' +-'NR==1{print "iproute2 ", $NF}' +- +-ping -V 2>&1 | awk \ +-'NR==1{print "iputils ", $NF}' - -# Kbd needs 'loadkeys -h', -loadkeys -h 2>&1 | awk \ @@ -70,7 +72,16 @@ -'(NR==1 && ($2 ~ /console-tools/)) {print "Console-tools ", $3}' - -expr --v 2>&1 | awk 'NR==1{print "Sh-utils ", $NF}' -+busybox -v - - if [ -e /proc/modules ]; then - X=`cat /proc/modules | sed -e "s/ .*$//"` +- +-if [ -e /proc/modules ]; then +- X=`cat /proc/modules | sed -e "s/ .*$//"` +- echo "Modules Loaded "$X +-fi +- +-echo +-echo 'free reports:' +-free +- + echo + echo '/proc/cpuinfo' + cat /proc/cpuinfo -- cgit v1.2.3