[2/6] KVM test: Define defaults for KVM test

Commit Message

Lucas Meneghel Rodrigues Jan. 29, 2010, 6:07 a.m. UTC

None

Patch

diff --git a/client/tests/kvm/tests.cfg.sample b/client/tests/kvm/tests.cfg.sample
index c478ba2..23f50ba 100644
--- a/client/tests/kvm/tests.cfg.sample
+++ b/client/tests/kvm/tests.cfg.sample
@@ -6,19 +6,18 @@  include cdkeys.cfg
 
 # Modify/comment the following lines if you wish to modify
 # the paths of the image files, ISO files, step files or qemu binaries.
-# If you keep these lines commented, all mentioned paths are expected
-# to be found in the KVM test dir (tests/kvm/).
-# On the example below:
+#
+# As for the defaults:
 # * 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 /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/
-#cdrom.* ?<= /tmp/kvm_autotest_root/
-#steps ?<= /tmp/kvm_autotest_root/
+qemu_binary = /usr/bin/qemu-kvm
+qemu_img_binary = /usr/bin/qemu-img
+image_name.* ?<= /tmp/kvm_autotest_root/
+cdrom.* ?<= /tmp/kvm_autotest_root/
+steps ?<= /tmp/kvm_autotest_root/
 
 variants:
     - @full: