From 2d379b5a3884e1b3ffbc9a8be69788810340506e Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sun, 23 Mar 2025 15:00:59 +0900 Subject: test/sandbox: pass want file as argument This avoids building the check program multiple times. Signed-off-by: Ophestra --- test/sandbox/assert.nix | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'test/sandbox/assert.nix') diff --git a/test/sandbox/assert.nix b/test/sandbox/assert.nix index d45e4cb9..2ab075f4 100644 --- a/test/sandbox/assert.nix +++ b/test/sandbox/assert.nix @@ -3,22 +3,9 @@ buildGoModule, version, - name, - want, }: -let - wantFile = writeText "fortify-${name}-want.json" (builtins.toJSON want); - mainFile = writeText "main.go" '' - package main - - import "os" - import "git.gensokyo.uk/security/fortify/test/sandbox" - - func main() { (&sandbox.T{FS: os.DirFS("/"), PMountsPath: "/.fortify/mounts"}).MustCheckFile("${wantFile}") } - ''; -in buildGoModule { - pname = "fortify-${name}-check-sandbox"; + pname = "check-sandbox"; inherit version; src = ../.; @@ -26,6 +13,13 @@ buildGoModule { preBuild = '' go mod init git.gensokyo.uk/security/fortify/test >& /dev/null - cp ${mainFile} main.go + cp ${writeText "main.go" '' + package main + + import "os" + import "git.gensokyo.uk/security/fortify/test/sandbox" + + func main() { (&sandbox.T{FS: os.DirFS("/"), PMountsPath: "/.fortify/mounts"}).MustCheckFile(os.Args[1]) } + ''} main.go ''; } -- cgit v1.3.1