Adding support of telemetry to crosperf

BUG=None
TEST=run crosperf with pyauto/telemetry test with/without cache.
      all pass.

Change-Id: If07ac020a9107a79d5780a58fd6dcc924d07f07f
Reviewed-on: https://gerrit-int.chromium.org/36594
Reviewed-by: Luis Lozano <llozano@chromium.org>
Commit-Queue: Yunlian Jiang <yunlian@google.com>
Tested-by: Yunlian Jiang <yunlian@google.com>
Reviewed-on: https://gerrit-int.chromium.org/39241
Reviewed-by: Yunlian Jiang <yunlian@google.com>

1 files changed, 21 insertions, 8 deletions

diff --git a/crosperf/settings_factory.py b/crosperf/settings_factory.py
index 5cbae5df..365b8cbd 100644
--- a/crosperf/settings_factory.py
+++ b/crosperf/settings_factory.py
@@ -17,15 +17,15 @@ from settings import Settings
 class BenchmarkSettings(Settings):
   def __init__(self, name):
     super(BenchmarkSettings, self).__init__(name, "benchmark")
-    self.AddField(TextField("autotest_name",
-                            description="The name of the autotest to run."
+    self.AddField(TextField("test_name",
+                            description="The name of the test to run."
                             "Defaults to the name of the benchmark."))
-    self.AddField(TextField("autotest_args",
+    self.AddField(TextField("test_args",
                             description="Arguments to be passed to the "
-                            "autotest."))
+                            "test."))
     self.AddField(IntegerField("iterations", default=1,
                                description="Number of iterations to run the "
-                               "autotest."))
+                               "test."))
     self.AddField(FloatField("outlier_range", default=0.2,
                              description="The percentage of highest/lowest "
                              "values to omit when computing the average."))
@@ -40,6 +40,8 @@ class BenchmarkSettings(Settings):
                             "enables perf commands to record perforamance "
                             "related counters. It  must start with perf "
                             "command record or stat followed by arguments."))
+    self.AddField(TextField("suite", default="pyauto",
+                               description="The type of the benchmark"))
 
 
 class LabelSettings(Settings):
@@ -66,6 +68,11 @@ class LabelSettings(Settings):
                             "image_chromeos.py."))
     self.AddField(TextField("cache_dir", default="",
                             description="The cache dir for this image."))
+    self.AddField(TextField("chrome_src",
+                            description="The path to the source of chrome. "
+                            "This is used to run telemetry benchmarks. "
+                            "The default one is the src inside chroot.",
+                            required=False, default=""))
 
 
 class GlobalSettings(Settings):
@@ -80,7 +87,7 @@ class GlobalSettings(Settings):
                             description="A comma-separated list of ip's of "
                             "chromeos devices to run experiments on."))
     self.AddField(BooleanField("rerun_if_failed", description="Whether to "
-                               "re-run failed autotest runs or not.",
+                               "re-run failed test runs or not.",
                                default=False))
     self.AddField(BooleanField("rm_chroot_tmp", default=False,
                                description="Whether remove the run_remote_test"
@@ -88,7 +95,7 @@ class GlobalSettings(Settings):
     self.AddField(ListField("email", description="Space-seperated"
                             "list of email addresses to send email to."))
     self.AddField(BooleanField("rerun", description="Whether to ignore the "
-                               "cache and for autotests to be re-run.",
+                               "cache and for tests to be re-run.",
                                default=False))
     self.AddField(BooleanField("same_specs", default=True,
                                description="Ensure cached runs are run on the "
@@ -99,7 +106,7 @@ class GlobalSettings(Settings):
                                "exact the same remote"))
     self.AddField(IntegerField("iterations", default=1,
                                description="Number of iterations to run all "
-                               "autotests."))
+                               "tests."))
     self.AddField(TextField("chromeos_root",
                             description="The path to a chromeos checkout which "
                             "contains a src/scripts directory. Defaults to "
@@ -128,6 +135,12 @@ class GlobalSettings(Settings):
                             "use. It accepts multiple users seperated by \",\""))
     self.AddField(TextField("results_dir", default="",
                             description="The results dir"))
+    self.AddField(TextField("chrome_src",
+                            description="The path to the source of chrome. "
+                            "This is used to run telemetry benchmarks. "
+                            "The default one is the src inside chroot.",
+
+                            required=False, default=""))
 
 
 class SettingsFactory(object):