summaryrefslogtreecommitdiff
path: root/testing/tools/safetynet_compare.py
diff options
context:
space:
mode:
authorHenrique Nakashima <hnakashima@chromium.org>2017-08-15 14:37:58 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-08-15 20:02:20 +0000
commit0da39e6b62fe7dc0f40d5242325b3b2d5b2c9d96 (patch)
treed7d63a35b983e3c3b8a865c0fc97c9d762e74649 /testing/tools/safetynet_compare.py
parent5f7b8f4038d16d224cb070f08112aba5331bd094 (diff)
downloadpdfium-0da39e6b62fe7dc0f40d5242325b3b2d5b2c9d96.tar.xz
Make errors in called processes more evident and easier to debug.
Also trying to get unicode filenames right again. Change-Id: I501c94921b92b8a8cd6a10441aff1595fc6d878e Reviewed-on: https://pdfium-review.googlesource.com/10630 Commit-Queue: Henrique Nakashima <hnakashima@chromium.org> Reviewed-by: Nicolás Peña <npm@chromium.org> Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'testing/tools/safetynet_compare.py')
-rwxr-xr-xtesting/tools/safetynet_compare.py53
1 files changed, 26 insertions, 27 deletions
diff --git a/testing/tools/safetynet_compare.py b/testing/tools/safetynet_compare.py
index 028dd02232..d583312bab 100755
--- a/testing/tools/safetynet_compare.py
+++ b/testing/tools/safetynet_compare.py
@@ -17,6 +17,8 @@ import sys
import tempfile
from common import GetBooleanGnArg
+from common import PrintErr
+from common import RunCommandPropagateErr
from githelper import GitHelper
from safetynet_conclusions import ComparisonConclusions
from safetynet_conclusions import PrintConclusionsDictHumanReadable
@@ -24,11 +26,6 @@ from safetynet_conclusions import RATING_IMPROVEMENT
from safetynet_conclusions import RATING_REGRESSION
-def PrintErr(s):
- """Prints s to stderr."""
- print >> sys.stderr, s
-
-
def RunSingleTestCaseParallel(this, run_label, build_dir, test_case):
result = this.RunSingleTestCase(run_label, build_dir, test_case)
return (test_case, result)
@@ -44,11 +41,13 @@ class CompareRun(object):
def _InitPaths(self):
if self.args.this_repo:
- measure_script_path = os.path.join(self.args.build_dir,
- 'safetynet_measure_current.py')
+ self.safe_script_dir = self.args.build_dir
else:
- measure_script_path = 'testing/tools/safetynet_measure.py'
- self.safe_measure_script_path = os.path.abspath(measure_script_path)
+ self.safe_script_dir = os.path.join('testing', 'tools')
+
+ self.safe_measure_script_path = os.path.abspath(
+ os.path.join(self.safe_script_dir,
+ 'safetynet_measure.py'))
input_file_re = re.compile('^.+[.]pdf$')
self.test_cases = []
@@ -115,8 +114,12 @@ class CompareRun(object):
This is needed to make sure we are comparing the pdfium library changes and
not script changes that may happen between the two branches.
"""
- subprocess.check_output(['cp', 'testing/tools/safetynet_measure.py',
- self.safe_measure_script_path])
+ self.__FreezeFile(os.path.join('testing', 'tools', 'safetynet_measure.py'))
+ self.__FreezeFile(os.path.join('testing', 'tools', 'common.py'))
+
+ def __FreezeFile(self, file):
+ RunCommandPropagateErr(['cp', file, self.safe_script_dir],
+ exit_status_on_error=1)
def _ProfileTwoOtherBranchesInThisRepo(self, before_branch, after_branch):
"""Profiles two branches that are not the current branch.
@@ -334,9 +337,10 @@ class CompareRun(object):
'https://pdfium.googlesource.com/pdfium.git']
if self.args.cache_dir:
cmd.append('--cache-dir=%s' % self.args.cache_dir)
- subprocess.check_output(cmd)
+ RunCommandPropagateErr(cmd, exit_status_on_error=1)
+
+ RunCommandPropagateErr(['gclient', 'sync'], exit_status_on_error=1)
- subprocess.check_output(['gclient', 'sync'])
PrintErr('Done.')
build_dir = os.path.join(src_dir, relative_build_dir)
@@ -347,7 +351,8 @@ class CompareRun(object):
dest_gn_args = os.path.join(build_dir, 'args.gn')
shutil.copy(source_gn_args, dest_gn_args)
- subprocess.check_output(['gn', 'gen', relative_build_dir])
+ RunCommandPropagateErr(['gn', 'gen', relative_build_dir],
+ exit_status_on_error=1)
os.chdir(cwd)
@@ -373,16 +378,14 @@ class CompareRun(object):
build_dir: String with path to build directory
"""
PrintErr('Syncing...')
- subprocess.check_output(['gclient', 'sync'])
+ RunCommandPropagateErr(['gclient', 'sync'], exit_status_on_error=1)
PrintErr('Done.')
+ PrintErr('Building...')
cmd = ['ninja', '-C', build_dir, 'pdfium_test']
-
if GetBooleanGnArg('use_goma', build_dir):
cmd.extend(['-j', '250'])
-
- PrintErr('Building...')
- subprocess.check_output(cmd)
+ RunCommandPropagateErr(cmd, stdout_has_errors=True, exit_status_on_error=1)
PrintErr('Done.')
def _MeasureCurrentBranch(self, run_label, build_dir):
@@ -480,13 +483,9 @@ class CompareRun(object):
if profile_file_path:
command.append('--output-path=%s' % profile_file_path)
- try:
- output = subprocess.check_output(command)
- except subprocess.CalledProcessError as e:
- PrintErr(e)
- PrintErr(35 * '=' + ' Output: ' + 34 * '=')
- PrintErr(e.output)
- PrintErr(80 * '=')
+ output = RunCommandPropagateErr(command)
+
+ if output is None:
return None
# Get the time number as output, making sure it's just a number
@@ -539,7 +538,7 @@ class CompareRun(object):
ComparisonConclusions.GetOutputDict().
"""
if self.args.machine_readable:
- print json.dumps(conclusions_dict, ensure_ascii=False)
+ print json.dumps(conclusions_dict)
else:
PrintConclusionsDictHumanReadable(
conclusions_dict, colored=True, key=self.args.case_order)