test/sandbox: separate test tool source

This improves readability and allows gofmt to format the file.

Signed-off-by: Ophestra <cat@gensokyo.uk>

4 files changed, 35 insertions, 48 deletions

diff --git a/test/configuration.nix b/test/configuration.nix
index 75439fcd..6f941706 100644
--- a/test/configuration.nix
+++ b/test/configuration.nix
@@ -5,15 +5,7 @@
   ...
 }:
 let
-  testCases = import ./sandbox/case {
-    inherit (pkgs)
-      lib
-      callPackage
-      writeText
-      foot
-      ;
-    inherit (config.environment.fortify.package) version;
-  };
+  testCases = import ./sandbox/case pkgs config.environment.fortify.package.version;
 in
 {
   users.users = {
diff --git a/test/sandbox/assert.nix b/test/sandbox/assert.nix
deleted file mode 100644
index 78711086..00000000
--- a/test/sandbox/assert.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  writeText,
-  buildGoModule,
-  pkg-config,
-  util-linux,
-
-  version,
-}:
-buildGoModule {
-  pname = "check-sandbox";
-  inherit version;
-
-  src = ../.;
-  vendorHash = null;
-
-  buildInputs = [ util-linux ];
-  nativeBuildInputs = [ pkg-config ];
-
-  preBuild = ''
-    go mod init git.gensokyo.uk/security/fortify/test >& /dev/null
-    cp ${writeText "main.go" ''
-      package main
-
-      import "os"
-      import "git.gensokyo.uk/security/fortify/test/sandbox"
-
-      func main() { (&sandbox.T{FS: os.DirFS("/")}).MustCheckFile(os.Args[1], "/tmp/sandbox-ok") }
-    ''} main.go
-  '';
-}
diff --git a/test/sandbox/case/default.nix b/test/sandbox/case/default.nix
index d00eabf9..c4bfb401 100644
--- a/test/sandbox/case/default.nix
+++ b/test/sandbox/case/default.nix
@@ -1,12 +1,14 @@
-{
-  lib,
-  callPackage,
-  writeText,
-  foot,
-
-  version,
-}:
+pkgs: version:
 let
+  inherit (pkgs)
+    lib
+    writeText
+    buildGoModule
+    pkg-config
+    util-linux
+    foot
+    ;
+
   fs = mode: dir: data: {
     mode = lib.fromHexString mode;
     inherit
@@ -30,7 +32,21 @@ let
       ;
   };
 
-  checkSandbox = callPackage ../assert.nix { inherit version; };
+  checkSandbox = buildGoModule {
+    pname = "check-sandbox";
+    inherit version;
+
+    src = ../../.;
+    vendorHash = null;
+
+    buildInputs = [ util-linux ];
+    nativeBuildInputs = [ pkg-config ];
+
+    preBuild = ''
+      go mod init git.gensokyo.uk/security/fortify/test >& /dev/null
+      cp ${./main.go} main.go
+    '';
+  };
 
   callTestCase =
     path:
diff --git a/test/sandbox/case/main.go b/test/sandbox/case/main.go
new file mode 100644
index 00000000..59c80efb
--- /dev/null
+++ b/test/sandbox/case/main.go
@@ -0,0 +1,9 @@
+package main
+
+import (
+	"os"
+
+	"git.gensokyo.uk/security/fortify/test/sandbox"
+)
+
+func main() { (&sandbox.T{FS: os.DirFS("/")}).MustCheckFile(os.Args[1], "/tmp/sandbox-ok") }