From d208e9dd9f5187db202485cbd5d623018228e3f2 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 16 Jun 2024 16:40:20 +0200
Subject: [PATCH] tests: Add quickBuild to all VM tests

---
 tests/nixos/default.nix                      | 8 +++++++-
 tests/nixos/functional/common.nix            | 5 -----
 tests/nixos/{functional => }/quick-build.nix | 0
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename tests/nixos/{functional => }/quick-build.nix (100%)

diff --git a/tests/nixos/default.nix b/tests/nixos/default.nix
index 2ab00b336..512195a67 100644
--- a/tests/nixos/default.nix
+++ b/tests/nixos/default.nix
@@ -7,7 +7,13 @@ let
   # https://nixos.org/manual/nixos/unstable/index.html#sec-calling-nixos-tests
   runNixOSTestFor = system: test:
     (nixos-lib.runTest {
-      imports = [ test ];
+      imports = [
+        test
+
+        # Add the quickBuild attribute to the check packages
+        ./quick-build.nix
+      ];
+
       hostPkgs = nixpkgsFor.${system}.native;
       defaults = {
         nixpkgs.pkgs = nixpkgsFor.${system}.native;
diff --git a/tests/nixos/functional/common.nix b/tests/nixos/functional/common.nix
index 493791a7b..51fd76884 100644
--- a/tests/nixos/functional/common.nix
+++ b/tests/nixos/functional/common.nix
@@ -8,11 +8,6 @@ let
 
 in
 {
-  imports = [
-    # Add the quickBuild attribute to the check package
-    ./quick-build.nix
-  ];
-
   # We rarely change the script in a way that benefits from type checking, so
   # we skip it to save time.
   skipTypeCheck = true;
diff --git a/tests/nixos/functional/quick-build.nix b/tests/nixos/quick-build.nix
similarity index 100%
rename from tests/nixos/functional/quick-build.nix
rename to tests/nixos/quick-build.nix