diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-06-23 00:12:13 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-06-23 00:12:13 +0200 |
| commit | f6d5456b1b5b55e1ef48388271b29a2e19a646f9 (patch) | |
| tree | 97598961f9ac24226ddcf32ad0ed8e6ef93ad4e5 /gnu/tests/install.scm | |
| parent | f10dcbf1a92c147a2fedba6f774afa6a7013fcdf (diff) | |
| download | guix-patches-f6d5456b1b5b55e1ef48388271b29a2e19a646f9.tar guix-patches-f6d5456b1b5b55e1ef48388271b29a2e19a646f9.tar.gz | |
tests: Installation test no longer requires KVM.
* gnu/tests/install.scm (%test-installed-os): Use '-enable-kvm' only
when /dev/kvm exists.
Diffstat (limited to 'gnu/tests/install.scm')
| -rw-r--r-- | gnu/tests/install.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index c33919ba2f..5d893deb4c 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -200,10 +200,13 @@ build (current-guix) and then store a couple of full system images.") (format #t "copying image '~a'...~%" image) (copy-file image "disk.img") (chmod "disk.img" #o644) - (list (string-append #$qemu-minimal "/bin/" - #$(qemu-command system)) - "-enable-kvm" "-no-reboot" "-m" "256" - "-drive" "file=disk.img,if=virtio")) + `(,(string-append #$qemu-minimal "/bin/" + #$(qemu-command system)) + ,@(if (file-exists? "/dev/kvm") + '("-enable-kvm") + '()) + "-no-reboot" "-m" "256" + "-drive" "file=disk.img,if=virtio")) "installed-os"))))) ;;; install.scm ends here |