From patchwork Sun Jan 17 15:24:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 73508 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0HFOi89022156 for ; Sun, 17 Jan 2010 15:24:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751149Ab0AQPYh (ORCPT ); Sun, 17 Jan 2010 10:24:37 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751432Ab0AQPYh (ORCPT ); Sun, 17 Jan 2010 10:24:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52524 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751001Ab0AQPYg (ORCPT ); Sun, 17 Jan 2010 10:24:36 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0HFOZiG016080 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 17 Jan 2010 10:24:35 -0500 Received: from localhost.localdomain (vpn-8-173.rdu.redhat.com [10.11.8.173]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0HFOWhH028440; Sun, 17 Jan 2010 10:24:33 -0500 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH] KVM test: Enable qemu upstream testing Date: Sun, 17 Jan 2010 13:24:31 -0200 Message-Id: <1263741871-4029-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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 --- 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: