diff options
author | Nora Björklund <nora.bjorklund@enea.com> | 2016-01-26 11:44:03 +0100 |
---|---|---|
committer | Martin Borg <martin.borg@enea.com> | 2016-01-28 09:56:24 +0100 |
commit | b2c7425170cdb7d0caa8ba2f25962cf95431653c (patch) | |
tree | 6ac9ba755e5eec353a3f0cb1686ac8a9eabf2990 /recipes-extended/ltp/ltp | |
parent | facc35ed132049f8be4b450c91309762df429772 (diff) | |
download | meta-el-common-b2c7425170cdb7d0caa8ba2f25962cf95431653c.tar.gz |
ltp: upgrade ltp to version 20150903
Upgrade so changes apply to the version used in poky
(master).
Signed-off-by: Nora Björklund <nora.bjorklund@enea.com>
Signed-off-by: Martin Borg <martin.borg@enea.com>
Diffstat (limited to 'recipes-extended/ltp/ltp')
-rw-r--r-- | recipes-extended/ltp/ltp/fix-test_proc_kill-hang.patch | 23 | ||||
-rw-r--r-- | recipes-extended/ltp/ltp/periodic_output.patch | 31 |
2 files changed, 54 insertions, 0 deletions
diff --git a/recipes-extended/ltp/ltp/fix-test_proc_kill-hang.patch b/recipes-extended/ltp/ltp/fix-test_proc_kill-hang.patch new file mode 100644 index 0000000..8fb11af --- /dev/null +++ b/recipes-extended/ltp/ltp/fix-test_proc_kill-hang.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Fix test_proc_kill hanging | ||
2 | |||
3 | Sometimes the signal is delivered to memcg_process before the framework took | ||
4 | into consideration its pid entered in the tasks. Fixed by delaying the signal | ||
5 | send command. | ||
6 | |||
7 | Signed-off-by: George Nita <george.nita@enea.com> | ||
8 | Upstream-Status: Not Submitted | ||
9 | |||
10 | diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh | ||
11 | index 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/recipes-extended/ltp/ltp/periodic_output.patch b/recipes-extended/ltp/ltp/periodic_output.patch new file mode 100644 index 0000000..153fe83 --- /dev/null +++ b/recipes-extended/ltp/ltp/periodic_output.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Add periodic output for long time test. | ||
2 | |||
3 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> | ||
4 | Upstream-Status: Pending | ||
5 | |||
6 | diff -ruN a/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh b/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh | ||
7 | --- a/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh 2013-11-08 15:54:09.515049081 +0100 | ||
8 | +++ b/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh 2013-11-08 22:32:15.587370406 +0100 | ||
9 | @@ -37,7 +37,8 @@ | ||
10 | exit 0 | ||
11 | fi | ||
12 | |||
13 | -RUN_TIME=$(( 60 * 60 )) | ||
14 | +ONE_MINUTE=60 | ||
15 | +RUN_TIME=60 | ||
16 | |||
17 | cleanup() | ||
18 | { | ||
19 | @@ -81,7 +82,11 @@ | ||
20 | eval /bin/kill -s SIGUSR1 \$pid$i 2> /dev/null | ||
21 | done | ||
22 | |||
23 | - sleep $4 | ||
24 | + for i in $(seq 0 $RUN_TIME-1) | ||
25 | + do | ||
26 | + eval echo "Started $i min ago. Still alive... " | ||
27 | + sleep $ONE_MINUTE | ||
28 | + done | ||
29 | |||
30 | for i in $(seq 0 $(($1-1))) | ||
31 | do | ||