summary refs log tree commit diff
path: root/nixos/lib
diff options
context:
space:
mode:
authorDaniel Fullmer <danielrf12@gmail.com>2022-02-17 17:59:37 -0800
committerDaniel Fullmer <danielrf12@gmail.com>2022-02-17 18:12:24 -0800
commit24fb8720798bb98b72c498c0d7a0bde619a11e67 (patch)
tree3d5094d2ebcffaae3b855149aaa38cd8a29d6635 /nixos/lib
parent97777606991c3a78040c883fa97791ae77073022 (diff)
downloadnixpkgs-24fb8720798bb98b72c498c0d7a0bde619a11e67.tar
nixpkgs-24fb8720798bb98b72c498c0d7a0bde619a11e67.tar.gz
nixpkgs-24fb8720798bb98b72c498c0d7a0bde619a11e67.tar.bz2
nixpkgs-24fb8720798bb98b72c498c0d7a0bde619a11e67.tar.lz
nixpkgs-24fb8720798bb98b72c498c0d7a0bde619a11e67.tar.xz
nixpkgs-24fb8720798bb98b72c498c0d7a0bde619a11e67.tar.zst
nixpkgs-24fb8720798bb98b72c498c0d7a0bde619a11e67.zip
nixos/test-driver: fix regression when using legacy start command
The aarch64-linux versions of the boot.uefiUsb and boot.uefiCdrom tests
were broken by b0fc9da879812e47c1ed3438fb0fd51db00a3494.
That commit was a refactor which omitted the qemuBinary option, which was
previously available in the legacy start command. This restores that
option and fixes the tests previously mentioned.
Diffstat (limited to 'nixos/lib')
-rw-r--r--nixos/lib/test-driver/test_driver/machine.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py
index b730c4b44d7..569a0f3c61e 100644
--- a/nixos/lib/test-driver/test_driver/machine.py
+++ b/nixos/lib/test-driver/test_driver/machine.py
@@ -241,9 +241,15 @@ class LegacyStartCommand(StartCommand):
         cdrom: Optional[str] = None,
         usb: Optional[str] = None,
         bios: Optional[str] = None,
+        qemuBinary: Optional[str] = None,
         qemuFlags: Optional[str] = None,
     ):
-        self._cmd = "qemu-kvm -m 384"
+        if qemuBinary is not None:
+            self._cmd = qemuBinary
+        else:
+            self._cmd = "qemu-kvm"
+
+        self._cmd += " -m 384"
 
         # networking
         net_backend = "-netdev user,id=net0"
@@ -381,6 +387,7 @@ class Machine:
             cdrom=args.get("cdrom"),
             usb=args.get("usb"),
             bios=args.get("bios"),
+            qemuBinary=args.get("qemuBinary"),
             qemuFlags=args.get("qemuFlags"),
         )