test/sandbox: bind /var/tmp writable
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
		
			
				
	
				Test / Hakurei (push) Successful in 45s
				
			
		
			
				
	
				Test / Hakurei (race detector) (push) Successful in 45s
				
			
		
			
				
	
				Test / Create distribution (push) Successful in 38s
				
			
		
			
				
	
				Test / Hpkg (push) Successful in 46s
				
			
		
			
				
	
				Test / Sandbox (push) Successful in 1m36s
				
			
		
			
				
	
				Test / Sandbox (race detector) (push) Successful in 2m29s
				
			
		
			
				
	
				Test / Flake checks (push) Successful in 1m23s
				
			
		
		
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	Test / Hakurei (push) Successful in 45s
				
			Test / Hakurei (race detector) (push) Successful in 45s
				
			Test / Create distribution (push) Successful in 38s
				
			Test / Hpkg (push) Successful in 46s
				
			Test / Sandbox (push) Successful in 1m36s
				
			Test / Sandbox (race detector) (push) Successful in 2m29s
				
			Test / Flake checks (push) Successful in 1m23s
				
			This makes it possible to place markers with private tmpdir. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
		
							parent
							
								
									70e02090f7
								
							
						
					
					
						commit
						d0ddd71934
					
				| @ -64,6 +64,18 @@ let | ||||
|         "-s" | ||||
|         tc.expectedFilter.${system} | ||||
|       ]; | ||||
| 
 | ||||
|       extraPaths = | ||||
|         if tc.useCommonPaths then | ||||
|           [ ] | ||||
|         else | ||||
|           [ | ||||
|             { | ||||
|               type = "bind"; | ||||
|               src = "/var/tmp"; | ||||
|               write = true; | ||||
|             } | ||||
|           ]; | ||||
|     }; | ||||
| 
 | ||||
