From b2c7425170cdb7d0caa8ba2f25962cf95431653c Mon Sep 17 00:00:00 2001 From: Nora Björklund Date: Tue, 26 Jan 2016 11:44:03 +0100 Subject: ltp: upgrade ltp to version 20150903 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upgrade so changes apply to the version used in poky (master). Signed-off-by: Nora Björklund Signed-off-by: Martin Borg --- .../ltp/files/fix-test_proc_kill-hang.patch | 23 ---------------- recipes-extended/ltp/files/periodic_output.patch | 31 ---------------------- .../ltp/ltp/fix-test_proc_kill-hang.patch | 23 ++++++++++++++++ recipes-extended/ltp/ltp/periodic_output.patch | 31 ++++++++++++++++++++++ recipes-extended/ltp/ltp_20140422.bbappend | 10 ------- recipes-extended/ltp/ltp_20150903.bbappend | 10 +++++++ 6 files changed, 64 insertions(+), 64 deletions(-) delete mode 100644 recipes-extended/ltp/files/fix-test_proc_kill-hang.patch delete mode 100644 recipes-extended/ltp/files/periodic_output.patch create mode 100644 recipes-extended/ltp/ltp/fix-test_proc_kill-hang.patch create mode 100644 recipes-extended/ltp/ltp/periodic_output.patch delete mode 100644 recipes-extended/ltp/ltp_20140422.bbappend create mode 100644 recipes-extended/ltp/ltp_20150903.bbappend diff --git a/recipes-extended/ltp/files/fix-test_proc_kill-hang.patch b/recipes-extended/ltp/files/fix-test_proc_kill-hang.patch deleted file mode 100644 index 8fb11af..0000000 --- a/recipes-extended/ltp/files/fix-test_proc_kill-hang.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fix test_proc_kill hanging - -Sometimes the signal is delivered to memcg_process before the framework took -into consideration its pid entered in the tasks. Fixed by delaying the signal -send command. - -Signed-off-by: George Nita -Upstream-Status: Not Submitted - -diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh -index ffbe006..e81bf74 100755 ---- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh -+++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh -@@ -220,8 +220,8 @@ test_proc_kill() - - $TEST_PATH/memcg_process $2 -s $3 & - pid=$! -- sleep 1 - echo $pid > tasks -+ sleep 1 - - kill -s USR1 $pid 2> /dev/null - sleep 1 diff --git a/recipes-extended/ltp/files/periodic_output.patch b/recipes-extended/ltp/files/periodic_output.patch deleted file mode 100644 index 153fe83..0000000 --- a/recipes-extended/ltp/files/periodic_output.patch +++ /dev/null @@ -1,31 +0,0 @@ -Add periodic output for long time test. - -Signed-off-by: Tudor Florea -Upstream-Status: Pending - -diff -ruN a/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh b/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh ---- a/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh 2013-11-08 15:54:09.515049081 +0100 -+++ b/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh 2013-11-08 22:32:15.587370406 +0100 -@@ -37,7 +37,8 @@ - exit 0 - fi - --RUN_TIME=$(( 60 * 60 )) -+ONE_MINUTE=60 -+RUN_TIME=60 - - cleanup() - { -@@ -81,7 +82,11 @@ - eval /bin/kill -s SIGUSR1 \$pid$i 2> /dev/null - done - -- sleep $4 -+ for i in $(seq 0 $RUN_TIME-1) -+ do -+ eval echo "Started $i min ago. Still alive... " -+ sleep $ONE_MINUTE -+ done - - for i in $(seq 0 $(($1-1))) - do 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 @@ +Fix test_proc_kill hanging + +Sometimes the signal is delivered to memcg_process before the framework took +into consideration its pid entered in the tasks. Fixed by delaying the signal +send command. + +Signed-off-by: George Nita +Upstream-Status: Not Submitted + +diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh +index ffbe006..e81bf74 100755 +--- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh ++++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh +@@ -220,8 +220,8 @@ test_proc_kill() + + $TEST_PATH/memcg_process $2 -s $3 & + pid=$! +- sleep 1 + echo $pid > tasks ++ sleep 1 + + kill -s USR1 $pid 2> /dev/null + 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 @@ +Add periodic output for long time test. + +Signed-off-by: Tudor Florea +Upstream-Status: Pending + +diff -ruN a/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh b/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh +--- a/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh 2013-11-08 15:54:09.515049081 +0100 ++++ b/testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh 2013-11-08 22:32:15.587370406 +0100 +@@ -37,7 +37,8 @@ + exit 0 + fi + +-RUN_TIME=$(( 60 * 60 )) ++ONE_MINUTE=60 ++RUN_TIME=60 + + cleanup() + { +@@ -81,7 +82,11 @@ + eval /bin/kill -s SIGUSR1 \$pid$i 2> /dev/null + done + +- sleep $4 ++ for i in $(seq 0 $RUN_TIME-1) ++ do ++ eval echo "Started $i min ago. Still alive... " ++ sleep $ONE_MINUTE ++ done + + for i in $(seq 0 $(($1-1))) + do diff --git a/recipes-extended/ltp/ltp_20140422.bbappend b/recipes-extended/ltp/ltp_20140422.bbappend deleted file mode 100644 index e0b6de0..0000000 --- a/recipes-extended/ltp/ltp_20140422.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -FILESEXTRAPATHS_append := "${THISDIR}/files" - -SRC_URI_append = " \ - file://periodic_output.patch \ - file://fix-test_proc_kill-hang.patch \ - " - -do_compile_prepend () { - ( make -C ${B}/testcases/open_posix_testsuite generate-makefiles conformance-all tools-all functional-all stress-all ) -} diff --git a/recipes-extended/ltp/ltp_20150903.bbappend b/recipes-extended/ltp/ltp_20150903.bbappend new file mode 100644 index 0000000..bdfae82 --- /dev/null +++ b/recipes-extended/ltp/ltp_20150903.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/ltp:" + +SRC_URI_append = " \ + file://periodic_output.patch \ + file://fix-test_proc_kill-hang.patch \ + " + +do_compile_prepend () { + ( make -C ${B}/testcases/open_posix_testsuite generate-makefiles conformance-all tools-all functional-all stress-all ) +} -- cgit v1.2.3-54-g00ecf