[Ltp-commits] [Git] ltp updated.

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

The branch, master, has been updated
       via  4177e38064cd4c35176132c5c38ac54e07f9033f (commit)
      from  df737303b55e7d2847661e0c3a779672a2ab1752 (commit)


- Log -----------------------------------------------------------------
commit 4177e38064cd4c35176132c5c38ac54e07f9033f
Author: Shuang Qiu <shu...@or...>
Date:   Tue Oct 22 17:22:34 2013 +0800

    Fix cgroup_regression_test.sh script issue
    
    Testcase cgroup sometimes fail although there is no bug found.
    Initialize the exit status to fix it.
    Using "rmdir cgroup/" to clean up test_dir sometimes failed because
    there may be subdir not removed in cgroup/.
    Using "rmdir -p cgroup/*" instead.
    
    Signed-off-by: Shuang Qiu <shu...@or...>
    Acked-by: Cyril Hrubis <ch...@su...>
    Reviewed-by: Wanlong Gao <gao...@cn...>

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

Summary of changes:
 .../controllers/cgroup/cgroup_regression_test.sh   |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
 
diff --git a/testcases/kernel/controllers/cgroup/cgroup_regression_test.sh b/testcases/kernel/controllers/cgroup/cgroup_regression_test.sh
index f5e0b4b..356c000 100755
--- a/testcases/kernel/controllers/cgroup/cgroup_regression_test.sh
+++ b/testcases/kernel/controllers/cgroup/cgroup_regression_test.sh
@@ -28,6 +28,8 @@ export TCID="cgroup_regression_test"
 export TST_TOTAL=10
 export TST_COUNT=1
 
+failed=0
+
 tst_kvercmp 2 6 29
 if [ $? -eq 0 ]; then
 	tst_brkm TCONF ignored "test must be run with kernel 2.6.29 or newer"
@@ -523,7 +525,7 @@ for ((cur = 1; cur <= $TST_TOTAL; cur++))
 	test_$cur
 }
 
-rmdir cgroup/
+rmdir -p cgroup/*
 
 exit $failed
 


hooks/post-receive
-- 
ltp