summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2016-04-01 13:46:19 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-03 15:51:34 +0100
commit207ee90595a4e36c7358db7920562ad19ecb4179 (patch)
tree0a4f4fed624069a4d776555beacb0305838b17cf
parentfeafad18d5462673bd0fd060b093c30a33e2b8f6 (diff)
downloadpoky-207ee90595a4e36c7358db7920562ad19ecb4179.tar.gz
ltp: add periodic output for memcg stress test
(From OE-Core rev: 26e24d3983096cda7e7455a29eb94fca41dbb4e0) Signed-off-by: Tudor Florea <tudor.florea@enea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/ltp/ltp/0034-periodic_output.patch43
-rw-r--r--meta/recipes-extended/ltp/ltp_20160126.bb1
2 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0034-periodic_output.patch b/meta/recipes-extended/ltp/ltp/0034-periodic_output.patch
new file mode 100644
index 0000000000..59caefe431
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0034-periodic_output.patch
@@ -0,0 +1,43 @@
1Add periodic output for long time test.
2
3This is needed in context of having scripts running ltp tests and
4waiting with a timeout for the output of the tests.
5
6Signed-off-by: Tudor Florea <tudor.florea@enea.com>
7Upstream-Status: Pending
8
9diff -ruN a/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh b/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh
10--- a/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh 2013-11-08 15:54:09.515049081 +0100
11+++ b/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh 2013-11-08 22:32:15.587370406 +0100
12@@ -37,7 +37,8 @@
13 exit 0
14 fi
15
16-RUN_TIME=$(( 60 * 60 ))
17+ONE_MINUTE=60
18+RUN_TIME=60
19
20 cleanup()
21 {
22@@ -62,7 +63,7 @@
23 # $1 - Number of cgroups
24 # $2 - Allocated how much memory in one process? in MB
25 # $3 - The interval to touch memory in a process
26-# $4 - How long does this test run ? in second
27+# $4 - How long does this test run ? in minutes
28 run_stress()
29 {
30 do_mount;
31@@ -81,7 +82,11 @@
32 eval /bin/kill -s SIGUSR1 \$pid$i 2> /dev/null
33 done
34
35- sleep $4
36+ for i in $(seq 0 $(($4-1)))
37+ do
38+ eval echo "Started $i min ago. Still alive... "
39+ sleep $ONE_MINUTE
40+ done
41
42 for i in $(seq 0 $(($1-1)))
43 do
diff --git a/meta/recipes-extended/ltp/ltp_20160126.bb b/meta/recipes-extended/ltp/ltp_20160126.bb
index 720a569ae5..6be2187eaa 100644
--- a/meta/recipes-extended/ltp/ltp_20160126.bb
+++ b/meta/recipes-extended/ltp/ltp_20160126.bb
@@ -60,6 +60,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
60 file://0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch \ 60 file://0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch \
61 file://0032-regen.sh-Include-asm-unistd.h-explicitly.patch \ 61 file://0032-regen.sh-Include-asm-unistd.h-explicitly.patch \
62 file://0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch \ 62 file://0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch \
63 file://0034-periodic_output.patch \
63 " 64 "
64 65
65S = "${WORKDIR}/git" 66S = "${WORKDIR}/git"