[KVM-AUTOTEST,1/2] KVM test: add proper prefixes to image, iso and step file paths

Commit Message

Michael Goldish Dec. 23, 2009, 4:32 p.m. UTC

None

Patch

diff --git a/client/tests/kvm/tests.cfg.sample b/client/tests/kvm/tests.cfg.sample
index b13f2e7..74c94b4 100644
--- a/client/tests/kvm/tests.cfg.sample
+++ b/client/tests/kvm/tests.cfg.sample
@@ -11,14 +11,14 @@  include cdkeys.cfg
 # On the example below:
 # * qemu and qemu-img are expected to be found under /usr/bin/qemu-kvm and
 #   /usr/bin/qemu-img respectively.
-# * All image files are expected under tests/kvm/images/
-# * All iso files are expected under tests/kvm/isos/
-# * All step files are expected under tests/kvm/steps_data/
+# * All image files are expected under /tmp/kvm_autotest_root/images/
+# * All iso files are expected under /tmp/kvm_autotest_root/isos/
+# * All step files are expected under /tmp/kvm_autotest_root/steps/
 #qemu_binary = /usr/bin/qemu-kvm
 #qemu_img_binary = /usr/bin/qemu-img
-#image_name.* ?<= /tmp/kvm_autotest_root/images/
-#cdrom.* ?<= /tmp/kvm_autotest_root/isos/
-#steps ?<= /tmp/kvm_autotest_root/steps_data/
+#image_name.* ?<= /tmp/kvm_autotest_root/
+#cdrom.* ?<= /tmp/kvm_autotest_root/
+#steps ?<= /tmp/kvm_autotest_root/
 
 variants:
     - @full:
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index a403399..8ce4126 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -884,3 +884,8 @@  variants:
         pre_command = "/usr/bin/python scripts/hugepage.py /mnt/kvm_hugepage"
         extra_params += " -mem-path /mnt/kvm_hugepage"
 
+
+image_name.* ?<= images/
+cdrom.* ?<= isos/
+steps ?<= steps/
+