[KVM-AUTOTEST,2/5] KVM test: tests_base.cfg.sample: add /f option to all Windows shutdown commands

Commit Message

Michael Goldish March 23, 2010, 7:09 p.m. UTC

None

Patch

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: