Merge remote branch 'cros/upstream' into master

client/tests/kvm/control

 AUTHOR = """
 uril@redhat.com (Uri Lublin)
 drusso@redhat.com (Dror Russo)
 mgoldish@redhat.com (Michael Goldish)
 dhuff@redhat.com (David Huff)
 aeromenk@redhat.com (Alexey Eromenko)
 mburns@redhat.com (Mike Burns)
 """
 TIME = 'MEDIUM'
 NAME = 'KVM test'
@@ skipping 35 matching lines @@
     sys.exit(1)
 
 str = """
 # This string will be parsed after tests.cfg.  Make any desired changes to the
 # test configuration here.  For example:
 #display = sdl
 #install|setup: timeout_multiplier = 3
 """
 tests_cfg = kvm_config.config()
 tests_cfg_path = os.path.join(kvm_test_dir, "tests.cfg")
+
+if args:
+    # We get test parameters from command line
+    for arg in args:
+        try:
+            (key, value) = re.findall("(.*)=(.*)", arg)[0]
+            if key == "only":
+                str += "only %s\n" % value
+            elif key == "no":
+                str += "no %s\n" % value
+            else:
+                str += "%s = %s\n" % (key, value)
+        except IndexError:
+            pass
 tests_cfg.fork_and_parse(tests_cfg_path, str)
 
 # Run the tests
 kvm_utils.run_tests(tests_cfg.get_generator(), job)
 
 # Generate a nice HTML report inside the job's results dir
 kvm_utils.create_report(kvm_test_dir, job.resultdir)