From patchwork Thu Feb 17 17:51:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 571151 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1HHpenP003339 for ; Thu, 17 Feb 2011 17:51:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753612Ab1BQRvh (ORCPT ); Thu, 17 Feb 2011 12:51:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56217 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750963Ab1BQRvh (ORCPT ); Thu, 17 Feb 2011 12:51:37 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p1HHpaEo022115 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 17 Feb 2011 12:51:36 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p1HHpZ6f031950; Thu, 17 Feb 2011 12:51:36 -0500 Received: from qu0061.eng.lab.tlv.redhat.com ([10.35.16.61]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id p1HHpXD4020116; Thu, 17 Feb 2011 12:51:34 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 2/4] KVM test: kvm_config.py: allow 'include' when parsing strings Date: Thu, 17 Feb 2011 19:51:47 +0200 Message-Id: <1297965109-14293-2-git-send-email-mgoldish@redhat.com> In-Reply-To: <1297965109-14293-1-git-send-email-mgoldish@redhat.com> References: <1297965109-14293-1-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 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.6 (demeter1.kernel.org [140.211.167.41]); Thu, 17 Feb 2011 17:51:44 +0000 (UTC) diff --git a/client/tests/kvm/kvm_config.py b/client/tests/kvm/kvm_config.py index cab0022..27c3171 100755 --- a/client/tests/kvm/kvm_config.py +++ b/client/tests/kvm/kvm_config.py @@ -441,11 +441,10 @@ class Parser(object): if len(words) < 2: raise ParserError("Syntax error: missing parameter", line, cr.filename, linenum) - if not isinstance(cr, FileReader): - raise ParserError("Cannot include because no file is " - "currently open", - line, cr.filename, linenum) - filename = os.path.join(os.path.dirname(cr.filename), words[1]) + filename = os.path.expanduser(words[1]) + if isinstance(cr, FileReader) and not os.path.isabs(filename): + filename = os.path.join(os.path.dirname(cr.filename), + filename) if not os.path.isfile(filename): self._warn("%r (%s:%s): file doesn't exist or is not a " "regular file", line, cr.filename, linenum)