From patchwork Wed Dec 23 16:32:35 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 69568 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBNGYJCE026369 for ; Wed, 23 Dec 2009 16:34:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756508AbZLWQeQ (ORCPT ); Wed, 23 Dec 2009 11:34:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756511AbZLWQeP (ORCPT ); Wed, 23 Dec 2009 11:34:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42195 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756273AbZLWQeP (ORCPT ); Wed, 23 Dec 2009 11:34:15 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBNGYDQ5003817 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 23 Dec 2009 11:34:13 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBNGYCaE018874; Wed, 23 Dec 2009 11:34:12 -0500 Received: from localhost.localdomain (dhcp-1-188.tlv.redhat.com [10.35.1.188]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id nBNGYAMO023359; Wed, 23 Dec 2009 11:34:11 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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/ +