[KVM-AUTOTEST,2/2,diff-rename,mode] KVM-test: rename autoit to guest_test and update the sample config file

Commit Message

Cao, Chen June 18, 2010, 9:33 a.m. UTC

None

Patch

diff --git a/client/tests/kvm/tests/autoit.py b/client/tests/kvm/tests/guest_test.py
similarity index 99%
rename from client/tests/kvm/tests/autoit.py
rename to client/tests/kvm/tests/guest_test.py
index 0373f38..2ba3d02 100644
--- a/client/tests/kvm/tests/autoit.py
+++ b/client/tests/kvm/tests/guest_test.py
@@ -3,7 +3,7 @@  from autotest_lib.client.common_lib import error
 import kvm_utils, kvm_test_utils
 
 
-def run_autoit(test, params, env):
+def run_guest_test(test, params, env):
     """
     A wrapper for running customized tests in guests.
 
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index 5b0da6a..105c67a 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -248,22 +248,33 @@  variants:
         used_cpus = 5
         used_mem = 2560
 
-    - autoit:       install setup unattended_install.cdrom
-        type = autoit
+    - guest_test:       install setup unattended_install.cdrom
+        type = guest_test
         login_timeout = 360
-        interpreter = D:\AutoIt3.exe
         test_timeout = 600
         script_params =
         reboot = yes
         variants:
-            - notepad:
-                guest_script = autoit/notepad1.au3
-            - stub:
-                download = yes
-                download_cmd = "git clone"
-                rsc_server = "git://the.resource.server/autoit"
-                dst_rsc_dir = "C:\"
-                dst_rsc_path = "C:\autoit\stub\stub.au3"
+            - autoit:
+                interpreter = D:\AutoIt3.exe
+                variants:
+                    - notepad:
+                        guest_script = autoit/notepad1.au3
+                    - stub:
+                        download = yes
+                        download_cmd = "git clone"
+                        rsc_server = "git://the.resource.server/autoit"
+                        dst_rsc_dir = "C:\"
+                        dst_rsc_path = "C:\autoit\stub\stub.au3"
+            - powershell:
+                interpreter = "powershell.exe -File"
+                variants:
+                    - stub:
+                        download = yes
+                        download_cmd = "git clone"
+                        rsc_server = "git://the.resource.server/powershell"
+                        dst_rsc_dir = "C:\"
+                        dst_rsc_path = "C:\powershell\stub\stub.ps1"
 
     - iozone_windows: unattended_install.cdrom
         type = iozone_windows