Harald Hoyer 9d5d75
From b7774da97ca743ada8a94d5eab4484cb96504ca0 Mon Sep 17 00:00:00 2001
Harald Hoyer 9d5d75
From: Harald Hoyer <harald@redhat.com>
Harald Hoyer 9d5d75
Date: Tue, 14 Aug 2018 16:18:53 +0200
Harald Hoyer 9d5d75
Subject: [PATCH] might even run without kvm
Harald Hoyer 9d5d75
Harald Hoyer 9d5d75
---
Harald Hoyer 9d5d75
 .travis.yml   | 5 +----
Harald Hoyer 9d5d75
 test/run-qemu | 1 +
Harald Hoyer 9d5d75
 2 files changed, 2 insertions(+), 4 deletions(-)
Harald Hoyer 9d5d75
Harald Hoyer 9d5d75
diff --git a/.travis.yml b/.travis.yml
Harald Hoyer 9d5d75
index 16f9a511..a71d9be2 100644
Harald Hoyer 9d5d75
--- a/.travis.yml
Harald Hoyer 9d5d75
+++ b/.travis.yml
Harald Hoyer 9d5d75
@@ -1,15 +1,12 @@
Harald Hoyer 9d5d75
+language: generic
Harald Hoyer 9d5d75
 sudo: required
Harald Hoyer 9d5d75
-
Harald Hoyer 9d5d75
 services:
Harald Hoyer 9d5d75
   - docker
Harald Hoyer 9d5d75
-
Harald Hoyer 9d5d75
 env:
Harald Hoyer 9d5d75
   matrix:
Harald Hoyer 9d5d75
     - IMAGE=latest
Harald Hoyer 9d5d75
     - IMAGE=rawhide
Harald Hoyer 9d5d75
-    
Harald Hoyer 9d5d75
 before_script:
Harald Hoyer 9d5d75
 - docker pull fedora:$IMAGE
Harald Hoyer 9d5d75
-
Harald Hoyer 9d5d75
 script:
Harald Hoyer 9d5d75
 - docker run --privileged -it -v $(pwd)/:/dracut fedora:$IMAGE /dracut/fedora-test.sh $IMAGE-$$
Harald Hoyer 9d5d75
diff --git a/test/run-qemu b/test/run-qemu
Harald Hoyer 9d5d75
index a4e15548..c28de2db 100755
Harald Hoyer 9d5d75
--- a/test/run-qemu
Harald Hoyer 9d5d75
+++ b/test/run-qemu
Harald Hoyer 9d5d75
@@ -8,6 +8,7 @@ $(lsmod | grep -q '^kqemu ') && BIN=/usr/bin/qemu && ARGS="-kernel-kqemu "
Harald Hoyer 9d5d75
 [[ -c /dev/kvm && -x /usr/bin/kvm ]] && BIN=/usr/bin/kvm && ARGS=""
Harald Hoyer 9d5d75
 [[ -c /dev/kvm && -x /usr/bin/qemu-kvm ]] && BIN=/usr/bin/qemu-kvm && ARGS=""
Harald Hoyer 9d5d75
 [[ -c /dev/kvm && -x /usr/libexec/qemu-kvm ]] && BIN=/usr/libexec/qemu-kvm && ARGS=""
Harald Hoyer 9d5d75
+[[ -x /usr/bin/qemu-system-$(uname -i) ]] && BIN=/usr/bin/qemu-system-$(uname -i) && ARGS=""
Harald Hoyer 9d5d75
 [[ -c /dev/kvm && -x /usr/bin/qemu-system-$(uname -i) ]] && BIN=/usr/bin/qemu-system-$(uname -i) && ARGS="-enable-kvm"
Harald Hoyer 9d5d75
 
Harald Hoyer 9d5d75
 [[ $BIN ]] || {
Harald Hoyer 9d5d75