patches and low-level development discussion
 help / color / mirror / code / Atom feed
From: Alyssa Ross <hi@alyssa.is>
To: devel@spectrum-os.org
Cc: Demi Marie Obenour <demiobenour@gmail.com>
Subject: [PATCH] release/checks/integration: adjust timeout when no KVM
Date: Sun, 26 Oct 2025 14:09:57 +0100	[thread overview]
Message-ID: <20251026130956.106608-2-hi@alyssa.is> (raw)

We never use KVM for these on aarch64, but KVM may also not be used on
x86_64 if it's unavailable.  Checking for write access to /dev/kvm
should be a decent proxy for that.

Signed-off-by: Alyssa Ross <hi@alyssa.is>
---
Demi, hopefully this can make development on Qubes OS a bit less 
annoying (albiet still slow).

 release/checks/integration/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/release/checks/integration/default.nix b/release/checks/integration/default.nix
index 5709186..eb3be07 100644
--- a/release/checks/integration/default.nix
+++ b/release/checks/integration/default.nix
@@ -65,10 +65,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
   dontAddTimeoutMultiplier = true;
-  mesonCheckFlags = lib.optionals stdenv.hostPlatform.isAarch64 [
-    # Tests are run with TCG on aarch64.
-    "--timeout-multiplier=15"
-  ];
+  preCheck = ''
+    if [ -n "$FORCE_LONG_TIMEOUTS" ] || ! [ -w /dev/kvm ]; then
+      mesonCheckFlagsArray+=(--timeout-multiplier=15)
+    fi
+  '';
 
   installPhase = ''
     runHook preInstall
@@ -83,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
   env = {
     QEMU_SYSTEM = "qemu-system-${stdenv.hostPlatform.qemuArch} -nographic";
     EFI_PATH = "${qemu_kvm}/share/qemu/edk2-${stdenv.hostPlatform.qemuArch}-code.fd";
+    FORCE_LONG_TIMEOUTS = toString stdenv.buildPlatform.isAarch64;
     IMG_PATH = live;
     USER_DATA_PATH = userData;
   };
-- 
2.51.0


                 reply	other threads:[~2025-10-26 13:10 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251026130956.106608-2-hi@alyssa.is \
    --to=hi@alyssa.is \
    --cc=demiobenour@gmail.com \
    --cc=devel@spectrum-os.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://spectrum-os.org/git/crosvm
	https://spectrum-os.org/git/doc
	https://spectrum-os.org/git/mktuntap
	https://spectrum-os.org/git/nixpkgs
	https://spectrum-os.org/git/spectrum
	https://spectrum-os.org/git/ucspi-vsock
	https://spectrum-os.org/git/www

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).