AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gen_bench_expectations: use subprocess instead of shell_utils due to buildbot-side name collision

Browse Source 
BUG=skia:2714
R=rmistry@google.com
TBR=rmistry
NOTRY=true

Author: borenet@google.com

Review URL: https://codereview.chromium.org/368043002
This commit is contained in:
borenet 2014-07-02 12:52:34 -07:00 committed by Commit bot
parent 3fa56b322a
commit 4621788761
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/gen_bench_expectations_from_codereview.py
View File

@ -14,12 +14,10 @@ import json
import os
import re
import shutil
import subprocess
import sys
import urllib2
import fix_pythonpath # pylint: disable=W0611
from common.py.utils import shell_utils
BENCH_DATA_URL = 'gs://chromium-skia-gm/perfdata/%s/%s/bench_*_data_*'
BUILD_STATUS_SUCCESS = 0
@ -98,7 +96,7 @@ def get_bench_data(builder, build_num, dest_dir):
dest_dir: string; destination directory for the bench data.
"""
url = BENCH_DATA_URL % (builder, build_num)
shell_utils.run(['gsutil', 'cp', '-R', url, dest_dir])
subprocess.check_call(['gsutil', 'cp', '-R', url, dest_dir])
def find_revision_from_downloaded_data(dest_dir):
@ -199,7 +197,7 @@ def gen_bench_expectations_from_codereview(codereview_url,
os.makedirs(dest_dir)
try:
get_bench_data(try_builder, try_build.build_number, dest_dir)
except shell_utils.CommandFailedException:
except subprocess.CalledProcessError:
failed_data_pull.append(try_builder)
continue
@ -215,12 +213,12 @@ def gen_bench_expectations_from_codereview(codereview_url,
output_file = os.path.join(CHECKOUT_PATH, 'expectations', 'bench',
'bench_expectations_%s.txt' % builder)
try:
shell_utils.run(['python',
os.path.join(CHECKOUT_PATH, 'bench',
'gen_bench_expectations.py'),
'-b', builder, '-o', output_file,
'-d', dest_dir, '-r', revision])
except shell_utils.CommandFailedException:
subprocess.check_call(['python',
os.path.join(CHECKOUT_PATH, 'bench',
'gen_bench_expectations.py'),
'-b', builder, '-o', output_file,
'-d', dest_dir, '-r', revision])
except subprocess.CalledProcessError:
failed_gen_expectations.append(builder)
failure = ''