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@xxxxxxxxxx>
> Signed-off-by: Jason Wang <jasowang@xxxxxxxxxx>
> ---
> 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@xxxxxxxxxxxxxxx
> http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
--
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
