From patchwork Tue Mar 23 19:09:58 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Michael Goldish <mgoldish@redhat.com>
X-Patchwork-Id: 87744
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 o2NJBHtV032508
	for <patchwork-kvm@patchwork.kernel.org>;
	Tue, 23 Mar 2010 19:11:17 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754088Ab0CWTLO (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Tue, 23 Mar 2010 15:11:14 -0400
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 <rfc822;kvm@vger.kernel.org>);
	Tue, 23 Mar 2010 15:11:12 -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 o2NJBBDm016166
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Tue, 23 Mar 2010 15:11:12 -0400
Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199])
	by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id o2NJBBxF017510; Tue, 23 Mar 2010 15:11:11 -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 o2NJB3OF015534;
	Tue, 23 Mar 2010 15:11:10 -0400
From: Michael Goldish <mgoldish@redhat.com>
To: autotest@test.kernel.org, kvm@vger.kernel.org
Cc: Michael Goldish <mgoldish@redhat.com>
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>
In-Reply-To: <1269371401-9341-1-git-send-email-mgoldish@redhat.com>
References: <1269371401-9341-1-git-send-email-mgoldish@redhat.com>
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
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]);
	Tue, 23 Mar 2010 19:11:17 +0000 (UTC)


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: