From patchwork Tue Jun 22 01:24:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 107319 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5M1OQm8003022 for ; Tue, 22 Jun 2010 01:24:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758773Ab0FVBY1 (ORCPT ); Mon, 21 Jun 2010 21:24:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52556 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758768Ab0FVBY0 (ORCPT ); Mon, 21 Jun 2010 21:24:26 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5M1OP8o007471 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 21 Jun 2010 21:24:25 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5M1OO7x003293; Mon, 21 Jun 2010 21:24:25 -0400 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 o5M1OKWd030000; Mon, 21 Jun 2010 21:24:23 -0400 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH] KVM test: concentrate image and cdrom filename prefixes in tests.cfg.sample Date: Tue, 22 Jun 2010 04:24:15 +0300 Message-Id: <1277169855-14823-3-git-send-email-mgoldish@redhat.com> In-Reply-To: <1277169855-14823-2-git-send-email-mgoldish@redhat.com> References: <1277169855-14823-1-git-send-email-mgoldish@redhat.com> <1277169855-14823-2-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 22 Jun 2010 01:24:42 +0000 (UTC) diff --git a/client/tests/kvm/tests.cfg.sample b/client/tests/kvm/tests.cfg.sample index a55a320..b303686 100644 --- a/client/tests/kvm/tests.cfg.sample +++ b/client/tests/kvm/tests.cfg.sample @@ -4,19 +4,17 @@ include tests_base.cfg include cdkeys.cfg -# Modify/comment the following lines if you wish to modify -# the paths of the image files, ISO files, step files or qemu binaries. +# Modify/comment the following lines if you wish to modify the paths of the +# image files, ISO files or qemu binaries. # # As for the defaults: # * 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 /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_img_binary = /usr/bin/qemu-img -image_name.* ?<= /tmp/kvm_autotest_root/ -cdrom.* ?<= /tmp/kvm_autotest_root/ -steps ?<= /tmp/kvm_autotest_root/ +image_name.* ?<= /tmp/kvm_autotest_root/images/ +cdrom.* ?<= /tmp/kvm_autotest_root/isos/ # Here are the test sets variants. The variant 'qemu_kvm_windows_quick' is # fully commented, the following ones have comments only on noteworthy points diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index ec61a5e..2c78cfc 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -1447,6 +1447,4 @@ variants: devices_requested = 7 -image_name.* ?<= images/ -cdrom.* ?<= isos/ steps ?<= steps/