summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorDengke Du <dengke.du@windriver.com>2017-06-01 04:11:21 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-06 19:52:26 +0100
commitd4dbdfc5d2edeebcea84152051aaff5b9fe99123 (patch)
treeb846532a37afb5f835810a20db61d31a236a0fee /meta/recipes-extended
parentb04960f844e0c3a82cc0fc10bbc42e3f77e9c1e3 (diff)
downloadpoky-d4dbdfc5d2edeebcea84152051aaff5b9fe99123.tar.gz
ltp: upgrade to 20170516
1. rebase patch 0034-periodic_output.patch This patch can't apply, because in memcg_stress_test.sh, it used a different value for RUN_TIME: 15*60, we can check it here: https://github.com/linux-test-project/ltp/blob/20170516/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh#L40 Previous is 60*60, we can check it here: https://github.com/linux-test-project/ltp/blob/20170116/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh#L40 2. delete patch 0039-fcntl-fix-the-time-def-to-use-time_t.patch This patch didn't need any more, because the upstream has remove the unneeded time() declaration. We can check it here: https://github.com/linux-test-project/ltp/commit/f8c96804e5e89d360707c9670b18221b11cf3858 (From OE-Core rev: f09b8d587aa5a0bbaaa653ef9dc0d25837336e17) Signed-off-by: Dengke Du <dengke.du@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/ltp/ltp/0034-periodic_output.patch32
-rw-r--r--meta/recipes-extended/ltp/ltp/0039-fcntl-fix-the-time-def-to-use-time_t.patch29
-rw-r--r--meta/recipes-extended/ltp/ltp_20170516.bb (renamed from meta/recipes-extended/ltp/ltp_20170116.bb)5
3 files changed, 24 insertions, 42 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0034-periodic_output.patch b/meta/recipes-extended/ltp/ltp/0034-periodic_output.patch
index 59caefe431..c2ef899cc5 100644
--- a/meta/recipes-extended/ltp/ltp/0034-periodic_output.patch
+++ b/meta/recipes-extended/ltp/ltp/0034-periodic_output.patch
@@ -1,4 +1,7 @@
1Add periodic output for long time test. 1From 5a77e2bdc083f4f842a8ba7c2db1a7ac6e5f0664 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com>
3Date: Wed, 31 May 2017 21:26:05 -0400
4Subject: [PATCH] Add periodic output for long time test.
2 5
3This is needed in context of having scripts running ltp tests and 6This is needed in context of having scripts running ltp tests and
4waiting with a timeout for the output of the tests. 7waiting with a timeout for the output of the tests.
@@ -6,20 +9,26 @@ waiting with a timeout for the output of the tests.
6Signed-off-by: Tudor Florea <tudor.florea@enea.com> 9Signed-off-by: Tudor Florea <tudor.florea@enea.com>
7Upstream-Status: Pending 10Upstream-Status: Pending
8 11
9diff -ruN a/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh b/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh 12Signed-off-by: Dengke Du <dengke.du@windriver.com>
10--- a/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh 2013-11-08 15:54:09.515049081 +0100 13---
11+++ b/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh 2013-11-08 22:32:15.587370406 +0100 14 .../kernel/controllers/memcg/stress/memcg_stress_test.sh | 11 ++++++++---
12@@ -37,7 +37,8 @@ 15 1 file changed, 8 insertions(+), 3 deletions(-)
16
17diff --git a/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh b/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh
18index af1a708..084e628 100755
19--- a/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh
20+++ b/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh
21@@ -37,7 +37,8 @@ if [ "x$(grep -w memory /proc/cgroups | cut -f4)" != "x1" ]; then
13 exit 0 22 exit 0
14 fi 23 fi
15 24
16-RUN_TIME=$(( 60 * 60 )) 25-RUN_TIME=$(( 15 * 60 ))
17+ONE_MINUTE=60 26+ONE_MINUTE=60
18+RUN_TIME=60 27+RUN_TIME=15
19 28
20 cleanup() 29 cleanup()
21 { 30 {
22@@ -62,7 +63,7 @@ 31@@ -62,7 +63,7 @@ do_mount()
23 # $1 - Number of cgroups 32 # $1 - Number of cgroups
24 # $2 - Allocated how much memory in one process? in MB 33 # $2 - Allocated how much memory in one process? in MB
25 # $3 - The interval to touch memory in a process 34 # $3 - The interval to touch memory in a process
@@ -28,16 +37,19 @@ diff -ruN a/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh b/tes
28 run_stress() 37 run_stress()
29 { 38 {
30 do_mount; 39 do_mount;
31@@ -81,7 +82,11 @@ 40@@ -81,7 +82,11 @@ run_stress()
32 eval /bin/kill -s SIGUSR1 \$pid$i 2> /dev/null 41 eval /bin/kill -s SIGUSR1 \$pid$i 2> /dev/null
33 done 42 done
34 43
35- sleep $4 44- sleep $4
36+ for i in $(seq 0 $(($4-1))) 45+ for i in $(seq 0 $(($4-1)))
37+ do 46+ do
38+ eval echo "Started $i min ago. Still alive... " 47+ eval echo "Started $i min ago. Still alive... "
39+ sleep $ONE_MINUTE 48+ sleep $ONE_MINUTE
40+ done 49+ done
41 50
42 for i in $(seq 0 $(($1-1))) 51 for i in $(seq 0 $(($1-1)))
43 do 52 do
53--
542.8.1
55
diff --git a/meta/recipes-extended/ltp/ltp/0039-fcntl-fix-the-time-def-to-use-time_t.patch b/meta/recipes-extended/ltp/ltp/0039-fcntl-fix-the-time-def-to-use-time_t.patch
deleted file mode 100644
index c0c1dadd05..0000000000
--- a/meta/recipes-extended/ltp/ltp/0039-fcntl-fix-the-time-def-to-use-time_t.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 7bce3d223494803cb32897cabe66119076e53d89 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com>
3Date: Wed, 8 Feb 2017 16:23:51 +0800
4Subject: [PATCH 5/5] fcntl: fix the time() def to use time_t
5
6This fixes the build on X32, where long is 32-bit rather than 64-bit.
7
8Signed-off-by: Christopher Larson <chris_larson@mentor.com>
9Signed-off-by: Dengke Du <dengke.du@windriver.com>
10---
11 testcases/kernel/syscalls/fcntl/fcntl14.c | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/testcases/kernel/syscalls/fcntl/fcntl14.c b/testcases/kernel/syscalls/fcntl/fcntl14.c
15index c61eb24..99e3867 100644
16--- a/testcases/kernel/syscalls/fcntl/fcntl14.c
17+++ b/testcases/kernel/syscalls/fcntl/fcntl14.c
18@@ -775,7 +775,7 @@ void dochild(void)
19
20 void run_test(int file_flag, int file_mode, int seek, int start, int end)
21 {
22- extern long time();
23+ extern time_t time();
24
25 fail = 0;
26
27--
282.7.4
29
diff --git a/meta/recipes-extended/ltp/ltp_20170116.bb b/meta/recipes-extended/ltp/ltp_20170516.bb
index a5494bc809..012c43de35 100644
--- a/meta/recipes-extended/ltp/ltp_20170116.bb
+++ b/meta/recipes-extended/ltp/ltp_20170516.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "\
9 file://testcases/kernel/controllers/freezer/run_freezer.sh;beginline=5;endline=17;md5=86a61d2c042d59836ffb353a21456498 \ 9 file://testcases/kernel/controllers/freezer/run_freezer.sh;beginline=5;endline=17;md5=86a61d2c042d59836ffb353a21456498 \
10 file://testcases/kernel/hotplug/memory_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \ 10 file://testcases/kernel/hotplug/memory_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \
11 file://testcases/kernel/hotplug/cpu_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \ 11 file://testcases/kernel/hotplug/cpu_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \
12 file://testcases/open_posix_testsuite/COPYING;md5=216e43b72efbe4ed9017cc19c4c68b01 \ 12 file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 \
13 file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ 13 file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
14 file://tools/pounder21/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 14 file://tools/pounder21/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
15 file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 15 file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
@@ -21,7 +21,7 @@ DEPENDS_append_libc-musl = " fts "
21EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " 21EXTRA_OEMAKE_append_libc-musl = " LIBC=musl "
22CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" 22CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
23CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" 23CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
24SRCREV = "2c8457b0769fc026e4e1772f4c2a6da0be63a631" 24SRCREV = "6c6c6ca40afb3611e52486f670085762ff451e91"
25 25
26SRC_URI = "git://github.com/linux-test-project/ltp.git \ 26SRC_URI = "git://github.com/linux-test-project/ltp.git \
27 file://0001-add-_GNU_SOURCE-to-pec_listener.c.patch \ 27 file://0001-add-_GNU_SOURCE-to-pec_listener.c.patch \
@@ -50,7 +50,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
50 file://0034-periodic_output.patch \ 50 file://0034-periodic_output.patch \
51 file://0035-fix-test_proc_kill-hang.patch \ 51 file://0035-fix-test_proc_kill-hang.patch \
52 file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ 52 file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
53 file://0039-fcntl-fix-the-time-def-to-use-time_t.patch \
54 " 53 "
55 54
56S = "${WORKDIR}/git" 55S = "${WORKDIR}/git"