| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # | 2 # |
| 3 # Copyright 2016 Google Inc. | 3 # Copyright 2016 Google Inc. |
| 4 # | 4 # |
| 5 # Use of this source code is governed by a BSD-style license that can be | 5 # Use of this source code is governed by a BSD-style license that can be |
| 6 # found in the LICENSE file. | 6 # found in the LICENSE file. |
| 7 | 7 |
| 8 | 8 |
| 9 import contextlib | 9 import contextlib |
| 10 import glob | 10 import glob |
| (...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 if not patchset: | 350 if not patchset: |
| 351 raise Exception('patchset is required for trybots.') | 351 raise Exception('patchset is required for trybots.') |
| 352 properties.extend([ | 352 properties.extend([ |
| 353 'issue', issue, | 353 'issue', issue, |
| 354 'patchset', patchset, | 354 'patchset', patchset, |
| 355 ]) | 355 ]) |
| 356 | 356 |
| 357 args = [ | 357 args = [ |
| 358 'dm', | 358 'dm', |
| 359 '--undefok', # This helps branches that may not know new flags. | 359 '--undefok', # This helps branches that may not know new flags. |
| 360 '--verbose', | |
| 361 '--resourcePath', self.device_dirs.resource_dir, | 360 '--resourcePath', self.device_dirs.resource_dir, |
| 362 '--skps', self.device_dirs.skp_dir, | 361 '--skps', self.device_dirs.skp_dir, |
| 363 '--images', self.flavor.device_path_join( | 362 '--images', self.flavor.device_path_join( |
| 364 self.device_dirs.images_dir, 'dm'), | 363 self.device_dirs.images_dir, 'dm'), |
| 365 '--nameByHash', | 364 '--nameByHash', |
| 366 '--properties' | 365 '--properties' |
| 367 ] + properties | 366 ] + properties |
| 368 | 367 |
| 369 args.append('--key') | 368 args.append('--key') |
| 370 args.extend(self._key_params()) | 369 args.extend(self._key_params()) |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 def cleanup(self): | 482 def cleanup(self): |
| 484 if sys.platform == 'win32': | 483 if sys.platform == 'win32': |
| 485 # Kill mspdbsrv.exe, which tends to hang around after the build finishes. | 484 # Kill mspdbsrv.exe, which tends to hang around after the build finishes. |
| 486 for p in psutil.process_iter(): | 485 for p in psutil.process_iter(): |
| 487 try: | 486 try: |
| 488 if p.name == 'mspdbsrv.exe': | 487 if p.name == 'mspdbsrv.exe': |
| 489 p.kill() | 488 p.kill() |
| 490 except psutil._error.AccessDenied: | 489 except psutil._error.AccessDenied: |
| 491 pass | 490 pass |
| 492 self.flavor.cleanup_steps() | 491 self.flavor.cleanup_steps() |
| OLD | NEW |