memcg : fix various test failures
PATCH 1/1 memcg : fix various test failures
In memcg testcases,
1. use /dev/memcg consistently
2. for testcase_25, since 2.6.31, writing -1 to
memory.limit_in_bytes will reset to unlimit.
3. for testcase_35, writing to memory.force_empty for non-empty cgroup should return failure.
---
testcases/kernel/controllers/memcg/functional/memcg_function_test.sh +8 -4
@@ -398,8 +398,12 @@ testcase_24() testcase_25() { echo -1 > memory.limit_in_bytes 2> /dev/null -# result $(( !($? != 0) )) "return value is $?" //lizf - result $(( !($? == 0) )) "return value is $?" + tst_kvercmp 2 6 31 + if [ $? -eq 0 ]; then + result $(( !($? != 0) )) "return value is $?" + else + result $(( !($? == 0) )) "return value is $?" + fi } testcase_26()
@@ -488,8 +492,8 @@ testcase_35() { # writing to non-empty top mem cgroup's force_empty # should return failure - echo 1 > /memcg/memory.force_empty 2> /dev/null - result $(( $? )) "return value is $?" + echo 1 > /dev/memcg/memory.force_empty 2> /dev/null + result $(( !$? )) "return value is $?" } # Case 36 - 38: Test that group and subgroup have no relationship
testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh +3 -3
@@ -68,11 +68,11 @@ run_stress() for ((i = 0; i < $1; i++)) { - mkdir /memcg/$i 2> /dev/null + mkdir /dev/memcg/$i 2> /dev/null ./memcg_process_stress $2 $3 & pid[$i]=$! - echo ${pid[$i]} > /memcg/$i/tasks + echo ${pid[$i]} > /dev/memcg/$i/tasks } for ((i = 0; i < $1; i++))
@@ -87,7 +87,7 @@ run_stress() /bin/kill -s SIGINT ${pid[$i]} 2> /dev/null wait ${pid[$i]} - rmdir /memcg/$i 2> /dev/null + rmdir /dev/memcg/$i 2> /dev/null } cleanup;
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
Quoted 11 lines · liubo
In memcg testcases,
1. use
/dev/memcgconsistently2. for
testcase_25, since 2.6.31, writing -1 to
memory.limit_in_bytes will reset to unlimit.3. for
testcase_35, writing to memory.force_empty for non-empty cgroup should return failure.Signed-off-by Liu Bo <[email protected]>
Thanks.
Regards--
Subrata
Quoted 62 lines
---
testcases/kernel/controllers/memcg/functional/memcg_function_test.sh +8
-4@@ -398,8 +398,12 @@ testcase_24() testcase_25() { echo -1 > memory.limit_in_bytes 2> /dev/null -# result $(( !($? != 0) )) "return value is $?" //lizf - result $(( !($? == 0) )) "return value is $?" + tst_kvercmp 2 6 31 + if [ $? -eq 0 ]; then + result $(( !($? != 0) )) "return value is $?" + else + result $(( !($? == 0) )) "return value is $?" + fi } testcase_26()@@ -488,8 +492,8 @@ testcase_35() { # writing to non-empty top mem cgroup's force_empty # should return failure - echo 1 > /memcg/memory.force_empty 2> /dev/null - result $(( $? )) "return value is $?" + echo 1 > /dev/memcg/memory.force_empty 2> /dev/null + result $(( !$? )) "return value is $?" } # Case 36 - 38: Test that group and subgroup have no relationshiptestcases/kernel/controllers/memcg/stress/memcg_stress_test.sh +3
-4@@ -68,11 +68,11 @@ run_stress() for ((i = 0; i < $1; i++)) { - mkdir /memcg/$i 2> /dev/null + mkdir /dev/memcg/$i 2> /dev/null ./memcg_process_stress $2 $3 & pid[$i]=$! - echo ${pid[$i]} > /memcg/$i/tasks + echo ${pid[$i]} > /dev/memcg/$i/tasks } for ((i = 0; i < $1; i++))@@ -87,7 +87,7 @@ run_stress() /bin/kill -s SIGINT ${pid[$i]} 2> /dev/null wait ${pid[$i]} - rmdir /memcg/$i 2> /dev/null + rmdir /dev/memcg/$i 2> /dev/null } cleanup; ------------------------------------------------------------------------------Come build with us! The BlackBerry® Developer Conference in SF, CA
Quoted 8 lines
is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list