From a53074e0be0becc4f58bc650f1ce9597e68d096d Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@tcn1.local.snellius.surf.nl>
Date: Tue, 20 Aug 2024 11:59:47 +0200
Subject: [PATCH] get cpuset file from host as well

---
 bot/test.sh   | 2 +-
 test_suite.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bot/test.sh b/bot/test.sh
index d3f3630ea8..4a917af91e 100755
--- a/bot/test.sh
+++ b/bot/test.sh
@@ -206,7 +206,7 @@ else
 fi
 # Bind mount /sys/fs/cgroup so that we can determine the amount of memory available in our cgroup for
 # Reframe configuration
-TEST_STEP_ARGS+=("--extra-bind-paths" "/sys/fs/cgroup:/hostsys/fs/cgroup:ro")
+TEST_STEP_ARGS+=("--extra-bind-paths" "/sys/fs/cgroup:/hostsys/fs/cgroup:ro,/proc/self:/hostproc/self:ro"")
 
 # prepare arguments to test_suite.sh (specific to test step)
 declare -a TEST_SUITE_ARGS=()
diff --git a/test_suite.sh b/test_suite.sh
index 7c3b7bfb0f..6f42547df0 100755
--- a/test_suite.sh
+++ b/test_suite.sh
@@ -164,8 +164,8 @@ if [[ "${cpuinfo}" =~ (Core\(s\) per socket:[^0-9]*([0-9]+)) ]]; then
 else
     fatal_error "Failed to get the number of cores per socket for the current test hardware with lscpu."
 fi
-cgroup_v1_mem_limit="/hostsys/fs/cgroup/memory/$(</proc/self/cpuset)/memory.limit_in_bytes"
-cgroup_v2_mem_limit="/hostsys/fs/cgroup/$(</proc/self/cpuset)/memory.max"
+cgroup_v1_mem_limit="/hostsys/fs/cgroup/memory/$(</hostproc/self/cpuset)/memory.limit_in_bytes"
+cgroup_v2_mem_limit="/hostsys/fs/cgroup/$(</hostproc/self/cpuset)/memory.max"
 echo "cpuset_file: $(</proc/self/cpuset)"
 echo "ls -al /hostsys/fs/cgroup/memory/$(</proc/self/cpuset)"
 ls -al "/hostsys/fs/cgroup/memory/$(</proc/self/cpuset)"