virt: Move not general tests to tests type specific directory.

Repairs problem with ./run --list-tests wrong test listing.
Signed-off-by: NJiří Župka <jzupka@redhat.com>

qemu/cfg/build.cfg

-# Copy this file to build.cfg and edit it.
-
-vm_type = qemu
-
-variants:
-    - build:
-        type = build
-        # Load modules built/installed by the build test?
-        load_modules = no
-        # Save the results of this build on test.resultsdir?
-        save_results = no
-        # Preserve the source code directory between tests?
-        preserve_srcdir = yes
-
-        ######################################################################
-        # INSTALLERS DEFINITION SECTION
-        # Many different components can be defined. The ones that will
-        # actually be run have to be defined in the 'installers'
-        ######################################################################
-        # QEMU installation from a local tarball
-        # local_tar_qemu_path = /tmp/qemu-0.15.1.tar.gz
-
-        # QEMU installation from a local source directory
-        # local_src_qemu_path = /tmp/qemu-0.15.1
-
-        # Guest Kernel installation from a GIT repo
-        git_repo_guest_kernel_build_helper = linux_kernel
-        git_repo_guest_kernel_uri = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
-        git_repo_guest_kernel_branch = master
-        #git_repo_guest_kernel_patches = ['http://foo/bar.patch', 'http://foo/baz.patch']
-        git_repo_guest_kernel_config =  http://foo/bar/kernel-config
-        git_repo_guest_kernel_build_target = bzImage
-        git_repo_guest_kernel_build_image  = arch/x86/boot/bzImage
-        # Should be same as the kernel variable defined in guest-os.cfg. Which is
-        # used to boot the guest.
-        git_repo_guest_kernel_kernel_path = images/bzImage
-
-        # QEMU installation from a GIT repo
-        git_repo_qemu_uri = git://git.qemu.org/qemu.git
-        git_repo_qemu_configure_options = --target-list=x86_64-softmmu --enable-spice
-        # if you have a git repo that is closer to you, you may
-        # use it to fetch object first from it, and then later from "upstream"
-        # git_repo_qemu_base_uri = /home/user/code/qemu
-
-
-        # QEMU installation from a GIT repo (signed tags)
-        #git_repo_qemu_uri = git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git
-        #git_repo_qemu_configure_options = --target-list=x86_64-softmmu
-        #git_repo_qemu_tag = for_anthony
-        # If tag_signed is provided, then we will be strict and verify the
-        # tag. If the tag verification fails, the entire build test will fail.
-        # A file with the trusted GPG keys should be put at shared/gpg. The
-        # build test will look for it. If not found, the test will fail.
-        #git_repo_qemu_tag_signed = mst.keys
-
-        # SPICE installation from a GIT repo
-        git_repo_spice_uri = git://cgit.freedesktop.org/spice/spice
-        git_repo_spice_protocol_uri = git://git.freedesktop.org/git/spice/spice-protocol
-
-        # QEMU (KVM) installation from a YUM repo
-        # yum_qemu_kvm_pkgs = ['qemu-kvm', 'qemu-kvm-tools', 'qemu-system-x86', 'qemu-common', 'qemu-img']
-
-        # QEMU (KVM) installation from koji/brew
-        # koji_qemu_kvm_tag = dist-f15
-        # koji_qemu_kvm_pkgs = :qemu:qemu-common,qemu-img,qemu-kvm,qemu-system-x86,qemu-kvm-tools seabios vgabios :gpxe:gpxe-roms-qemu :spice:spice-server
-
-        # Koji/brew scratch builds notes:
-        #
-        # Packages from scratch builds have a different syntax:
-        #
-        #  user:task_id[:pkg1,pkg2]
-        #
-        # If you include a subset of packages and want to have debuginfo packages
-        # you must *manually* add it to the list, as there's no way to know for
-        # sure the main package name for scratch builds. If you set only the
-        # user name and task id, all packages, including -debuginfo will be
-        # installed.
-        #
-        # koji_qemu_kvm_scratch_pkgs = jdoe:1000:qemu-kvm,qemu-system-x86,qemu-kvm-tools,qemu-img,qemu-kvm-debuginfo
-
-        ######################################################################
-        # INSTALLERS SELECTION
-        # Choose here what components you want to install
-        ######################################################################
-        installers = git_repo_spice_protocol git_repo_spice git_repo_qemu
-
-        # Choose wether you want to include debug information/symbols
-        install_debug_info = yes
-
-
-# Comment out the 'no build' line to enable the build test
-no build

tests/cfg/build.cfg

