From patchwork Fri Jun 18 09:33:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Cao, Chen" X-Patchwork-Id: 106821 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 o5I9WvRF006695 for ; Fri, 18 Jun 2010 09:32:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759147Ab0FRJcz (ORCPT ); Fri, 18 Jun 2010 05:32:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59083 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754575Ab0FRJcz (ORCPT ); Fri, 18 Jun 2010 05:32:55 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5I9WrD3028769 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 18 Jun 2010 05:32:53 -0400 Received: from localhost (dhcp-91-143.nay.redhat.com [10.66.91.143]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5I9WpSj009633; Fri, 18 Jun 2010 05:32:52 -0400 Date: Fri, 18 Jun 2010 17:33:07 +0800 From: Chen Cao To: lmr@redhat.com, autotest@test.kernel.org Cc: kvm@vger.kernel.org Subject: [KVM-AUTOTEST PATCH 2/2 diff-rename mode] KVM-test: rename autoit to guest_test and update the sample config file Message-ID: <20100618093307.GB18388@t4.rh> References: <20100618092426.11860.79768.stgit@dhcp-91-197.nay.redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100618092426.11860.79768.stgit@dhcp-91-197.nay.redhat.com> User-Agent: Mutt/1.5.20 (2009-12-10) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 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, 18 Jun 2010 09:32:57 +0000 (UTC) diff --git a/client/tests/kvm/tests/autoit.py b/client/tests/kvm/tests/guest_test.py similarity index 99% rename from client/tests/kvm/tests/autoit.py rename to client/tests/kvm/tests/guest_test.py index 0373f38..2ba3d02 100644 --- a/client/tests/kvm/tests/autoit.py +++ b/client/tests/kvm/tests/guest_test.py @@ -3,7 +3,7 @@ from autotest_lib.client.common_lib import error import kvm_utils, kvm_test_utils -def run_autoit(test, params, env): +def run_guest_test(test, params, env): """ A wrapper for running customized tests in guests. diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index 5b0da6a..105c67a 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -248,22 +248,33 @@ variants: used_cpus = 5 used_mem = 2560 - - autoit: install setup unattended_install.cdrom - type = autoit + - guest_test: install setup unattended_install.cdrom + type = guest_test login_timeout = 360 - interpreter = D:\AutoIt3.exe test_timeout = 600 script_params = reboot = yes variants: - - notepad: - guest_script = autoit/notepad1.au3 - - stub: - download = yes - download_cmd = "git clone" - rsc_server = "git://the.resource.server/autoit" - dst_rsc_dir = "C:\" - dst_rsc_path = "C:\autoit\stub\stub.au3" + - autoit: + interpreter = D:\AutoIt3.exe + variants: + - notepad: + guest_script = autoit/notepad1.au3 + - stub: + download = yes + download_cmd = "git clone" + rsc_server = "git://the.resource.server/autoit" + dst_rsc_dir = "C:\" + dst_rsc_path = "C:\autoit\stub\stub.au3" + - powershell: + interpreter = "powershell.exe -File" + variants: + - stub: + download = yes + download_cmd = "git clone" + rsc_server = "git://the.resource.server/powershell" + dst_rsc_dir = "C:\" + dst_rsc_path = "C:\powershell\stub\stub.ps1" - iozone_windows: unattended_install.cdrom type = iozone_windows