From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?windows-1252?Q?Luk=E1=9A_Doktor?= Subject: Re: [PATCH 3/4] [KVM-autotest] tests.cfg.sample: change import order Date: Mon, 12 Mar 2012 08:15:10 +0100 Message-ID: <4F5DA27E.8050904@redhat.com> References: <1330368163-18384-1-git-send-email-ldoktor@redhat.com> <1330368163-18384-4-git-send-email-ldoktor@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: quoted-printable Cc: autotest@test.kernel.org, kvm-autotest@redhat.com, kvm@vger.kernel.org To: lei yang Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: autotest-bounces@test.kernel.org Errors-To: autotest-bounces@test.kernel.org List-Id: kvm.vger.kernel.org Hi, it caused problems so I had to modify it a bit. It's already fixed and = applied in upstream. Regards, Luk=E1=9A Dne 12.3.2012 04:34, lei yang napsal(a): > Howerver, you did the opposite thing or you did it two times > > commit 6e4b5cffe999714357116884fcc4eb27fae41260 > Author: Lucas Meneghel Rodrigues > 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 =3D kvm > > > Lei > > > On Tue, Feb 28, 2012 at 2:42 AM, Lukas Doktor 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 >> --- >> 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 =3D kvm >> -- >> 1.7.7.6 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe kvm" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html