|   testCaseName = name: "cat.gensokyo.hakurei.test." + name; | ||||
|  | ||||
| @ -169,6 +169,7 @@ in | ||||
|       } null; | ||||
|       usr = fs "800001c0" { bin = fs "800001ed" { env = fs "80001ff" null null; } null; } null; | ||||
|       var = fs "800001c0" { | ||||
|         tmp = fs "801001ff" null null; | ||||
|         lib = fs "800001c0" { | ||||
|           hakurei = fs "800001c0" { | ||||
|             u0 = fs "800001c0" { | ||||
| @ -226,6 +227,7 @@ in | ||||
|       (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/tmp" "/var/tmp" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") | ||||
|       (ent "/var/cache" "/var/cache" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") | ||||
|       (ent "/" "/.hakurei/.ro-store" "rw,relatime" "overlay" "overlay" "ro,lowerdir=/host/nix/.ro-store:/host/nix/.rw-store/upper,redirect_dir=nofollow,userxattr") | ||||
|       (ent "/" "/.hakurei/store" "rw,relatime" "overlay" "overlay" "rw,lowerdir=/host/nix/.ro-store:/host/nix/.rw-store/upper,upperdir=/host/tmp/.hakurei-store-rw/upper,workdir=/host/tmp/.hakurei-store-rw/work,redirect_dir=nofollow,userxattr") | ||||
|  | ||||
| @ -192,6 +192,7 @@ in | ||||
|       tmp = fs "800001f8" { } null; | ||||
|       usr = fs "800001c0" { bin = fs "800001ed" { env = fs "80001ff" null null; } null; } null; | ||||
|       var = fs "800001c0" { | ||||
|         tmp = fs "801001ff" null null; | ||||
|         lib = fs "800001c0" { | ||||
|           hakurei = fs "800001c0" { | ||||
|             u0 = fs "800001c0" { | ||||
| @ -253,6 +254,7 @@ in | ||||
|       (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/tmp" "/var/tmp" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") | ||||
|       (ent "/var/cache" "/var/cache" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") | ||||
|       (ent "/" "/.hakurei/.ro-store" "rw,relatime" "overlay" "overlay" "ro,lowerdir=/host/nix/.ro-store:/host/nix/.rw-store/upper,redirect_dir=nofollow,userxattr") | ||||
|       (ent "/" "/.hakurei/store" "rw,relatime" "overlay" "overlay" "rw,lowerdir=/host/nix/.ro-store:/host/nix/.rw-store/upper,upperdir=/host/tmp/.hakurei-store-rw/upper,workdir=/host/tmp/.hakurei-store-rw/work,redirect_dir=nofollow,userxattr") | ||||
|  | ||||
| @ -190,6 +190,7 @@ in | ||||
|       tmp = fs "800001f8" { } null; | ||||
|       usr = fs "800001c0" { bin = fs "800001ed" { env = fs "80001ff" null null; } null; } null; | ||||
|       var = fs "800001c0" { | ||||
|         tmp = fs "801001ff" null null; | ||||
|         lib = fs "800001c0" { | ||||
|           hakurei = fs "800001c0" { | ||||
|             u0 = fs "800001c0" { | ||||
| @ -251,6 +252,7 @@ in | ||||
|       (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/tmp" "/var/tmp" "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 "/var/lib/hakurei/u0/a5" "/var/lib/hakurei/u0/a5" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") | ||||
|       (ent "/" "/run/user" "rw,nosuid,nodev,relatime" "tmpfs" "ephemeral" "rw,size=4k,mode=755,uid=1000005,gid=1000005") | ||||
|  | ||||
| @ -189,6 +189,7 @@ in | ||||
|       tmp = fs "800001f8" { } null; | ||||
|       usr = fs "800001c0" { bin = fs "800001ed" { env = fs "80001ff" null null; } null; } null; | ||||
|       var = fs "800001c0" { | ||||
|         tmp = fs "801001ff" null null; | ||||
|         lib = fs "800001c0" { | ||||
|           hakurei = fs "800001c0" { | ||||
|             u0 = fs "800001c0" { | ||||
| @ -249,6 +250,7 @@ in | ||||
|       (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/tmp" "/var/tmp" "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 "/var/lib/hakurei/u0/a1" "/var/lib/hakurei/u0/a1" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") | ||||
|       (ent "/" "/run/user" "rw,nosuid,nodev,relatime" "tmpfs" "ephemeral" "rw,size=4k,mode=755,uid=1000001,gid=1000001") | ||||
|  | ||||
| @ -196,6 +196,7 @@ in | ||||
|       } null; | ||||
|       usr = fs "800001c0" { bin = fs "800001ed" { env = fs "80001ff" null null; } null; } null; | ||||
|       var = fs "800001c0" { | ||||
|         tmp = fs "801001ff" null null; | ||||
|         lib = fs "800001c0" { | ||||
|           hakurei = fs "800001c0" { | ||||
|             u0 = fs "800001c0" { | ||||
| @ -258,6 +259,7 @@ in | ||||
|       (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/tmp" "/var/tmp" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") | ||||
|       (ent "/var/cache" "/var/cache" "rw,nosuid,nodev,relatime" "ext4" "/dev/disk/by-label/nixos" "rw") | ||||
|       (ent "/" "/.hakurei/.ro-store" "rw,relatime" "overlay" "overlay" "ro,lowerdir=/host/nix/.ro-store:/host/nix/.rw-store/upper,redirect_dir=nofollow,userxattr") | ||||
|       (ent "/" "/.hakurei/store" "rw,relatime" "overlay" "overlay" "rw,lowerdir=/host/nix/.ro-store:/host/nix/.rw-store/upper,upperdir=/host/tmp/.hakurei-store-rw/upper,workdir=/host/tmp/.hakurei-store-rw/work,redirect_dir=nofollow,uuid=on,userxattr") | ||||
|  | ||||
| @ -77,6 +77,11 @@ in | ||||
|     }; | ||||
| 
 | ||||
|     commonPaths = [ | ||||
|       { | ||||
|         type = "bind"; | ||||
|         src = "/var/tmp"; | ||||
|         write = true; | ||||
|       } | ||||
|       { | ||||
|         type = "bind"; | ||||
|         src = "/var/cache"; | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user