2 files changed, 54 insertions, 0 deletions

diff --git a/meta/recipes-extended/ltp/files/fix-test_proc_kill-hang.patch b/meta/recipes-extended/ltp/files/fix-test_proc_kill-hang.patch
new file mode 100644
index 0000000000..8fb11af580
--- /dev/null
+++ b/meta/recipes-extended/ltp/files/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 <george.nita@enea.com>
+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/meta/recipes-extended/ltp/files/periodic_output.patch b/meta/recipes-extended/ltp/files/periodic_output.patch
new file mode 100644
index 0000000000..153fe83524
--- /dev/null
+++ b/meta/recipes-extended/ltp/files/periodic_output.patch
@@ -0,0 +1,31 @@
+Add periodic output for long time test.
+
+Signed-off-by: Tudor Florea <tudor.florea@enea.com>
+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