From: Michael Goldish Subject: [KVM-AUTOTEST PATCH 2/5] KVM test: tests_base.cfg.sample: add /f option to all Windows shutdown commands Date: Tue, 23 Mar 2010 21:09:58 +0200 Message-ID: <1269371401-9341-2-git-send-email-mgoldish@redhat.com> References: <1269371401-9341-1-git-send-email-mgoldish@redhat.com> Cc: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:50388 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754008Ab0CWTLM (ORCPT ); Tue, 23 Mar 2010 15:11:12 -0400 In-Reply-To: <1269371401-9341-1-git-send-email-mgoldish@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: It seems that when Windows is locked it refuses to shutdown unless given the /f option. - Add /f to all Windows shutdown and reboot commands. - Remove duplicate shutdown and reboot commands for Win2003, Win2008 and Win7. Signed-off-by: Michael Goldish --- client/tests/kvm/tests_base.cfg.sample | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index 2a36687..bacbcee 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -687,8 +687,8 @@ variants: # Windows section - @Windows: no autotest linux_s3 vlan_tag - shutdown_command = shutdown /s /t 0 - reboot_command = shutdown /r /t 0 + shutdown_command = shutdown /s /f /t 0 + reboot_command = shutdown /r /f /t 0 status_test_command = echo %errorlevel% shell_prompt = "^\w:\\.*>\s*$" username = Administrator @@ -808,8 +808,6 @@ variants: - Win2003: image_name = win2003 image_size = 20G - shutdown_command = shutdown /s /f /t 0 - reboot_command = shutdown /r /f /t 0 variants: - 32: @@ -908,8 +906,6 @@ variants: - Win2008: image_name = win2008 image_size = 20G - shutdown_command = shutdown /s /f /t 0 - reboot_command = shutdown /r /f /t 0 variants: - 32sp1: @@ -985,8 +981,6 @@ variants: - Win7: image_name = win7 image_size = 20G - shutdown_command = shutdown /s /f /t 0 - reboot_command = shutdown /r /f /t 0 variants: - 32: -- 1.5.4.1