Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

Issue 2846593004: Don't log xvfb errors under normal circumstances in run-webkit-tests (Closed)
Patch Set: merge, address review feedback Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (C) 2010 Google Inc. All rights reserved. 1 # Copyright (C) 2010 Google Inc. All rights reserved.
2 # 2 #
3 # Redistribution and use in source and binary forms, with or without 3 # Redistribution and use in source and binary forms, with or without
4 # modification, are permitted provided that the following conditions are 4 # modification, are permitted provided that the following conditions are
5 # met: 5 # met:
6 # 6 #
7 # * Redistributions of source code must retain the above copyright 7 # * Redistributions of source code must retain the above copyright
8 # notice, this list of conditions and the following disclaimer. 8 # notice, this list of conditions and the following disclaimer.
9 # * Redistributions in binary form must reproduce the above 9 # * Redistributions in binary form must reproduce the above
10 # copyright notice, this list of conditions and the following disclaimer 10 # copyright notice, this list of conditions and the following disclaimer
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 Returns: 350 Returns:
351 An exit status code. 351 An exit status code.
352 """ 352 """
353 cmd = [self._path_to_driver(), '--check-layout-test-sys-deps'] 353 cmd = [self._path_to_driver(), '--check-layout-test-sys-deps']
354 354
355 local_error = ScriptError() 355 local_error = ScriptError()
356 356
357 def error_handler(script_error): 357 def error_handler(script_error):
358 local_error.exit_code = script_error.exit_code 358 local_error.exit_code = script_error.exit_code
359 359
360 _log.warn('DISPLAY = %s', self.host.environ.get('DISPLAY', '')) 360 if self.host.platform.is_linux():
361 _log.debug('DISPLAY = %s', self.host.environ.get('DISPLAY', ''))
361 output = self._executive.run_command(cmd, error_handler=error_handler) 362 output = self._executive.run_command(cmd, error_handler=error_handler)
362 if local_error.exit_code: 363 if local_error.exit_code:
363 _log.error('System dependencies check failed.') 364 _log.error('System dependencies check failed.')
364 _log.error('To override, invoke with --nocheck-sys-deps') 365 _log.error('To override, invoke with --nocheck-sys-deps')
365 _log.error('') 366 _log.error('')
366 _log.error(output) 367 _log.error(output)
367 if self.BUILD_REQUIREMENTS_URL is not '': 368 if self.BUILD_REQUIREMENTS_URL is not '':
368 _log.error('') 369 _log.error('')
369 _log.error('For complete build requirements, please see:') 370 _log.error('For complete build requirements, please see:')
370 _log.error(self.BUILD_REQUIREMENTS_URL) 371 _log.error(self.BUILD_REQUIREMENTS_URL)
(...skipping 1255 matching lines...) Expand 10 before | Expand all | Expand 10 after
1626 1627
1627 def __init__(self, base, args, reference_args=None): 1628 def __init__(self, base, args, reference_args=None):
1628 self.name = base 1629 self.name = base
1629 self.base = base 1630 self.base = base
1630 self.args = args 1631 self.args = args
1631 self.reference_args = args if reference_args is None else reference_args 1632 self.reference_args = args if reference_args is None else reference_args
1632 self.tests = set() 1633 self.tests = set()
1633 1634
1634 def __repr__(self): 1635 def __repr__(self):
1635 return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base, self.args, self.reference_args) 1636 return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base, self.args, self.reference_args)
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/linux.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698