chromium/src
0
Fork 0
Code Activity

Fix a bug in sizes.py on Windows where main_win() was returning non-zero.

Browse Source 
This was caused by an erroneous manual merge in
15bbc3bf95.

Bug: 783855, 834604
Change-Id: I1f821b5c86d7c11478f4430f68bce58238c1d9bc
Reviewed-on: https://chromium-review.googlesource.com/1019980
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552132}
This commit is contained in:
Robert Sesek
2018-04-19 19:58:34 +00:00
committed by Commit Bot
parent f0ec6de895
commit 70c56b8ff3
1 changed files with 2 additions and 7 deletions

9
infra/scripts/legacy/scripts/slave/chromium/sizes.py

@ -494,17 +494,12 @@ def main_win(options, args, results_collector):
build_dir = build_directory.GetBuildOutputDirectory(SRC_DIR) build_dir = build_directory.GetBuildOutputDirectory(SRC_DIR)
target_dir = os.path.join(build_dir, options.target) target_dir = os.path.join(build_dir, options.target)
result = 0
for f in files: for f in files:
p = os.path.join(target_dir, f) p = os.path.join(target_dir, f)
if os.path.isfile(p): if os.path.isfile(p):
this_result = get_size(p) results_collector.add_result(f, f, get_size(p), 'bytes')
if result == 0:
result = this_result
results_collector.add_result(f, f, this_result, 'bytes')
return result return 0
def main(): def main():