public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Eduardo Habkost <ehabkost@redhat.com>
To: autotest@test.kernel.org, kvm@vger.kernel.org
Subject: [KVM-AUTOTEST PATCH 1/5] kvm_config: accept multiple filenames as argument
Date: Thu,  6 Jan 2011 14:12:32 -0200	[thread overview]
Message-ID: <1294330356-17043-2-git-send-email-ehabkost@redhat.com> (raw)
In-Reply-To: <1294330356-17043-1-git-send-email-ehabkost@redhat.com>

From: Eduardo Habkost <ehabkost@raisama.net>

Useful to test and debug cases where config settings are concatenated together,
without the need to change the base .cfg file.

Signed-off-by: Eduardo Habkost <ehabkost@raisama.net>
---
 client/tests/kvm/kvm_config.py |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/client/tests/kvm/kvm_config.py b/client/tests/kvm/kvm_config.py
index 4fc1029..45d8fe6 100755
--- a/client/tests/kvm/kvm_config.py
+++ b/client/tests/kvm/kvm_config.py
@@ -682,15 +682,18 @@ if __name__ == "__main__":
     options, args = parser.parse_args()
     debug = options.debug
     if args:
-        filename = args[0]
+        filenames = args
     else:
-        filename = os.path.join(os.path.dirname(sys.argv[0]), "tests.cfg")
+        filenames = [os.path.join(os.path.dirname(sys.argv[0]), "tests.cfg")]
 
     # Here we configure the stand alone program to use the autotest
     # logging system.
     logging_manager.configure_logging(kvm_utils.KvmLoggingConfig(),
                                       verbose=debug)
-    dicts = config(filename, debug=debug).get_generator()
+    cfg = config(debug=debug)
+    for fn in filenames:
+        cfg.parse_file(fn)
+    dicts = cfg.get_generator()
     for i, dict in enumerate(dicts):
         logging.info("Dictionary #%d:", i)
         keys = dict.keys()
-- 
1.7.3.2

  reply	other threads:[~2011-01-06 16:12 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-06 16:12 [KVM-AUTOTEST PATCH 0/5] small kvm_config usability changes Eduardo Habkost
2011-01-06 16:12 ` Eduardo Habkost [this message]
2011-01-06 16:12 ` [KVM-AUTOTEST PATCH 2/5] kvm_config: print directly to stdout instead of using logging Eduardo Habkost
2011-01-06 16:12 ` [KVM-AUTOTEST PATCH 3/5] kvm_config: store filename on configreader Eduardo Habkost
2011-01-06 16:12 ` [KVM-AUTOTEST PATCH 4/5] kvm_config: add helper to raise exception informing line number Eduardo Habkost
2011-01-11  3:48   ` Lucas Meneghel Rodrigues
2011-01-11 12:52     ` Eduardo Habkost
2011-01-06 16:12 ` [KVM-AUTOTEST PATCH 5/5] kvm_config: inform filename and line number on error message Eduardo Habkost

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1294330356-17043-2-git-send-email-ehabkost@redhat.com \
    --to=ehabkost@redhat.com \
    --cc=autotest@test.kernel.org \
    --cc=kvm@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox