The virt_type parameter will always follow the control file being used. Setting it from the control file still allows it to be overriden by tests or command-line, along with connect_uri.
Signed-off-by: Chris Evich <[email protected]> --- client/tests/kvm/control | 2 ++ client/tests/kvm/tests-shared.cfg.sample | 6 ------ client/tests/libvirt/control | 1 + client/tests/libvirt/tests-shared.cfg.sample | 6 ------ 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/client/tests/kvm/control b/client/tests/kvm/control index bbaa5ec..d62b610 100644 --- a/client/tests/kvm/control +++ b/client/tests/kvm/control @@ -35,6 +35,7 @@ str = """ parser = cartesian_config.Parser() kvm_test_dir = os.path.join(os.environ['AUTODIR'],'tests/kvm') +parser.parse_string('vm_type = kvm') parser.parse_file(os.path.join(kvm_test_dir, "build.cfg")) parser.parse_string(str) if not virt_utils.run_tests(parser, job): @@ -49,6 +50,7 @@ str = """ """ parser = cartesian_config.Parser() +parser.parse_string('vm_type = kvm') parser.parse_file(os.path.join(kvm_test_dir, "tests.cfg")) if args: diff --git a/client/tests/kvm/tests-shared.cfg.sample b/client/tests/kvm/tests-shared.cfg.sample index c6304b3..4ac557b 100644 --- a/client/tests/kvm/tests-shared.cfg.sample +++ b/client/tests/kvm/tests-shared.cfg.sample @@ -11,12 +11,6 @@ include guest-hw.cfg include cdkeys.cfg include virtio-win.cfg -# Virtualization type (kvm or libvirt) -vm_type = kvm -# The hypervisor uri (default, qemu://hostname/system, etc.) -# where default or unset means derive from installed system -connect_uri = default - # Modify/comment the following lines if you wish to modify the paths of the # image files, ISO files or qemu binaries. # diff --git a/client/tests/libvirt/control b/client/tests/libvirt/control index 05ad865..65420fd 100644 --- a/client/tests/libvirt/control +++ b/client/tests/libvirt/control @@ -25,6 +25,7 @@ os.environ['LANG'] = 'en_US.UTF-8' libvirt_test_dir = os.path.join(os.environ['AUTODIR'],'tests/libvirt') parser = cartesian_config.Parser() +parser.parse_string('vm_type = libvirt') parser.parse_file(os.path.join(libvirt_test_dir, "tests.cfg")) virt_utils.run_tests(parser, job) diff --git a/client/tests/libvirt/tests-shared.cfg.sample b/client/tests/libvirt/tests-shared.cfg.sample index a34f16c..3d4a72a 100644 --- a/client/tests/libvirt/tests-shared.cfg.sample +++ b/client/tests/libvirt/tests-shared.cfg.sample @@ -11,12 +11,6 @@ include guest-hw.cfg include cdkeys.cfg include virtio-win.cfg -# Virtualization type (kvm or libvirt) -vm_type = libvirt -# The hypervisor uri (default, qemu://hostname/system, etc.) -# where default or unset means derive from installed system -connect_uri = default - # Modify/comment the following lines if you wish to modify the paths of the # image files, ISO files or qemu binaries. # -- 1.7.1 _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
