From mboxrd@z Thu Jan 1 00:00:00 1970 From: Amos Kong Subject: Re: [Autotest] [PATCH 2/2] KVM test: unittest: Build unittests from new repo Date: Wed, 8 Sep 2010 06:12:17 +0800 Message-ID: <20100907221217.GA351@z> References: <20100906093303.7075.52993.stgit@FreeLancer> <20100906093311.7075.6537.stgit@FreeLancer> Reply-To: Amos Kong Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: lmr@redhat.com, autotest@test.kernel.org, kvm@vger.kernel.org To: Jason Wang Return-path: Received: from mx1.redhat.com ([209.132.183.28]:29374 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753578Ab0IGWMW (ORCPT ); Tue, 7 Sep 2010 18:12:22 -0400 Content-Disposition: inline In-Reply-To: <20100906093311.7075.6537.stgit@FreeLancer> Sender: kvm-owner@vger.kernel.org List-ID: 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 > Signed-off-by: Jason Wang > --- > 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