From eccb462d1a6626771067b771d877a2d26a10cea9 Mon Sep 17 00:00:00 2001 From: Xu Tian Date: Thu, 17 Oct 2013 17:58:18 +0800 Subject: [PATCH] qemu.tests: small fix for qemu_iotests since qemu_iotests merged into tests/qemu_iotests, add param qemu_iotests_dir to set iotests root dir; And updated default git repo to qemu-kvm new repo; Signed-off-by: Xu Tian --- qemu/tests/cfg/qemu_iotests.cfg | 2 +- qemu/tests/qemu_iotests.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/qemu/tests/cfg/qemu_iotests.cfg b/qemu/tests/cfg/qemu_iotests.cfg index ef27d323..415a245f 100644 --- a/qemu/tests/cfg/qemu_iotests.cfg +++ b/qemu/tests/cfg/qemu_iotests.cfg @@ -3,7 +3,7 @@ vms = '' profilers = '' take_regular_screendumps = no - qemu_io_uri = git://git.kernel.org/pub/scm/linux/kernel/git/hch/qemu-iotests.git + qemu_io_uri = git://git.qemu.org/qemu.git qemu_io_branch = master qemu_io_lbranch = master #qemu_io_commit = diff --git a/qemu/tests/qemu_iotests.py b/qemu/tests/qemu_iotests.py index 82a40d7a..d9466594 100644 --- a/qemu/tests/qemu_iotests.py +++ b/qemu/tests/qemu_iotests.py @@ -18,12 +18,13 @@ def run_qemu_iotests(test, params, env): :param env: Dictionary with test environment. """ # First, let's get qemu-io - std = "git://git.kernel.org/pub/scm/linux/kernel/git/hch/qemu-iotests.git" + std = "http://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git" uri = params.get("qemu_io_uri", std) branch = params.get("qemu_io_branch", 'master') lbranch = params.get("qemu_io_lbranch", 'master') commit = params.get("qemu_io_commit", None) base_uri = params.get("qemu_io_base_uri", None) + iotests_dir = params.get("qemu_iotests_dir", "tests/qemu-iotests") destination_dir = os.path.join(test.srcdir, "qemu_io_tests") git.get_repo(uri=uri, branch=branch, lbranch=lbranch, commit=commit, destination_dir=destination_dir, base_uri=base_uri) @@ -33,7 +34,8 @@ def run_qemu_iotests(test, params, env): os.environ["QEMU_IMG_PROG"] = utils_misc.get_qemu_img_binary(params) os.environ["QEMU_IO_PROG"] = utils_misc.get_qemu_io_binary(params) - os.chdir(destination_dir) + # qemu-iotests has merged into tests/qemu_iotests folder + os.chdir(os.path.join(destination_dir, iotests_dir)) image_format = params["qemu_io_image_format"] extra_options = params.get("qemu_io_extra_options", "") -- GitLab