OLD | NEW |
---|---|
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 Loading... | |
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['DISPLAY']) | |
mithro
2017/04/26 01:58:33
This needs to be self.host.environ.get('DISPLAY',
Dirk Pranke
2017/04/26 02:03:00
ah, yeah :).
| |
360 output = self._executive.run_command(cmd, error_handler=error_handler) | 361 output = self._executive.run_command(cmd, error_handler=error_handler) |
361 if local_error.exit_code: | 362 if local_error.exit_code: |
362 _log.error('System dependencies check failed.') | 363 _log.error('System dependencies check failed.') |
363 _log.error('To override, invoke with --nocheck-sys-deps') | 364 _log.error('To override, invoke with --nocheck-sys-deps') |
364 _log.error('') | 365 _log.error('') |
365 _log.error(output) | 366 _log.error(output) |
366 if self.BUILD_REQUIREMENTS_URL is not '': | 367 if self.BUILD_REQUIREMENTS_URL is not '': |
367 _log.error('') | 368 _log.error('') |
368 _log.error('For complete build requirements, please see:') | 369 _log.error('For complete build requirements, please see:') |
369 _log.error(self.BUILD_REQUIREMENTS_URL) | 370 _log.error(self.BUILD_REQUIREMENTS_URL) |
(...skipping 1261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1631 | 1632 |
1632 def __init__(self, base, args, reference_args=None): | 1633 def __init__(self, base, args, reference_args=None): |
1633 self.name = base | 1634 self.name = base |
1634 self.base = base | 1635 self.base = base |
1635 self.args = args | 1636 self.args = args |
1636 self.reference_args = args if reference_args is None else reference_args | 1637 self.reference_args = args if reference_args is None else reference_args |
1637 self.tests = set() | 1638 self.tests = set() |
1638 | 1639 |
1639 def __repr__(self): | 1640 def __repr__(self): |
1640 return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base, self.args, self.reference_args) | 1641 return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base, self.args, self.reference_args) |
OLD | NEW |