6 files changed, 26 insertions, 2 deletions
diff --git a/test/sandbox/case/default.nix b/test/sandbox/case/default.nix
index 3a8c4ec1..d860b1e5 100644
--- a/test/sandbox/case/default.nix
+++ b/test/sandbox/case/default.nix
@@ -37,7 +37,12 @@ let
     {
       name = "check-sandbox-${tc.name}";
       verbose = true;
-      inherit (tc) tty device mapRealUid;
+      inherit (tc)
+        tty
+        device
+        mapRealUid
+        useCommonPaths
+        ;
       share = testProgram;
       packages = [ ];
       path = "${testProgram}/bin/fortify-test";
diff --git a/test/sandbox/case/device.nix b/test/sandbox/case/device.nix
index 389e9f71..173b3e04 100644
--- a/test/sandbox/case/device.nix
+++ b/test/sandbox/case/device.nix
@@ -8,6 +8,7 @@
   tty = false;
   device = true;
   mapRealUid = false;
+  useCommonPaths = true;
 
   want = {
     env = [
@@ -169,6 +170,7 @@
           } null;
         } null;
         run = fs "800001ed" { nscd = fs "800001ed" { } null; } null;
+        cache = fs "800001ed" { private = fs "800001c0" null null; } null;
       } null;
     } null;
 
@@ -190,6 +192,7 @@
       (ent "/dev" "/sys/dev" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw")
       (ent "/devices" "/sys/devices" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw")
       (ent "/dri" "/dev/dri" "rw,nosuid" "devtmpfs" "devtmpfs" ignore)
+      (ent "/var/cache" "/var/cache" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw")
       (ent "/etc" ignore "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw")
       (ent "/" "/run/user" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" "rw,size=4k,mode=755,uid=1000004,gid=1000004")
       (ent "/" "/run/user/65534" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" "rw,size=8192k,mode=700,uid=1000004,gid=1000004")
diff --git a/test/sandbox/case/mapuid.nix b/test/sandbox/case/mapuid.nix
index a68d06cb..21c89c21 100644
--- a/test/sandbox/case/mapuid.nix
+++ b/test/sandbox/case/mapuid.nix
@@ -8,6 +8,7 @@
   tty = false;
   device = false;
   mapRealUid = true;
+  useCommonPaths = true;
 
   want = {
     env = [
@@ -193,6 +194,7 @@
           } null;
         } null;
         run = fs "800001ed" { nscd = fs "800001ed" { } null; } null;
+        cache = fs "800001ed" { private = fs "800001c0" null null; } null;
       } null;
     } null;
 
@@ -218,6 +220,7 @@
       (ent "/dev" "/sys/dev" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw")
       (ent "/devices" "/sys/devices" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw")
       (ent "/dri" "/dev/dri" "rw,nosuid" "devtmpfs" "devtmpfs" ignore)
+      (ent "/var/cache" "/var/cache" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw")
       (ent "/etc" ignore "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw")
       (ent "/" "/run/user" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" "rw,size=4k,mode=755,uid=1000003,gid=1000003")
       (ent "/" "/run/user/1000" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" "rw,size=8192k,mode=700,uid=1000003,gid=1000003")
diff --git a/test/sandbox/case/preset.nix b/test/sandbox/case/preset.nix
index 75ca2e7e..bbea0e47 100644
--- a/test/sandbox/case/preset.nix
+++ b/test/sandbox/case/preset.nix
@@ -8,6 +8,7 @@
   tty = false;
   device = false;
   mapRealUid = false;
+  useCommonPaths = false;
 
   want = {
     env = [
diff --git a/test/sandbox/case/tty.nix b/test/sandbox/case/tty.nix
index ab50d420..72b2c295 100644
--- a/test/sandbox/case/tty.nix
+++ b/test/sandbox/case/tty.nix
@@ -8,6 +8,7 @@
   tty = true;
   device = false;
   mapRealUid = false;
+  useCommonPaths = true;
 
   want = {
     env = [
@@ -194,6 +195,7 @@
           } null;
         } null;
         run = fs "800001ed" { nscd = fs "800001ed" { } null; } null;
+        cache = fs "800001ed" { private = fs "800001c0" null null; } null;
       } null;
     } null;
 
@@ -220,6 +222,7 @@
       (ent "/dev" "/sys/dev" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw")
       (ent "/devices" "/sys/devices" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw")
       (ent "/dri" "/dev/dri" "rw,nosuid" "devtmpfs" "devtmpfs" ignore)
+      (ent "/var/cache" "/var/cache" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw")
       (ent "/etc" ignore "ro,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw")
       (ent "/" "/run/user" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" "rw,size=4k,mode=755,uid=1000002,gid=1000002")
       (ent "/" "/run/user/65534" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" "rw,size=8192k,mode=700,uid=1000002,gid=1000002")
diff --git a/test/sandbox/configuration.nix b/test/sandbox/configuration.nix
index dc96d64d..903b99a3 100644
--- a/test/sandbox/configuration.nix
+++ b/test/sandbox/configuration.nix
@@ -65,7 +65,16 @@ in
     stateDir = "/var/lib/fortify";
     users.alice = 0;
 
-    home-manager = _: _: { home.stateVersion = "23.05"; };
+    extraHomeConfig = {
+      home.stateVersion = "23.05";
+    };
+
+    commonPaths = [
+      {
+        src = "/var/cache";
+        write = true;
+      }
+    ];
 
     apps = with testCases; [
       preset