From patchwork Sun Jun 13 14:33:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 105809 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 o5DEYRr1026976 for ; Sun, 13 Jun 2010 14:34:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753853Ab0FMOeO (ORCPT ); Sun, 13 Jun 2010 10:34:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18001 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753846Ab0FMOeL (ORCPT ); Sun, 13 Jun 2010 10:34:11 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5DEYAoJ006889 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 13 Jun 2010 10:34:10 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5DEY9mR019836; Sun, 13 Jun 2010 10:34:10 -0400 Received: from localhost.localdomain (dhcp-1-188.tlv.redhat.com [10.35.1.188]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o5DEY6uv030030; Sun, 13 Jun 2010 10:34:08 -0400 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 02/14] KVM test: tests_base.cfg.sample: style modifications Date: Sun, 13 Jun 2010 17:33:33 +0300 Message-Id: <1276439625-32472-2-git-send-email-mgoldish@redhat.com> In-Reply-To: <1276439625-32472-1-git-send-email-mgoldish@redhat.com> References: <1276439625-32472-1-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 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]); Sun, 13 Jun 2010 14:34:29 +0000 (UTC) diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index 84a903b..b302557 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -982,7 +982,7 @@ variants: # Windows section - @Windows: - no autotest linux_s3 vlan_tag + no autotest linux_s3 vlan_tag ioquit unattended_install.(url|nfs|remote_ks) shutdown_command = shutdown /s /f /t 0 reboot_command = shutdown /r /f /t 0 status_test_command = echo %errorlevel% @@ -1368,13 +1368,6 @@ variants: md5sum = 9fae22f2666369968a76ef59e9a81ced -linux_s3 - only Linux - -unattended_install.url|unattended_install.nfs|unattended_install.remote_ks: - only Linux - - variants: - @up: no autotest.npb autotest.tsc @@ -1414,17 +1407,20 @@ virtio|virtio_blk|e1000|balloon_check: variants: - @qcow2: image_format = qcow2 - post_command = " python scripts/check_image.py;" - remove_image = no + post_command += " python scripts/check_image.py;" post_command_timeout = 600 post_command_noncritical = yes + ioquit: + post_command_noncritical = no - vmdk: + no ioquit only Fedora Ubuntu Windows only smp2 only rtl8139 only acpi image_format = vmdk - raw: + no ioquit only Fedora Ubuntu Windows only smp2 only rtl8139 @@ -1439,12 +1435,6 @@ variants: extra_params += " -mem-path /mnt/kvm_hugepage" -ioquit: - post_command_noncritical = no - only qcow2 - only Linux - - variants: - @no_pci_assignable: pci_assignable = no