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