diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-02-19 16:28:36 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-02-19 17:03:14 +0100 |
| commit | 6d0e73864d28794cdbd26ab7b37259ab0e1e044c (patch) | |
| tree | 37e3e3ab07e491739035464e2bedd510e8407af1 | |
| parent | 04b5e6c27190cb77ece33503715357473b445531 (diff) | |
| download | spectrum-6d0e73864d28794cdbd26ab7b37259ab0e1e044c.tar spectrum-6d0e73864d28794cdbd26ab7b37259ab0e1e044c.tar.gz spectrum-6d0e73864d28794cdbd26ab7b37259ab0e1e044c.tar.bz2 spectrum-6d0e73864d28794cdbd26ab7b37259ab0e1e044c.tar.lz spectrum-6d0e73864d28794cdbd26ab7b37259ab0e1e044c.tar.xz spectrum-6d0e73864d28794cdbd26ab7b37259ab0e1e044c.tar.zst spectrum-6d0e73864d28794cdbd26ab7b37259ab0e1e044c.zip | |
host/start-vm: add run-spectrum-vm to tests
release/checks/start-vm.nix wasn't actually imported anywhere, so it
didn't do anything unless it was built on its own.
We could have listed it in release/checks/default.nix, but I think it
makes more sense to have it in start-vm's passthru.tests, so it's more
obvious that it should be run when changing start-vm.
Fixes: 009a036 ("release/checks/start-vm.nix: init")
Signed-off-by: Alyssa Ross <hi@alyssa.is>
| -rw-r--r-- | host/start-vm/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/default.nix | 1 | ||||
| -rw-r--r-- | release/checks/start-vm.nix | 9 |
3 files changed, 4 insertions, 10 deletions
diff --git a/host/start-vm/default.nix b/host/start-vm/default.nix index 9a7440e..1777d8a 100644 --- a/host/start-vm/default.nix +++ b/host/start-vm/default.nix @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2022-2023 Alyssa Ross <hi@alyssa.is> import ../../lib/call-package.nix ( -{ src, lib, stdenv, meson, ninja, rustc, clippy }: +{ src, lib, stdenv, meson, ninja, rustc, clippy, run-spectrum-vm }: stdenv.mkDerivation (finalAttrs: { name = "start-vm"; @@ -28,6 +28,8 @@ stdenv.mkDerivation (finalAttrs: { postBuild = ''touch $out && exit 0''; } ); + + run = run-spectrum-vm.override { start-vm = finalAttrs.finalPackage; }; }; meta = { diff --git a/pkgs/default.nix b/pkgs/default.nix index 0d4091f..ed2762d 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -30,6 +30,7 @@ let lseek = self.callSpectrumPackage ../tools/lseek {}; rootfs = self.callSpectrumPackage ../host/rootfs {}; start-vm = self.callSpectrumPackage ../host/start-vm {}; + run-spectrum-vm = self.callSpectrumPackage ../scripts/run-spectrum-vm.nix {}; # Packages from the overlay, so it's possible to build them from # the CLI easily. diff --git a/release/checks/start-vm.nix b/release/checks/start-vm.nix deleted file mode 100644 index ec24f4b..0000000 --- a/release/checks/start-vm.nix +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: MIT -# SPDX-FileCopyrightText: 2023 Alyssa Ross <hi@alyssa.is> - -import ../../lib/call-package.nix ( -{ callSpectrumPackage, runCommand }: - -runCommand "start-vm-test" {} '' - ${callSpectrumPackage ../../scripts/run-spectrum-vm.nix {}} > $out -'') (_: {}) |