From patchwork Fri Jan 29 06:07:27 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: 75657 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o0T67eSw002590 for ; Fri, 29 Jan 2010 06:07:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751397Ab0A2GHi (ORCPT ); Fri, 29 Jan 2010 01:07:38 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751388Ab0A2GHi (ORCPT ); Fri, 29 Jan 2010 01:07:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:24818 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751142Ab0A2GHh (ORCPT ); Fri, 29 Jan 2010 01:07:37 -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 o0T67aJf008343 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 29 Jan 2010 01:07:36 -0500 Received: from localhost.localdomain (vpn-11-140.rdu.redhat.com [10.11.11.140]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0T67YZb012118; Fri, 29 Jan 2010 01:07:35 -0500 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH 1/6] KVM test: Removing qemu/qemu-kvm variants from tests Date: Fri, 29 Jan 2010 04:07:27 -0200 Message-Id: <1264745252-14077-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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 29 Jan 2010 06:07:41 +0000 (UTC) diff --git a/client/tests/kvm/tests.cfg.sample b/client/tests/kvm/tests.cfg.sample index bde4efa..c478ba2 100644 --- a/client/tests/kvm/tests.cfg.sample +++ b/client/tests/kvm/tests.cfg.sample @@ -20,66 +20,36 @@ 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 no_pci_assignable - only Fedora Windows - - @sample2: + - @fc12_qemu: only qemu-kvm only qcow2 only ide only default only up only no_pci_assignable - only Fedora.9.* RHEL.5.* Windows - only rtl8139 - - @sample3: - only qemu-kvm - only no_pci_assignable - only qcow2.*ide.*default.*up.*Ubuntu-8.10-server.*(autotest.sleeptest) - only rtl8139 - - @fc8_step: - only qemu-kvm - only qcow2 - only ide - only default - only up - only no_pci_assignable - only Fedora.8.32 - only install setup boot shutdown - only rtl8139 - only hugepages - - @winXP_32_unattended: - only qemu-kvm - only qcow2 - only ide - only default - only up - only no_pci_assignable - only WinXP.32 + only Fedora.12.64 no install setup no hugepages only unattended_install boot shutdown only rtl8139 - - @fc11_kickstart: + # The only change needed to test qemu upstream + # instead of qemu-kvm is the explicit -enable-kvm + # that has to be passed to the command line + extra_params = ' -enable-kvm' + - @fc12_qemu_kvm: only qemu-kvm only qcow2 only ide only default only up only no_pci_assignable - only Fedora.11.64 + only Fedora.12.64 no install setup no hugepages only unattended_install boot shutdown only rtl8139 # Choose your test list from the testsets defined -only fc11_kickstart - +only fc12_qemu_kvm diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index 2d03f1f..8a7a13d 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -62,8 +62,6 @@ variants: - unattended_install: type = unattended_install - # Unattended install also perform guest setup, so setup is not needed - no setup kill_vm_on_error = yes force_create_image = yes pre_command = scripts/unattended.py @@ -894,12 +892,6 @@ linux_s3: variants: - - @qemu-kvm: - - qemu: - extra_params += " -enable-kvm" - - -variants: - @up: no autotest.npb - smp2: