[Ltp-commits] [Git] ltp updated.

[Cyril H. <su...@li...>]

The branch, master, has been updated
       via  1e5da030e9cdeb431d41e7eb84658d9c4a5b67e3 (commit)
      from  ba7e78a20a5eb6ab2887c6297d69611bd12c8be2 (commit)


- Log -----------------------------------------------------------------
commit 1e5da030e9cdeb431d41e7eb84658d9c4a5b67e3
Author: Stanislav Kholmanskikh <sta...@or...>
Date:   Thu Oct 17 13:17:03 2013 +0400

    memcg_control: revert memory.use_hierarchy value to 0
    
    Documentation/cgroups/memory.txt states that "Enabling/disabling will
    fail if either the cgroup already has other cgroups created below it,
    or if the parent cgroup has use_hierarchy enabled."
    
    memcg_control_test.sh sets global memory.use_hierarchy value to 1 before
    the execution of its own tests but doesn't revert it back to 0 after
    they complete.
    
    It causes failures of memcg_stat_test.sh and memcg_use_hierarchy_test.sh
    testcases if runtest/controllers is run twice on the same host.
    
    Signed-off-by: Stanislav Kholmanskikh <sta...@or...>

-----------------------------------------------------------------------

Summary of changes:
 .../memcg/control/memcg_control_test.sh            |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
 
diff --git a/testcases/kernel/controllers/memcg/control/memcg_control_test.sh b/testcases/kernel/controllers/memcg/control/memcg_control_test.sh
index dfc1302..fa50516 100644
--- a/testcases/kernel/controllers/memcg/control/memcg_control_test.sh
+++ b/testcases/kernel/controllers/memcg/control/memcg_control_test.sh
@@ -146,6 +146,8 @@ while [ $TST_NUM -le $TST_TOTAL ]; do
 	: $((TST_NUM += 1))
 done
 
+echo 0 > mnt/memory.use_hierarchy 2> /dev/null
+
 cleanup
 
 if [ "$FAILED_CNT" -ne 0 ]; then


hooks/post-receive
-- 
ltp