KVM test: Enable qemu upstream testing

Commit Message

Lucas Meneghel Rodrigues Jan. 17, 2010, 3:24 p.m. UTC

None

Patch

differences is that on qemu we have to set -enable-kvm
explicitely. Take this into consideration on the base
configuration files and enable people to test qemu upstream
more easily.

Signed-off-by: Lucas Meneghel Rodrigues <[e-mail]>
---
 client/tests/kvm/tests.cfg.sample      |   10 ++++++++++
 client/tests/kvm/tests_base.cfg.sample |    6 ++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/client/tests/kvm/tests.cfg.sample b/client/tests/kvm/tests.cfg.sample
index 74c94b4..c6a66a4 100644
--- a/client/tests/kvm/tests.cfg.sample
+++ b/client/tests/kvm/tests.cfg.sample
@@ -20,11 +20,17 @@  include cdkeys.cfg
 #cdrom.* ?<= /tmp/kvm_autotest_root/
 #steps ?<= /tmp/kvm_autotest_root/
 
+# You will notice that in all test definition blocks we have 'only qemu-kvm'
+# set. This means that qemu-kvm command line syntax will be used. If you
+# intend to test qemu upstream, you'll have to change that to 'only qemu'.
 variants:
     - @full:
+        only qemu-kvm
     - @sample1:
+        only qemu-kvm
         only Fedora Windows
     - @sample2:
+        only qemu-kvm
         only qcow2
         only ide
         only default
@@ -32,9 +38,11 @@  variants:
         only Fedora.9.* RHEL.5.* Windows
         only rtl8139
     - @sample3:
+        only qemu-kvm
         only qcow2.*ide.*default.*up.*Ubuntu-8.10-server.*(autotest.sleeptest)
         only rtl8139
     - @fc8_step:
+        only qemu-kvm
         only qcow2
         only ide
         only default
@@ -44,6 +52,7 @@  variants:
         only rtl8139
         only hugepages
     - @winXP_32_unattended:
+        only qemu-kvm
         only qcow2
         only ide
         only default
@@ -54,6 +63,7 @@  variants:
         only unattended_install setup boot shutdown
         only rtl8139
     - @fc11_kickstart:
+        only qemu-kvm
         only qcow2
         only ide
         only default
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index a63cc52..b1b1539 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -891,6 +891,12 @@  linux_s3:
 
 
 variants:
+    - @qemu-kvm:
+    - qemu:
+        extra_params += " -enable-kvm"
+
+
+variants:
     - @up:
         no autotest.npb
     - smp2: