From patchwork Wed Sep 9 18:12:11 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 46439 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 n89IFuo2019221 for ; Wed, 9 Sep 2009 18:15:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753998AbZIISPu (ORCPT ); Wed, 9 Sep 2009 14:15:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753989AbZIISPs (ORCPT ); Wed, 9 Sep 2009 14:15:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46765 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753986AbZIISPq (ORCPT ); Wed, 9 Sep 2009 14:15:46 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n89IFnr2022843; Wed, 9 Sep 2009 14:15:49 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n89IFmeF014455; Wed, 9 Sep 2009 14:15:49 -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 n89IFNFd012008; Wed, 9 Sep 2009 14:15:47 -0400 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [PATCH 18/19] KVM test: kvm_tests.cfg.sample: get all Windows test utilities from a single ISO Date: Wed, 9 Sep 2009 21:12:11 +0300 Message-Id: <1252519932-30733-18-git-send-email-mgoldish@redhat.com> In-Reply-To: <1252519932-30733-17-git-send-email-mgoldish@redhat.com> References: <1252519932-30733-1-git-send-email-mgoldish@redhat.com> <1252519932-30733-2-git-send-email-mgoldish@redhat.com> <1252519932-30733-3-git-send-email-mgoldish@redhat.com> <1252519932-30733-4-git-send-email-mgoldish@redhat.com> <1252519932-30733-5-git-send-email-mgoldish@redhat.com> <1252519932-30733-6-git-send-email-mgoldish@redhat.com> <1252519932-30733-7-git-send-email-mgoldish@redhat.com> <1252519932-30733-8-git-send-email-mgoldish@redhat.com> <1252519932-30733-9-git-send-email-mgoldish@redhat.com> <1252519932-30733-10-git-send-email-mgoldish@redhat.com> <1252519932-30733-11-git-send-email-mgoldish@redhat.com> <1252519932-30733-12-git-send-email-mgoldish@redhat.com> <1252519932-30733-13-git-send-email-mgoldish@redhat.com> <1252519932-30733-14-git-send-email-mgoldish@redhat.com> <1252519932-30733-15-git-send-email-mgoldish@redhat.com> <1252519932-30733-16-git-send-email-mgoldish@redhat.com> <1252519932-30733-17-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Instead of rss.iso, vlc.iso and autoit.iso -- look for everything in winutils.iso by default. This make maintenance a little easier, and eliminates the need to restart VMs between tests just in order to change the cdrom. Also, expect vlc.exe in D:\vlc\vlc.exe instead of D:\vlc.exe. 'install' tests still use the usual ISO files. Signed-off-by: Michael Goldish --- client/tests/kvm/kvm_tests.cfg.sample | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/client/tests/kvm/kvm_tests.cfg.sample b/client/tests/kvm/kvm_tests.cfg.sample index 201b0e1..285a38f 100644 --- a/client/tests/kvm/kvm_tests.cfg.sample +++ b/client/tests/kvm/kvm_tests.cfg.sample @@ -119,7 +119,6 @@ variants: - autoit: install setup type = autoit - cdrom = windows/autoit.iso autoit_binary = D:\AutoIt3.exe autoit_script_timeout = 600 autoit_script_params = @@ -362,17 +361,19 @@ variants: # file_transfer_client = scp # file_transfer_port = 22 + # This ISO will be used for all tests except install: + cdrom = windows/winutils.iso + migrate: migration_test_command = ver && vol stress_boot: alive_test_cmd = systeminfo timedrift: - # For this to work, the ISO should contain vlc (vlc.exe) and a video (ED_1024.avi) - cdrom = windows/vlc.iso time_command = "echo TIME: %date% %time%" time_filter_re = "(?<=TIME: \w\w\w ).{19}(?=\.\d\d)" time_format = "%m/%d/%Y %H:%M:%S" - guest_load_command = 'cmd /c "d:\vlc -f --loop --no-qt-privacy-ask --no-qt-system-tray d:\ED_1024.avi"' + # For this to work, the cdrom at d: should contain vlc (d:\vlc\vlc.exe) and a video (d:\ED_1024.avi) + guest_load_command = 'cmd /c "d:\vlc\vlc -f --loop --no-qt-privacy-ask --no-qt-system-tray d:\ED_1024.avi"' # Alternative guest load: #guest_load_command = "(dir /s && dir /s && dir /s && dir /s) > nul" guest_load_stop_command = "taskkill /F /IM vlc.exe" @@ -395,7 +396,6 @@ variants: user = user setup: steps = Win2000-32-rss.steps - cdrom = windows/rss.iso - WinXP.32: image_name = winXP-32 @@ -407,7 +407,6 @@ variants: user = user setup: steps = WinXP-32-rss.steps - cdrom = windows/rss.iso - WinXP.64: no reboot @@ -420,7 +419,6 @@ variants: user = user setup: steps = WinXP-64-rss.steps - cdrom = windows/rss.iso - Win2003: image_size = 20G @@ -438,7 +436,6 @@ variants: user = user setup: steps = Win2003-32-rss.steps - cdrom = windows/rss.iso - 64: image_name = win2003-64 @@ -450,7 +447,6 @@ variants: user = user setup: steps = Win2003-64-rss.steps - cdrom = windows/rss.iso - WinVista: image_name = winvista @@ -466,7 +462,6 @@ variants: md5sum_1m = c724e9695da483bc0fd59e426eaefc72 setup: steps = WinVista-32-rss.steps - cdrom = windows/rss.iso - 64: image_name += -64 @@ -477,7 +472,6 @@ variants: md5sum_1m = 0947bcd5390546139e25f25217d6f165 setup: steps = WinVista-64-rss.steps - cdrom = windows/rss.iso - Win2008: image_name = win2008 @@ -497,7 +491,6 @@ variants: md5sum_1m=07d7f5006393f74dc76e6e2e943e2440 setup: steps = Win2008-32-rss.steps - cdrom = windows/rss.iso - 64: image_name += -64 @@ -511,7 +504,6 @@ variants: passwd = 1q2w3eP setup: steps = Win2008-64-rss.steps - cdrom = windows/rss.iso # Unix/BSD section - @Unix: