From d6a7f248063239c3b45e3ec139e7a8dd32b53b90 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Wed, 13 Apr 2016 02:48:13 +0200 Subject: ltp: remove patches integrated in poky Signed-off-by: Tudor Florea --- .../ltp/ltp/fix-test_proc_kill-hang.patch | 23 ---------------- recipes-extended/ltp/ltp/periodic_output.patch | 31 ---------------------- recipes-extended/ltp/ltp_%.bbappend | 7 ----- 3 files changed, 61 deletions(-) delete mode 100644 recipes-extended/ltp/ltp/fix-test_proc_kill-hang.patch delete mode 100644 recipes-extended/ltp/ltp/periodic_output.patch diff --git a/recipes-extended/ltp/ltp/fix-test_proc_kill-hang.patch b/recipes-extended/ltp/ltp/fix-test_proc_kill-hang.patch deleted file mode 100644 index 8fb11af..0000000 --- a/recipes-extended/ltp/ltp/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/ltp/periodic_output.patch b/recipes-extended/ltp/ltp/periodic_output.patch deleted file mode 100644 index 153fe83..0000000 --- a/recipes-extended/ltp/ltp/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_%.bbappend b/recipes-extended/ltp/ltp_%.bbappend index bdfae82..59a4341 100644 --- a/recipes-extended/ltp/ltp_%.bbappend +++ b/recipes-extended/ltp/ltp_%.bbappend @@ -1,10 +1,3 @@ -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