tests: Don't hardcode the cgroup list

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv
index 0108b2d3cfb726654f32c4e04e53d4eb11c08d1b..01ae8282fd2c1b9e4baf97521dfea9e4f01a7bff 100755 (executable)
--- a/src/tests/lxc-test-unpriv
+++ b/src/tests/lxc-test-unpriv
@@ -94,7 +94,7 @@ chown -R $TUSER /run/user/$(id -u $TUSER)
 cd $HDIR
 
 if [ -e /sys/fs/cgroup/cgmanager/sock ]; then
-       for d in hugetlb cpuset cpu cpuacct memory devices freezer blkio perf_event; do
+       for d in $(grep -v ^# /proc/cgroups | awk '{print $1}'); do
                dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
                        --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.Create \
                        string:$d string:$TUSER >/dev/null

diff --git a/src/tests/lxc-test-usernic.in b/src/tests/lxc-test-usernic.in
index 3618beecdeda7b21734983d3d10c4af01ec2b05a..61535080ce78aeb97a7bf18ffbf8702d4847c8bd 100755 (executable)
--- a/src/tests/lxc-test-usernic.in
+++ b/src/tests/lxc-test-usernic.in
@@ -87,7 +87,7 @@ lxc.id_map = g 0 910000 10000
 EOF
 
 if [ -e /sys/fs/cgroup/cgmanager/sock ]; then
-       for d in hugetlb cpuset cpu cpuacct memory devices freezer blkio perf_event; do
+       for d in $(grep -v ^# /proc/cgroups | awk '{print $1}'); do
                dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
                        --type=method_call /org/linuxcontainers/cgmanager org.linuxcontainers.cgmanager0_0.Create \
                        string:$d string:usernic-user >/dev/null