diff options
author | simonhatch <simonhatch@chromium.org> | 2014-12-08 13:00:35 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-08 21:01:57 +0000 |
commit | d674bae2fd913ca0338a76b870321a070456a2b8 (patch) | |
tree | d2afbba8abf83dc1bbfca6e095a0e23b8a2e4bea | |
parent | 93570e26b8f852041f5729fe40f53361ee1e6b49 (diff) | |
download | chromium_src-d674bae2fd913ca0338a76b870321a070456a2b8.zip chromium_src-d674bae2fd913ca0338a76b870321a070456a2b8.tar.gz chromium_src-d674bae2fd913ca0338a76b870321a070456a2b8.tar.bz2 |
[bisect] - Fix sync annotation.
The build/run steps use the version from the config, but the sync is still using the resolved git hash. Change this so they all match.
http://build.chromium.org/p/tryserver.chromium.perf/builders/linux_perf_bisect/builds/1121
Syncing [14ef64e8d0bfbf89cde4b0a9d265785370ab4806]
becomes
Syncing [307025]
BUG=
Review URL: https://codereview.chromium.org/782753002
Cr-Commit-Position: refs/heads/master@{#307334}
-rwxr-xr-x | tools/run-bisect-perf-regression.py | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/tools/run-bisect-perf-regression.py b/tools/run-bisect-perf-regression.py index 133d961..144cab9 100755 --- a/tools/run-bisect-perf-regression.py +++ b/tools/run-bisect-perf-regression.py @@ -331,6 +331,8 @@ def _GetStepAnnotationStringsDict(config): 'build2': 'Building [%s]' % config['bad_revision'], 'run1': 'Running [%s]' % config['good_revision'], 'run2': 'Running [%s]' % config['bad_revision'], + 'sync1': 'Syncing [%s]' % config['good_revision'], + 'sync2': 'Syncing [%s]' % config['bad_revision'], 'results_label1': config['good_revision'], 'results_label2': config['bad_revision'], } @@ -345,11 +347,14 @@ def _GetStepAnnotationStringsDict(config): } -def _RunBuildStepForPerformanceTest(bisect_instance, build_string, revision): +def _RunBuildStepForPerformanceTest(bisect_instance, + build_string, + sync_string, + revision): if revision: - bisect_utils.OutputAnnotationStepStart('Syncing [%s]' % revision) + bisect_utils.OutputAnnotationStepStart(sync_string) if not source_control.SyncToRevision(revision, 'gclient'): - raise RuntimeError('Failed to sync to [%s].' % revision) + raise RuntimeError('Failed [%s].' % sync_string) bisect_utils.OutputAnnotationStepClosed() bisect_utils.OutputAnnotationStepStart(build_string) @@ -403,7 +408,10 @@ def _RunPerformanceTest(config): annotations_dict = _GetStepAnnotationStringsDict(config) b = bisect_perf_regression.BisectPerformanceMetrics(opts, os.getcwd()) - _RunBuildStepForPerformanceTest(b, annotations_dict['build1'], revisions[0]) + _RunBuildStepForPerformanceTest(b, + annotations_dict.get('build1'), + annotations_dict.get('sync1'), + revisions[0]) results_with_patch = _RunCommandStepForPerformanceTest( b, opts, True, True, annotations_dict['results_label1'], @@ -419,7 +427,10 @@ def _RunPerformanceTest(config): os.path.join('third_party', 'WebKit')) bisect_utils.OutputAnnotationStepClosed() - _RunBuildStepForPerformanceTest(b, annotations_dict['build2'], revisions[1]) + _RunBuildStepForPerformanceTest(b, + annotations_dict.get('build2'), + annotations_dict.get('sync2'), + revisions[1]) results_without_patch = _RunCommandStepForPerformanceTest( b, opts, False, True, annotations_dict['results_label2'], |