Re: [PATCH kvm-unit-tests 5/5] x86-run: Pull extra arguments from unittests.cfg

[Gleb Natapov <gleb@redhat.com>]

On Fri, Mar 15, 2013 at 08:09:09PM -0400, Cole Robinson wrote:
> Some tests want extra arguments as enumerated in unittests.cfg,
> use them.
> 
> unittests.cfg also has a few sections about invoking certains tests
> with different combinations of options, but x86-run doesn't do
> anything with that.
With this it will not be possible to use x86-run outside of autotest,
no?

> ---
>  x86-run | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 
> diff --git a/x86-run b/x86-run
> index ab9eed9..7eebee2 100755
> --- a/x86-run
> +++ b/x86-run
> @@ -1,5 +1,6 @@
>  #!/usr/bin/env python
>  
> +import ConfigParser
>  import glob
>  import optparse
>  import os
> @@ -36,6 +37,24 @@ def check_qemu(binpath):
>  
>      return cmd + devcmd
>  
> +cfgfile = None
> +def args_for_test(testfile):
> +    global cfgfile
> +    if not cfgfile:
> +        cfgfile = ConfigParser.ConfigParser()
> +        cfgfile.read("x86/unittests.cfg")
> +
> +    testname = os.path.splitext(os.path.basename(testfile))[0]
> +    if testname not in cfgfile.sections():
> +        return ""
> +
> +    cmd = ""
> +    if cfgfile.has_option(testname, "extra_params"):
> +        cmd += cfgfile.get(testname, "extra_params")
> +    if cfgfile.has_option(testname, "smp"):
> +        cmd += " -smp %s" % int(cfgfile.get(testname, "smp"))
> +    return cmd
> +
>  
>  def parse_args():
>      parser = optparse.OptionParser(
> @@ -67,6 +86,7 @@ def main():
>      ret = 0
>      for testfile in testfiles:
>          cmd = basecmd + " -kernel %s" % testfile
> +        cmd += " " + args_for_test(testfile)
>          print cmd
>  
>          cmdret = os.system(cmd) >> 8
> -- 
> 1.8.1.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
			Gleb.