libcgroup Test: libcgrouptest-fix-cntlr-order-error-in-script

Sometimes on some machines, encounterd an issue of getting the controllers
information in reverse order. So keeping the uniformity for future.

Signed-off-by: Sudhir Kumar <skumar@linux.vnet.ibm.com>
git-svn-id: https://libcg.svn.sourceforge.net/svnroot/libcg/trunk@273 4f4bb910-9a46-0410-90c8-c897d4f1cd53

diff --git a/tests/libcgrouptest.h b/tests/libcgrouptest.h
index 0b10415796216b3910973554154dd375fbcf2c07..c04eaa665344bff26e3969bfaa95c84b2cfd4491 100644 (file)
--- a/tests/libcgrouptest.h
+++ b/tests/libcgrouptest.h
@@ -43,8 +43,8 @@ enum cgroup_mount_t {
 };
 
 enum controller_t {
-       MEMORY,
        CPU,
+       MEMORY,
        CPUSET,
        /* Add new controllers here */
 };

diff --git a/tests/runlibcgrouptest.sh b/tests/runlibcgrouptest.sh
index 843b44b67fd906d2a13e434a29b191df3f438e6f..c34ca0a2070c8f1685f6f2b06e81241ed521db37 100644 (file)
--- a/tests/runlibcgrouptest.sh
+++ b/tests/runlibcgrouptest.sh
@@ -252,7 +252,7 @@ mount_fs ()
                        echo "WARN: Earlier groups found and removed...";
                fi;
 
-               debug "cgroup filesystem mounted on $NEWTARGET  directory"
+               debug "$CONTROLLERS controllers mounted on $NEWTARGET  directory"
        done;
 
        if [ $FS_MOUNTED -gt 2 ]
@@ -274,8 +274,8 @@ get_ctl_num()
        # Add any new controller developed here
        declare -a ctl_list;
        # Following list has to be in sync with enums in header
-       ctl_list[0]="memory";
-       ctl_list[1]="cpu";
+       ctl_list[0]="cpu";
+       ctl_list[1]="memory";
        ctl_list[2]="cpuset";
 
        local i=0;