[PATCH] selinux-testsuite: fix the cgroups_label test

[Paul Moore <paul@xxxxxxxxxxxxxx>]

From: Paul Moore <paul@xxxxxxxxxxxxxx>

We can't rely on /sys/fs/cgroups/unified anymore, use our own directory.

Signed-off-by: Paul Moore <paul@xxxxxxxxxxxxxx>
---
 tests/cgroupfs_label/test |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/tests/cgroupfs_label/test b/tests/cgroupfs_label/test
index 127e802..385b953 100755
--- a/tests/cgroupfs_label/test
+++ b/tests/cgroupfs_label/test
@@ -5,24 +5,23 @@ BEGIN { plan tests => 2 }
 
 my $ret;
 
+my $dir = "/sys/fs/cgroup/selinuxtest";
+
 # Create a new cgroupfs directory and relabel it.
-mkdir("/sys/fs/cgroup/unified/test");
-system("chcon -R -t test_cgroup_t /sys/fs/cgroup/unified/test");
+mkdir("$dir");
+system("chcon -R -t test_cgroup_t $dir");
 
 # Create a subdirectory in it.
-mkdir("/sys/fs/cgroup/unified/test/subdir");
+mkdir("$dir/subdir");
 
-$ret =
-  system("test `secon -tf /sys/fs/cgroup/unified/test/subdir` = test_cgroup_t");
+$ret = system("secon -tf $dir/subdir | grep -q '^test_cgroup_t\$'");
 ok( $ret, 0 );    # Did the subdirectory inherit the parent's label?
 
-$ret = system(
-"test `secon -tf /sys/fs/cgroup/unified/test/subdir/cgroup.type` = test_cgroup_t"
-);
+$ret = system("secon -tf $dir/subdir/cgroup.type | grep -q '^test_cgroup_t\$'");
 ok( $ret, 0 );    # Did also files in the subdirectory inherit the label?
 
 # Cleanup.
-rmdir("/sys/fs/cgroup/unified/test/subdir");
-rmdir("/sys/fs/cgroup/unified/test");
+rmdir("$dir/subdir");
+rmdir("$dir");
 
 exit;