From: Michael Goldish Subject: [KVM-AUTOTEST PATCH 1/2] KVM test: add proper prefixes to image, iso and step file paths Date: Wed, 23 Dec 2009 18:32:35 +0200 Message-ID: <1261585956-5956-1-git-send-email-mgoldish@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: autotest@test.kernel.org, kvm@vger.kernel.org Return-path: 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 Since the control file cleanup, image, iso and step files are expected directly under the KVM test dir by default, but they should be in their respective subdirectories: images should be in kvm/images/, isos should be in kvm/isos/ and step files should be in kvm/steps/. This patch: 1. Makes KVM-Autotest expect isos, images and step files under their respective subdirectories, by adding prefixes to the paths in tests_base.cfg.sample. 2. Removes unnecessary prefixes from tests.cfg.sample. 3. Fixes comments in tests.cfg.sample. Signed-off-by: Michael Goldish --- client/tests/kvm/tests.cfg.sample | 12 ++++++------ client/tests/kvm/tests_base.cfg.sample | 5 +++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/client/tests/kvm/tests.cfg.sample b/client/tests/kvm/tests.cfg.sample index b13f2e7..74c94b4 100644 --- a/client/tests/kvm/tests.cfg.sample +++ b/client/tests/kvm/tests.cfg.sample @@ -11,14 +11,14 @@ include cdkeys.cfg # On the example below: # * qemu and qemu-img are expected to be found under /usr/bin/qemu-kvm and # /usr/bin/qemu-img respectively. -# * All image files are expected under tests/kvm/images/ -# * All iso files are expected under tests/kvm/isos/ -# * All step files are expected under tests/kvm/steps_data/ +# * All image files are expected under /tmp/kvm_autotest_root/images/ +# * All iso files are expected under /tmp/kvm_autotest_root/isos/ +# * All step files are expected under /tmp/kvm_autotest_root/steps/ #qemu_binary = /usr/bin/qemu-kvm #qemu_img_binary = /usr/bin/qemu-img -#image_name.* ?<= /tmp/kvm_autotest_root/images/ -#cdrom.* ?<= /tmp/kvm_autotest_root/isos/ -#steps ?<= /tmp/kvm_autotest_root/steps_data/ +#image_name.* ?<= /tmp/kvm_autotest_root/ +#cdrom.* ?<= /tmp/kvm_autotest_root/ +#steps ?<= /tmp/kvm_autotest_root/ variants: - @full: diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index a403399..8ce4126 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -884,3 +884,8 @@ variants: pre_command = "/usr/bin/python scripts/hugepage.py /mnt/kvm_hugepage" extra_params += " -mem-path /mnt/kvm_hugepage" + +image_name.* ?<= images/ +cdrom.* ?<= isos/ +steps ?<= steps/ + -- 1.5.4.1