Merge remote branch 'cros/upstream' into tempbranch
BUG=
TEST=
Review URL: http://codereview.chromium.org/4823005
Change-Id: I5d56f1c10d0fce7f9d7dc3ad727ea52dcb9b2d6c
diff --git a/client/samples/control.parallel b/client/samples/control.parallel
new file mode 100644
index 0000000..47a5ac9
--- /dev/null
+++ b/client/samples/control.parallel
@@ -0,0 +1,20 @@
+AUTHOR = "Autotest Team <autotest@test.kernel.org>"
+TIME = "SHORT"
+NAME = "Sample - Parallel test execution"
+TEST_TYPE = "client"
+TEST_CLASS = "Kernel"
+TEST_CATEGORY = "Functional"
+
+DOC = """
+Runs 2 client tests in parallel, with different options.
+"""
+
+def kernbench():
+ job.run_test('kernbench', iterations=2, threads=5)
+
+
+def dbench():
+ job.run_test('dbench')
+
+
+job.parallel([kernbench], [dbench])