aboutsummaryrefslogtreecommitdiff
path: root/crosperf/results_cache.py
diff options
context:
space:
mode:
authorcmtice <cmtice@google.com>2013-11-25 14:57:10 -0500
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2013-12-02 20:18:42 +0000
commite5a746fb9ba7ddb8827f73f030bf99f798ffcf9e (patch)
tree88071a475898f4ba90861922c07c4b0fdeb77d4c /crosperf/results_cache.py
parent870c1847e55058db7e7cd0631f8b3c02e10dfd40 (diff)
downloadtoolchain-utils-e5a746fb9ba7ddb8827f73f030bf99f798ffcf9e.tar.gz
Add the ability to pass arguments through test_that to Telemetry's
run_benchmark. BUG=None TEST=I have tested this with my own crosperf, and test_that is passing the arguments along properly. The telemetry_Crosperf autotest also needs to be updated before this completely works. Change-Id: Ic887380b297d966229ac21ba4e7e909e7248fcb0 Reviewed-on: https://chrome-internal-review.googlesource.com/148485 Reviewed-by: Yunlian Jiang <yunlian@google.com> Commit-Queue: Caroline Tice <cmtice@google.com> Tested-by: Caroline Tice <cmtice@google.com>
Diffstat (limited to 'crosperf/results_cache.py')
-rw-r--r--crosperf/results_cache.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/crosperf/results_cache.py b/crosperf/results_cache.py
index 39e9902a..e5aad18a 100644
--- a/crosperf/results_cache.py
+++ b/crosperf/results_cache.py
@@ -388,13 +388,14 @@ class ResultsCache(object):
CACHE_VERSION = 6
def Init(self, chromeos_image, chromeos_root, test_name, iteration,
- test_args, machine_manager, board, cache_conditions,
+ test_args, profiler_args, machine_manager, board, cache_conditions,
logger_to_use, label, share_users, suite):
self.chromeos_image = chromeos_image
self.chromeos_root = chromeos_root
self.test_name = test_name
self.iteration = iteration
- self.test_args = test_args,
+ self.test_args = test_args
+ self.profiler_args = profiler_args
self.board = board
self.cache_conditions = cache_conditions
self.machine_manager = machine_manager
@@ -457,8 +458,9 @@ class ResultsCache(object):
machine_id_checksum = machine.machine_id_checksum
break
+ temp_test_args = "%s %s" % (self.test_args, self.profiler_args)
test_args_checksum = hashlib.md5(
- "".join(self.test_args)).hexdigest()
+ "".join(temp_test_args)).hexdigest()
return (image_path_checksum,
self.test_name, str(self.iteration),
test_args_checksum,