* [PATCH 1/2] KVM test: unittest: Fix the broken smp params @ 2010-09-06 9:33 Jason Wang 2010-09-06 9:33 ` [PATCH 2/2] KVM test: unittest: Build unittests from new repo Jason Wang 2010-09-07 17:17 ` [PATCH 1/2] KVM test: unittest: Fix the broken smp params Lucas Meneghel Rodrigues 0 siblings, 2 replies; 4+ messages in thread From: Jason Wang @ 2010-09-06 9:33 UTC (permalink / raw) To: lmr, autotest; +Cc: kvm Make smp param in unittests.cfg works again. Signed-off-by: Jason Wang <jasowang@redhat.com> --- client/tests/kvm/tests/unittest.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/client/tests/kvm/tests/unittest.py b/client/tests/kvm/tests/unittest.py index 69c4b43..54e5f73 100644 --- a/client/tests/kvm/tests/unittest.py +++ b/client/tests/kvm/tests/unittest.py @@ -73,6 +73,7 @@ def run_unittest(test, params, env): smp = None if parser.has_option(t, 'smp'): smp = int(parser.get(t, 'smp')) + params['smp'] = smp extra_params = None if parser.has_option(t, 'extra_params'): ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] KVM test: unittest: Build unittests from new repo 2010-09-06 9:33 [PATCH 1/2] KVM test: unittest: Fix the broken smp params Jason Wang @ 2010-09-06 9:33 ` Jason Wang 2010-09-07 22:12 ` [Autotest] " Amos Kong 2010-09-07 17:17 ` [PATCH 1/2] KVM test: unittest: Fix the broken smp params Lucas Meneghel Rodrigues 1 sibling, 1 reply; 4+ messages in thread From: Jason Wang @ 2010-09-06 9:33 UTC (permalink / raw) To: lmr, autotest; +Cc: kvm Kvm-unit-tests have moved to a repo out of qemu-kvm. This patch let the unittest could build the tests from specified git repo. Signed-off-by: Jason Wang <jasowang@redhat.com> --- client/tests/kvm/tests/build.py | 16 ++++++++++++++-- client/tests/kvm/unittests.cfg.sample | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/client/tests/kvm/tests/build.py b/client/tests/kvm/tests/build.py index 5a8f3b0..f39371a 100644 --- a/client/tests/kvm/tests/build.py +++ b/client/tests/kvm/tests/build.py @@ -495,18 +495,22 @@ class GitInstaller(SourceDirInstaller): kernel_repo = params.get("git_repo") user_repo = params.get("user_git_repo") kmod_repo = params.get("kmod_repo") + test_repo = params.get("test_git_repo") kernel_branch = params.get("kernel_branch", "master") user_branch = params.get("user_branch", "master") kmod_branch = params.get("kmod_branch", "master") + test_branch = params.get("test_branch", "master") kernel_lbranch = params.get("kernel_lbranch", "master") user_lbranch = params.get("user_lbranch", "master") kmod_lbranch = params.get("kmod_lbranch", "master") + test_lbranch = params.get("test_lbranch", "master") kernel_commit = params.get("kernel_commit", None) user_commit = params.get("user_commit", None) kmod_commit = params.get("kmod_commit", None) + test_commit = params.get("test_commit", None) kernel_patches = eval(params.get("kernel_patches", "[]")) user_patches = eval(params.get("user_patches", "[]")) @@ -529,8 +533,16 @@ class GitInstaller(SourceDirInstaller): os.path.basename(patch))) utils.system('patch -p1 %s' % os.path.basename(patch)) - unittest_cfg = os.path.join(userspace_srcdir, 'kvm', 'test', 'x86', - 'unittests.cfg') + if test_repo: + test_srcdir = os.path.join(self.srcdir, "kvm-unit-tests") + kvm_utils.get_git_branch(test_repo, test_branch, test_srcdir, + test_commit, test_lbranch) + unittest_cfg = os.path.join(test_srcdir, 'x86', + 'unittests.cfg') + self.test_srcdir = test_srcdir + else: + unittest_cfg = os.path.join(userspace_srcdir, 'kvm', 'test', 'x86', + 'unittests.cfg') self.unittest_cfg = None if os.path.isfile(unittest_cfg): diff --git a/client/tests/kvm/unittests.cfg.sample b/client/tests/kvm/unittests.cfg.sample index 7ea0674..3d32cb2 100644 --- a/client/tests/kvm/unittests.cfg.sample +++ b/client/tests/kvm/unittests.cfg.sample @@ -58,6 +58,7 @@ variants: user_git_repo = git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git user_branch = next user_lbranch = next + test_git_repo = git://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git - unittest: type = unittest ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Autotest] [PATCH 2/2] KVM test: unittest: Build unittests from new repo 2010-09-06 9:33 ` [PATCH 2/2] KVM test: unittest: Build unittests from new repo Jason Wang @ 2010-09-07 22:12 ` Amos Kong 0 siblings, 0 replies; 4+ messages in thread From: Amos Kong @ 2010-09-07 22:12 UTC (permalink / raw) To: Jason Wang; +Cc: lmr, autotest, kvm On Mon, Sep 06, 2010 at 05:33:11PM +0800, Jason Wang wrote: > Kvm-unit-tests have moved to a repo out of qemu-kvm. This patch let > the unittest could build the tests from specified git repo. Looks good for me. Reviewed-by: Amos Kong <akong@redhat.com> > Signed-off-by: Jason Wang <jasowang@redhat.com> > --- > client/tests/kvm/tests/build.py | 16 ++++++++++++++-- > client/tests/kvm/unittests.cfg.sample | 1 + > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/client/tests/kvm/tests/build.py b/client/tests/kvm/tests/build.py > index 5a8f3b0..f39371a 100644 > --- a/client/tests/kvm/tests/build.py > +++ b/client/tests/kvm/tests/build.py > @@ -495,18 +495,22 @@ class GitInstaller(SourceDirInstaller): > kernel_repo = params.get("git_repo") > user_repo = params.get("user_git_repo") > kmod_repo = params.get("kmod_repo") > + test_repo = params.get("test_git_repo") > > kernel_branch = params.get("kernel_branch", "master") > user_branch = params.get("user_branch", "master") > kmod_branch = params.get("kmod_branch", "master") > + test_branch = params.get("test_branch", "master") > > kernel_lbranch = params.get("kernel_lbranch", "master") > user_lbranch = params.get("user_lbranch", "master") > kmod_lbranch = params.get("kmod_lbranch", "master") > + test_lbranch = params.get("test_lbranch", "master") > > kernel_commit = params.get("kernel_commit", None) > user_commit = params.get("user_commit", None) > kmod_commit = params.get("kmod_commit", None) > + test_commit = params.get("test_commit", None) > > kernel_patches = eval(params.get("kernel_patches", "[]")) > user_patches = eval(params.get("user_patches", "[]")) > @@ -529,8 +533,16 @@ class GitInstaller(SourceDirInstaller): > os.path.basename(patch))) > utils.system('patch -p1 %s' % os.path.basename(patch)) > > - unittest_cfg = os.path.join(userspace_srcdir, 'kvm', 'test', 'x86', > - 'unittests.cfg') > + if test_repo: > + test_srcdir = os.path.join(self.srcdir, "kvm-unit-tests") > + kvm_utils.get_git_branch(test_repo, test_branch, test_srcdir, > + test_commit, test_lbranch) > + unittest_cfg = os.path.join(test_srcdir, 'x86', > + 'unittests.cfg') > + self.test_srcdir = test_srcdir > + else: > + unittest_cfg = os.path.join(userspace_srcdir, 'kvm', 'test', 'x86', > + 'unittests.cfg') > > self.unittest_cfg = None > if os.path.isfile(unittest_cfg): > diff --git a/client/tests/kvm/unittests.cfg.sample b/client/tests/kvm/unittests.cfg.sample > index 7ea0674..3d32cb2 100644 > --- a/client/tests/kvm/unittests.cfg.sample > +++ b/client/tests/kvm/unittests.cfg.sample > @@ -58,6 +58,7 @@ variants: > user_git_repo = git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git > user_branch = next > user_lbranch = next > + test_git_repo = git://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git > > - unittest: > type = unittest > > _______________________________________________ > Autotest mailing list > Autotest@test.kernel.org > http://test.kernel.org/cgi-bin/mailman/listinfo/autotest ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] KVM test: unittest: Fix the broken smp params 2010-09-06 9:33 [PATCH 1/2] KVM test: unittest: Fix the broken smp params Jason Wang 2010-09-06 9:33 ` [PATCH 2/2] KVM test: unittest: Build unittests from new repo Jason Wang @ 2010-09-07 17:17 ` Lucas Meneghel Rodrigues 1 sibling, 0 replies; 4+ messages in thread From: Lucas Meneghel Rodrigues @ 2010-09-07 17:17 UTC (permalink / raw) To: Jason Wang; +Cc: autotest, kvm On Mon, 2010-09-06 at 17:33 +0800, Jason Wang wrote: > Make smp param in unittests.cfg works again. The entire patchset was applied. Thank you very much for the fixes and the support for the new unittests repo, Jason! Lucas > Signed-off-by: Jason Wang <jasowang@redhat.com> > --- > client/tests/kvm/tests/unittest.py | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/client/tests/kvm/tests/unittest.py b/client/tests/kvm/tests/unittest.py > index 69c4b43..54e5f73 100644 > --- a/client/tests/kvm/tests/unittest.py > +++ b/client/tests/kvm/tests/unittest.py > @@ -73,6 +73,7 @@ def run_unittest(test, params, env): > smp = None > if parser.has_option(t, 'smp'): > smp = int(parser.get(t, 'smp')) > + params['smp'] = smp > > extra_params = None > if parser.has_option(t, 'extra_params'): > > -- > 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-09-07 22:12 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2010-09-06 9:33 [PATCH 1/2] KVM test: unittest: Fix the broken smp params Jason Wang 2010-09-06 9:33 ` [PATCH 2/2] KVM test: unittest: Build unittests from new repo Jason Wang 2010-09-07 22:12 ` [Autotest] " Amos Kong 2010-09-07 17:17 ` [PATCH 1/2] KVM test: unittest: Fix the broken smp params Lucas Meneghel Rodrigues
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).