Merge remote branch 'cros/upstream' into master

client/tests/kvm/control

Index: client/tests/kvm/control
diff --git a/client/tests/kvm/control b/client/tests/kvm/control
index 63bbe5dde2eade5fa29f3cee1856d0285ee491f7..d226adf3751a5ab2bbbcd84ccb7a84e474a781cc 100644
--- a/client/tests/kvm/control
+++ b/client/tests/kvm/control
@@ -53,6 +53,20 @@ str = """
 """
 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