Howerver, you did the opposite thing or you did it two times
commit 6e4b5cffe999714357116884fcc4eb27fae41260
Author: Lucas Meneghel Rodrigues <lmr@xxxxxxxxxx>
Date: Wed Feb 29 18:47:14 2012 -0300
Revert "tests.cfg.sample: change import order"
This reverts commit e64b17d7a15602db0cd26ec55ccc902010985d0c,
as it's causing problems with the test execution order.
Signed-off-by: Lucas Meneghel Rodrigues
diff --git a/client/tests/kvm/tests-shared.cfg.sample
b/client/tests/kvm/tests-shared.cfg.sample
index bda982d..c6304b3 100644
--- a/client/tests/kvm/tests-shared.cfg.sample
+++ b/client/tests/kvm/tests-shared.cfg.sample
@@ -5,11 +5,11 @@
# Include the base config files.
include base.cfg
+include subtests.cfg
include guest-os.cfg
include guest-hw.cfg
include cdkeys.cfg
include virtio-win.cfg
-include subtests.cfg
# Virtualization type (kvm or libvirt)
vm_type = kvm
Lei
On Tue, Feb 28, 2012 at 2:42 AM, Lukas Doktor <ldoktor@xxxxxxxxxx> wrote:
> Currently subtests.cfg is proceeded and then all other configs. My test
> needs to override smp parameter in some variant which is currently
> impossible.
>
> Using words current order means: we define subtests variants, than we
> specify base and guest and other details. In the end we limit what
> we want to execute.
>
> My proposed order enables forcing base/guest params in subtest variants.
>
> By words this means we specify base, guest system, cdkeys, etc. and in
> the end we define subtests with various variants. Then we limit what
> we actually want to execute but now subtest can force varius base/guest
> settings.
>
> Signed-off-by: Lukas Doktor <ldoktor@xxxxxxxxxx>
> ---
> client/tests/kvm/tests-shared.cfg.sample | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/client/tests/kvm/tests-shared.cfg.sample b/client/tests/kvm/tests-shared.cfg.sample
> index c6304b3..bda982d 100644
> --- a/client/tests/kvm/tests-shared.cfg.sample
> +++ b/client/tests/kvm/tests-shared.cfg.sample
> @@ -5,11 +5,11 @@
>
> # Include the base config files.
> include base.cfg
> -include subtests.cfg
> include guest-os.cfg
> include guest-hw.cfg
> include cdkeys.cfg
> include virtio-win.cfg
> +include subtests.cfg
>
> # Virtualization type (kvm or libvirt)
> vm_type = kvm
> --
> 1.7.7.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