+- build:
+    virt_test_type = qemu
+    type = build
+    # Load modules built/installed by the build test?
+    load_modules = no
+    # Save the results of this build on test.resultsdir?
+    save_results = no
+    # Preserve the source code directory between tests?
+    preserve_srcdir = yes
+
+    ######################################################################
+    # INSTALLERS DEFINITION SECTION
+    # Many different components can be defined. The ones that will
+    # actually be run have to be defined in the 'installers'
+    ######################################################################
+    # QEMU installation from a local tarball
+    # local_tar_qemu_path = /tmp/qemu-0.15.1.tar.gz
+
+    # QEMU installation from a local source directory
+    # local_src_qemu_path = /tmp/qemu-0.15.1
+
+    # Guest Kernel installation from a GIT repo
+    git_repo_guest_kernel_build_helper = linux_kernel
+    git_repo_guest_kernel_uri = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
+    git_repo_guest_kernel_branch = master
+    #git_repo_guest_kernel_patches = ['http://foo/bar.patch', 'http://foo/baz.patch']
+    git_repo_guest_kernel_config =  http://foo/bar/kernel-config
+    git_repo_guest_kernel_build_target = bzImage
+    git_repo_guest_kernel_build_image  = arch/x86/boot/bzImage
+    # Should be same as the kernel variable defined in guest-os.cfg. Which is
+    # used to boot the guest.
+    git_repo_guest_kernel_kernel_path = images/bzImage
+
+    # QEMU installation from a GIT repo
+    git_repo_qemu_uri = git://git.qemu.org/qemu.git
+    git_repo_qemu_configure_options = --target-list=x86_64-softmmu --enable-spice
+    # if you have a git repo that is closer to you, you may
+    # use it to fetch object first from it, and then later from "upstream"
+    # git_repo_qemu_base_uri = /home/user/code/qemu
+
+
+    # QEMU installation from a GIT repo (signed tags)
+    #git_repo_qemu_uri = git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git
+    #git_repo_qemu_configure_options = --target-list=x86_64-softmmu
+    #git_repo_qemu_tag = for_anthony
+    # If tag_signed is provided, then we will be strict and verify the
+    # tag. If the tag verification fails, the entire build test will fail.
+    # A file with the trusted GPG keys should be put at shared/gpg. The
+    # build test will look for it. If not found, the test will fail.
+    #git_repo_qemu_tag_signed = mst.keys
+
+    # SPICE installation from a GIT repo
+    git_repo_spice_uri = git://cgit.freedesktop.org/spice/spice
+    git_repo_spice_protocol_uri = git://git.freedesktop.org/git/spice/spice-protocol
+
+    # QEMU (KVM) installation from a YUM repo
+    # yum_qemu_kvm_pkgs = ['qemu-kvm', 'qemu-kvm-tools', 'qemu-system-x86', 'qemu-common', 'qemu-img']
+
+    # QEMU (KVM) installation from koji/brew
+    # koji_qemu_kvm_tag = dist-f15
+    # koji_qemu_kvm_pkgs = :qemu:qemu-common,qemu-img,qemu-kvm,qemu-system-x86,qemu-kvm-tools seabios vgabios :gpxe:gpxe-roms-qemu :spice:spice-server
+
+    # Koji/brew scratch builds notes:
+    #
+    # Packages from scratch builds have a different syntax:
+    #
+    #  user:task_id[:pkg1,pkg2]
+    #
+    # If you include a subset of packages and want to have debuginfo packages
+    # you must *manually* add it to the list, as there's no way to know for
+    # sure the main package name for scratch builds. If you set only the
+    # user name and task id, all packages, including -debuginfo will be
+    # installed.
+    #
+    # koji_qemu_kvm_scratch_pkgs = jdoe:1000:qemu-kvm,qemu-system-x86,qemu-kvm-tools,qemu-img,qemu-kvm-debuginfo
+
+    ######################################################################
+    # INSTALLERS SELECTION
+    # Choose here what components you want to install
+    ######################################################################
+    installers = git_repo_spice_protocol git_repo_spice git_repo_qemu
+
+    # Choose wether you want to include debug information/symbols
+    install_debug_info = yes

qemu/tests/cfg/jumbo.cfg → tests/cfg/jumbo.cfg

 - jumbo: install setup image_copy unattended_install.cdrom
+    virt_test_type = qemu libvirt
     no RHEL.3.9
     no RHEL.4
     requires_root = yes

qemu/tests/cfg/module_probe.cfg → tests/cfg/module_probe.cfg

 - module_probe:
+    virt_test_type = qemu
     type = module_probe
     requires_root = yes
     # You can specify your own module list, though it is not needed usually.

qemu/tests/cfg/nfs_corrupt.cfg → tests/cfg/nfs_corrupt.cfg

 - nfs_corrupt:
     only Linux
+    virt_test_type = qemu libvirt
     type = nfs_corrupt
     requires_root = yes
     start_vm = no