guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/03: tests: Installation test no longer requires KVM.


From: Ludovic Courtès
Subject: 03/03: tests: Installation test no longer requires KVM.
Date: Wed, 22 Jun 2016 22:13:05 +0000 (UTC)

civodul pushed a commit to branch master
in repository guix.

commit f6d5456b1b5b55e1ef48388271b29a2e19a646f9
Author: Ludovic Courtès <address@hidden>
Date:   Thu Jun 23 00:12:13 2016 +0200

    tests: Installation test no longer requires KVM.
    
    * gnu/tests/install.scm (%test-installed-os): Use '-enable-kvm' only
    when /dev/kvm exists.
---
 gnu/tests/install.scm |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index c33919b..5d893de 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]