commit 9c289b65d27a889dbe6033d49875afb118086676
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 07 23:41:56 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 07 23:41:56 2020 +0000
tree 5a104923cf3b11f85f8744613b2dc01f88e94644
parent 81b366354df4b9f0073933cacaf6bc2fa11c8ba3
parent a098a685dc9a9b6387c3361b3986068247efd541

telemetry_Crosperf: use devserver for lab runs am: a098a685dc

Change-Id: If3befd88487bd9877ab39b74958053cc162edc91

server/site_tests/telemetry_Crosperf/telemetry_Crosperf.py

diff --git a/server/site_tests/telemetry_Crosperf/telemetry_Crosperf.py b/server/site_tests/telemetry_Crosperf/telemetry_Crosperf.py
index 3be42d7..cf270bf 100644
--- a/server/site_tests/telemetry_Crosperf/telemetry_Crosperf.py
+++ b/server/site_tests/telemetry_Crosperf/telemetry_Crosperf.py
@@ -264,13 +264,21 @@
 
     output_format = 'histograms'
 
+    # For local runs, we set local=True and use local chrome source to run
+    # tests; for lab runs, we use devserver instead.
+    # By default to be True.
+    local = args.get('local', 'true').lower() == 'true'
+
     # If run_local=true, telemetry benchmark will run on DUT, otherwise
     # run remotely from host.
-    telemetry_on_dut = args.get('run_local').lower() == 'true'
+    # By default to be False.
+    # TODO(zhizhouy): It is better to change the field name from "run_local"
+    # to "telemetry_on_dut" in crosperf experiment files for consistency.
+    telemetry_on_dut = args.get('run_local', '').lower() == 'true'
 
-    # Init TelemetryRunner, do not use devserver by setting local=True.
+    # Init TelemetryRunner.
     tr = telemetry_runner.TelemetryRunner(
-        dut, local=True, telemetry_on_dut=telemetry_on_dut)
+        dut, local=local, telemetry_on_dut=telemetry_on_dut)
 
     # Run the test. And collect profile if needed.
     try: