From patchwork Mon Dec 27 16:01:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 434501 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBRKCV9e025997 for ; Mon, 27 Dec 2010 20:16:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754385Ab0L0QC3 (ORCPT ); Mon, 27 Dec 2010 11:02:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1026 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754377Ab0L0QC2 (ORCPT ); Mon, 27 Dec 2010 11:02:28 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBRG2RAP028899 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 27 Dec 2010 11:02:27 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oBRG2R4v003612; Mon, 27 Dec 2010 11:02:27 -0500 Received: from moof.tlv.redhat.com (dhcp-1-185.tlv.redhat.com [10.35.1.185]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id oBRG1rG5017175; Mon, 27 Dec 2010 11:02:25 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 17/28] KVM test: whql_submission: make the HDD tests run on a non-system drive Date: Mon, 27 Dec 2010 18:01:44 +0200 Message-Id: <1293465715-16599-17-git-send-email-mgoldish@redhat.com> In-Reply-To: <1293465715-16599-1-git-send-email-mgoldish@redhat.com> References: <1293465715-16599-1-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 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 (demeter1.kernel.org [140.211.167.41]); Mon, 27 Dec 2010 20:16:56 +0000 (UTC) diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index ff02a72..147d89a 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -397,7 +397,9 @@ variants: dd_data_prog = InputKbd dd_data_desc = Input > Keyboard - hdd: - test_device = qemu harddisk + # Run the tests on a non-system drive + # (match devices that contain 'QEMU HARDDISK' and do not contain '[C]') + test_device = ^(?=.*?\bQEMU HARDDISK\b)((?!\[C\]).)*$ device_data += " ex0 ex1 ex2 ex3" dd_data_cat0 = Storage\Device Class\Disk\Disk dd_data_cat1 = Storage\Device Class\Disk\Fixed @@ -413,6 +415,17 @@ variants: dd_data_ex2 = 0 dd_name_ex3 = Secure_Storage dd_data_ex3 = 0 + # Add a 2nd disk which will become D: + images += " tmp" + image_name_tmp = tmp + image_size_tmp = 4G + force_create_image_tmp = yes + # Run diskpart to partition the 2nd disk + whql_pre_command = "echo select disk=1 > dp.txt && " + whql_pre_command += "echo create partition primary >> dp.txt && " + whql_pre_command += "echo assign letter=d >> dp.txt && " + whql_pre_command += "diskpart /s dp.txt & " + whql_pre_command += "format d: /fs:ntfs /q /y" variants: - full: # Yes, 100 hours, this is not a mistake