Re: [PATCH 1/6] KVM test: Removing qemu/qemu-kvm variants from tests

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



----- "Lucas Meneghel Rodrigues" <lmr@xxxxxxxxxx> wrote:

> The idea of having a qemu/qemu-kvm variants block
> turned out to be a bad idea, since we are never meant
> to run them in combination. So let's roll back
> this change and give some examples on tests.cfg.
> 
> Also, cleaned up tests.cfg.sample, and introduced
> Fedora 12 as the default host, as it is the latest
> Fedora upstream.
> 
> Signed-off-by: Lucas Meneghel Rodrigues <lmr@xxxxxxxxxx>
> ---
>  client/tests/kvm/tests.cfg.sample      |   48
> ++++++--------------------------
>  client/tests/kvm/tests_base.cfg.sample |    8 -----
>  2 files changed, 9 insertions(+), 47 deletions(-)
> 
> diff --git a/client/tests/kvm/tests.cfg.sample
> b/client/tests/kvm/tests.cfg.sample
> index bde4efa..c478ba2 100644
> --- a/client/tests/kvm/tests.cfg.sample
> +++ b/client/tests/kvm/tests.cfg.sample
> @@ -20,66 +20,36 @@ include cdkeys.cfg
>  #cdrom.* ?<= /tmp/kvm_autotest_root/
>  #steps ?<= /tmp/kvm_autotest_root/
>  
> -# You will notice that in all test definition blocks we have 'only
> qemu-kvm'
> -# set. This means that qemu-kvm command line syntax will be used. If
> you
> -# intend to test qemu upstream, you'll have to change that to 'only
> qemu'.
>  variants:
>      - @full:
> -        only qemu-kvm
> -    - @sample1:
> -        only qemu-kvm
> -        only no_pci_assignable
> -        only Fedora Windows
> -    - @sample2:
> +    - @fc12_qemu:
>          only qemu-kvm

Didn't you mean to remove this line?

>          only qcow2
>          only ide
>          only default
>          only up
>          only no_pci_assignable
> -        only Fedora.9.* RHEL.5.* Windows
> -        only rtl8139
> -    - @sample3:
> -        only qemu-kvm
> -        only no_pci_assignable
> -        only
> qcow2.*ide.*default.*up.*Ubuntu-8.10-server.*(autotest.sleeptest)
> -        only rtl8139
> -    - @fc8_step:
> -        only qemu-kvm
> -        only qcow2
> -        only ide
> -        only default
> -        only up
> -        only no_pci_assignable
> -        only Fedora.8.32
> -        only install setup boot shutdown
> -        only rtl8139
> -        only hugepages
> -    - @winXP_32_unattended:
> -        only qemu-kvm
> -        only qcow2
> -        only ide
> -        only default
> -        only up
> -        only no_pci_assignable
> -        only WinXP.32
> +        only Fedora.12.64
>          no install setup
>          no hugepages
>          only unattended_install boot shutdown
>          only rtl8139
> -    - @fc11_kickstart:
> +        # The only change needed to test qemu upstream
> +        # instead of qemu-kvm is the explicit -enable-kvm
> +        # that has to be passed to the command line
> +        extra_params = ' -enable-kvm'
> +    - @fc12_qemu_kvm:
>          only qemu-kvm

Same here.

>          only qcow2
>          only ide
>          only default
>          only up
>          only no_pci_assignable
> -        only Fedora.11.64
> +        only Fedora.12.64
>          no install setup
>          no hugepages
>          only unattended_install boot shutdown
>          only rtl8139
>  
>  # Choose your test list from the testsets defined
> -only fc11_kickstart
> -
> +only fc12_qemu_kvm
> diff --git a/client/tests/kvm/tests_base.cfg.sample
> b/client/tests/kvm/tests_base.cfg.sample
> index 2d03f1f..8a7a13d 100644
> --- a/client/tests/kvm/tests_base.cfg.sample
> +++ b/client/tests/kvm/tests_base.cfg.sample
> @@ -62,8 +62,6 @@ variants:
>  
>      - unattended_install:
>          type = unattended_install
> -        # Unattended install also perform guest setup, so setup is
> not needed
> -        no setup
>          kill_vm_on_error = yes
>          force_create_image = yes
>          pre_command = scripts/unattended.py
> @@ -894,12 +892,6 @@ linux_s3:
>  
>  
>  variants:
> -    - @qemu-kvm:
> -    - qemu:
> -        extra_params += " -enable-kvm"
> -
> -
> -variants:
>      - @up:
>          no autotest.npb
>      - smp2:
> -- 
> 1.6.6
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux