From: Balbir Singh Date: Wed, 17 Dec 2008 15:06:33 +0000 (+0000) Subject: libcgroup Test: cleanup3 X-Git-Tag: v0.34~188 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03a824bf683520a432dade4343d74b0b44dc1bab;p=thirdparty%2Flibcgroup.git libcgroup Test: cleanup3 Hi, This patch does cleanups in test script. Signed-off-by: Sudhir Kumar git-svn-id: https://libcg.svn.sourceforge.net/svnroot/libcg/trunk@250 4f4bb910-9a46-0410-90c8-c897d4f1cd53 --- diff --git a/tests/runlibcgrouptest.sh b/tests/runlibcgrouptest.sh index 30edc311..f3d64cda 100644 --- a/tests/runlibcgrouptest.sh +++ b/tests/runlibcgrouptest.sh @@ -63,14 +63,14 @@ umount_fs () { while check_mount_fs do - PROC_ENTRY=`cat /proc/mounts|grep cgroup|tr -s [:space:]|cut -d" " -f2`; + PROC_ENTRY=`cat /proc/mounts|grep cgroup|\ + tr -s [:space:]|cut -d" " -f2`; # Get first mountpoint in case of multiple mounts PROC_ENTRY=`echo $PROC_ENTRY|cut -d" " -f1`; if [ ! -z "$PROC_ENTRY" ] then TARGET=$PROC_ENTRY; - # Need to take care if there are tasks running in any group ?? - # Also need to care if cpu and memory are mounted at different places + # Need to take care of running tasks in any group ?? rmdir $TARGET/* 2> /dev/null ; umount $TARGET; rmdir $TARGET; @@ -168,10 +168,10 @@ mount_fs () fi; fi; - mount -t cgroup -o $CONTROLLERS cgroup $NEWTARGET; # 2> /dev/null? + mount -t cgroup -o $CONTROLLERS cgroup $NEWTARGET; if [ $? -ne 0 ] then - echo "ERROR: Could not mount cgroup filesystem on $NEWTARGET." + echo "ERROR: in mounting cgroup fs on $NEWTARGET." echo "Exiting test"; umount_fs; exit -1;