From bbb7b7a4cb906bdeaf46ab664ce67a0a27b9ef5d Mon Sep 17 00:00:00 2001
Message-Id: <bbb7b7a4cb906bdeaf46ab664ce67a0a27b9ef5d@dist-git>
From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 1 Jul 2019 17:07:54 +0200
Subject: [PATCH] vircgroupmock: change cgroup prefix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove the trailing '/' from prefix.  This change is required in order
to introduce tests for unified cgroups.  They are usually mounted in
'/sys/fs/cgroup'.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
(cherry picked from commit 9bd1979e37ca703f8e29c2dfca83a9cd04af2982)

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Message-Id: <cdff08c2966b44ad1c3c7d166fc39c20f4bd0ba2.1561993100.git.phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 tests/vircgroupmock.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c
index 3afe2fe192..fcc00a7a7b 100644
--- a/tests/vircgroupmock.c
+++ b/tests/vircgroupmock.c
@@ -58,7 +58,7 @@ const char *fakedevicedir0 = FAKEDEVDIR0;
 const char *fakedevicedir1 = FAKEDEVDIR1;
 
 
-# define SYSFS_CGROUP_PREFIX "/not/really/sys/fs/cgroup/"
+# define SYSFS_CGROUP_PREFIX "/not/really/sys/fs/cgroup"
 # define SYSFS_CPU_PRESENT "/sys/devices/system/cpu/present"
 # define SYSFS_CPU_PRESENT_MOCKED "devices_system_cpu_present"
 
@@ -356,7 +356,7 @@ int access(const char *path, int mode)
     if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
         init_sysfs();
         char *newpath;
-        if (asprintf(&newpath, "%s/%s",
+        if (asprintf(&newpath, "%s%s",
                      fakesysfscgroupdir,
                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
             errno = ENOMEM;
@@ -388,7 +388,7 @@ int __lxstat(int ver, const char *path, struct stat *sb)
     if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
         init_sysfs();
         char *newpath;
-        if (asprintf(&newpath, "%s/%s",
+        if (asprintf(&newpath, "%s%s",
                      fakesysfscgroupdir,
                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
             errno = ENOMEM;
@@ -419,7 +419,7 @@ int lstat(const char *path, struct stat *sb)
     if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
         init_sysfs();
         char *newpath;
-        if (asprintf(&newpath, "%s/%s",
+        if (asprintf(&newpath, "%s%s",
                      fakesysfscgroupdir,
                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
             errno = ENOMEM;
@@ -450,7 +450,7 @@ int __xstat(int ver, const char *path, struct stat *sb)
     if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
         init_sysfs();
         char *newpath;
-        if (asprintf(&newpath, "%s/%s",
+        if (asprintf(&newpath, "%s%s",
                      fakesysfscgroupdir,
                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
             errno = ENOMEM;
@@ -489,7 +489,7 @@ int stat(const char *path, struct stat *sb)
         }
     } else if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
         init_sysfs();
-        if (asprintf(&newpath, "%s/%s",
+        if (asprintf(&newpath, "%s%s",
                      fakesysfscgroupdir,
                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
             errno = ENOMEM;
@@ -521,7 +521,7 @@ int mkdir(const char *path, mode_t mode)
     if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
         init_sysfs();
         char *newpath;
-        if (asprintf(&newpath, "%s/%s",
+        if (asprintf(&newpath, "%s%s",
                      fakesysfscgroupdir,
                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
             errno = ENOMEM;
@@ -554,7 +554,7 @@ int open(const char *path, int flags, ...)
 
     if (STRPREFIX(path, SYSFS_CGROUP_PREFIX)) {
         init_sysfs();
-        if (asprintf(&newpath, "%s/%s",
+        if (asprintf(&newpath, "%s%s",
                      fakesysfscgroupdir,
                      path + strlen(SYSFS_CGROUP_PREFIX)) < 0) {
             errno = ENOMEM;
-- 
2.22.0