summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2016-04-01 13:46:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-03 15:51:35 +0100
commit46eed0a4aaac943fff9cdba81848a9e0b1154b5c (patch)
tree7ae96fb2b941517b3cbfc6c36557d726de33f81e
parent207ee90595a4e36c7358db7920562ad19ecb4179 (diff)
downloadpoky-46eed0a4aaac943fff9cdba81848a9e0b1154b5c.tar.gz
ltp: fix test_proc_kill hanging
(From OE-Core rev: 725aad58b917533d5f60bc5a8968ac89038ef219) 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/0035-fix-test_proc_kill-hang.patch23
-rw-r--r--meta/recipes-extended/ltp/ltp_20160126.bb1
2 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch b/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch
new file mode 100644
index 0000000000..32ae8aa271
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch
@@ -0,0 +1,23 @@
1Fix test_proc_kill hanging
2
3Sometimes the signal is delivered to memcg_process before the framework took
4into consideration its pid entered in the tasks. Fixed by delaying the signal
5send command.
6
7Signed-off-by: George Nita <george.nita@enea.com>
8Upstream-Status: Pending
9
10diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
11index ffbe006..e81bf74 100755
12--- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
13+++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
14@@ -220,8 +220,8 @@ test_proc_kill()
15
16 $TEST_PATH/memcg_process $2 -s $3 &
17 pid=$!
18- sleep 1
19 echo $pid > tasks
20+ sleep 1
21
22 kill -s USR1 $pid 2> /dev/null
23 sleep 1
diff --git a/meta/recipes-extended/ltp/ltp_20160126.bb b/meta/recipes-extended/ltp/ltp_20160126.bb
index 6be2187eaa..097c16d570 100644
--- a/meta/recipes-extended/ltp/ltp_20160126.bb
+++ b/meta/recipes-extended/ltp/ltp_20160126.bb
@@ -61,6 +61,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
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 file://0034-periodic_output.patch \
64 file://0035-fix-test_proc_kill-hang.patch \
64 " 65 "
65 66
66S = "${WORKDIR}/git" 67S = "${WORKDIR}/git"