From patchwork Sun Aug 9 16:51:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 40280 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n79Gn8ra002801 for ; Sun, 9 Aug 2009 16:49:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752325AbZHIQtG (ORCPT ); Sun, 9 Aug 2009 12:49:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752319AbZHIQtF (ORCPT ); Sun, 9 Aug 2009 12:49:05 -0400 Received: from mx2.redhat.com ([66.187.237.31]:45726 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752280AbZHIQtC (ORCPT ); Sun, 9 Aug 2009 12:49:02 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n79Gn3ft025848; Sun, 9 Aug 2009 12:49:03 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n79Gn2mX000521; Sun, 9 Aug 2009 12:49:02 -0400 Received: from localhost.localdomain (dhcp-1-31.tlv.redhat.com [10.35.1.31]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n79GmoCP022741; Sun, 9 Aug 2009 12:49:01 -0400 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 7/7] KVM test: use homemade remote shell server (rss.exe) for all Windows guests Date: Sun, 9 Aug 2009 19:51:32 +0300 Message-Id: <6f267126f9ecc5034a47e3d59769a0dbc46313a0.1249835925.git.mgoldish@redhat.com> In-Reply-To: References: <1249836692-18292-1-git-send-email-mgoldish@redhat.com> <8ba0c835ecadb68d1f444e7cbb32a01d9c6dca3c.1249835925.git.mgoldish@redhat.com> <0cd078eb6e8fc3331afd332b8551a1d981fa183f.1249835925.git.mgoldish@redhat.com> <348018b0e8c76a25b2f35829b1f376f77fd8d269.1249835925.git.mgoldish@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This patch modifies kvm_tests.cfg.sample. 1. It makes all Windows guests use rss.exe, using the new step files and an ISO file named rss.iso, which should be created by the user. rss.iso should contain rss.exe, setuprss.bat and rss.reg. These files are all assumed to be in D:\. 2. Currently WinVista.32, WinVista.64, Win2008.64, Win2003.64 and WinXP.64 can run only the install test. This patch makes them run all available tests, like the other Windows guests. Signed-off-by: Michael Goldish --- client/tests/kvm/kvm_tests.cfg.sample | 70 ++++++++++++++++++--------------- 1 files changed, 38 insertions(+), 32 deletions(-) diff --git a/client/tests/kvm/kvm_tests.cfg.sample b/client/tests/kvm/kvm_tests.cfg.sample index 74901a6..12e907b 100644 --- a/client/tests/kvm/kvm_tests.cfg.sample +++ b/client/tests/kvm/kvm_tests.cfg.sample @@ -334,17 +334,16 @@ variants: # Windows section - @Windows: - no autotest + no autotest linux_s3 shutdown_command = shutdown /s /t 0 reboot_command = shutdown /r /t 0 status_test_command = echo %errorlevel% shell_prompt = "C:\\.{0,50}>" - username = Administrator - password = 123456 - shell_client = ssh + shell_client = nc shell_port = 22 - file_transfer_client = scp - file_transfer_port = 22 + # File transfers are currently unsupported + #file_transfer_client = scp + #file_transfer_port = 22 migrate: migration_test_command = ver && vol @@ -378,8 +377,8 @@ variants: md5sum_1m = dd28fba196d366d56fe774bd93df5527 user = user setup: - steps = Win2000-32-setupssh.steps - cdrom = windows/setupssh.iso + steps = Win2000-32-rss.steps + cdrom = windows/rss.iso - WinXP.32: image_name = winXP-32 @@ -390,11 +389,11 @@ variants: md5sum_1m = b473bf75af2d1269fec8958cf0202bfd user = user setup: - steps = WinXP-32-setupssh.steps - cdrom = windows/setupssh.iso + steps = WinXP-32-rss.steps + cdrom = windows/rss.iso - WinXP.64: - only install + no reboot image_name = winXP-64 install: steps = WinXP-64.steps @@ -402,6 +401,9 @@ variants: md5sum = 8d3f007ec9c2060cec8a50ee7d7dc512 md5sum_1m = e812363ff427effc512b7801ee70e513 user = user + setup: + steps = WinXP-64-rss.steps + cdrom = windows/rss.iso - Win2003: image_size = 20G @@ -418,11 +420,10 @@ variants: md5sum_1m = 37c2fdec15ac4ec16aa10fdfdb338aa3 user = user setup: - steps = Win2003-32-setupssh.steps - cdrom = windows/setupssh.iso + steps = Win2003-32-rss.steps + cdrom = windows/rss.iso - 64: - only install image_name = win2003-64 install: steps = Win2003-64.steps @@ -430,37 +431,42 @@ variants: md5sum = 5703f87c9fd77d28c05ffadd3354dbbd md5sum_1m = 439393c384116aa09e08a0ad047dcea8 user = user + setup: + steps = Win2003-64-rss.steps + cdrom = windows/rss.iso - WinVista: - only install image_name = winvista image_size = 20G variants: - 32: image_name += -32 - steps = Win-Vista-32.steps - cdrom = windows/WindowsVista-32.iso - md5sum = 1008f323d5170c8e614e52ccb85c0491 - md5sum_1m = c724e9695da483bc0fd59e426eaefc72 + install: + steps = Win-Vista-32.steps + cdrom = windows/WindowsVista-32.iso + md5sum = 1008f323d5170c8e614e52ccb85c0491 + md5sum_1m = c724e9695da483bc0fd59e426eaefc72 + setup: + steps = WinVista-32-rss.steps + cdrom = windows/rss.iso - 64: image_name += -64 - steps = Win-Vista-64.steps - cdrom = windows/WindowsVista-64.iso - md5sum = 11e2010d857fffc47813295e6be6d58d - md5sum_1m = 0947bcd5390546139e25f25217d6f165 + install: + steps = Win-Vista-64.steps + cdrom = windows/WindowsVista-64.iso + md5sum = 11e2010d857fffc47813295e6be6d58d + md5sum_1m = 0947bcd5390546139e25f25217d6f165 + setup: + steps = WinVista-64-rss.steps + cdrom = windows/rss.iso - Win2008: image_name = win2008 image_size = 20G shutdown_command = shutdown /s /f /t 0 reboot_command = shutdown /r /f /t 0 - shell_port = 23 - guest_port_remote_shell = 23 - use_telnet = yes - username = Administrator - password = 1q2w3eP variants: - 32: @@ -473,8 +479,8 @@ variants: md5sum=0bfca49f0164de0a8eba236ced47007d md5sum_1m=07d7f5006393f74dc76e6e2e943e2440 setup: - steps = Win2008-32-setuptelnet.steps - cdrom = windows/setuptelnet.iso + steps = Win2008-32-rss.steps + cdrom = windows/rss.iso - 64: image_name += -64 @@ -487,8 +493,8 @@ variants: md5sum_1m=efdcc11d485a1ef9afa739cb8e0ca766 passwd = 1q2w3eP setup: - steps = Win2008-32-setuptelnet.steps - cdrom = windows/setuptelnet.iso + steps = Win2008-64-rss.steps + cdrom = windows/rss.iso # Unix/BSD section - @Unix: