| 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 math | 10 import math | 
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 288     if self.upload_dm_results: | 288     if self.upload_dm_results: | 
| 289       # This must run before we write anything into self.device_dirs.dm_dir | 289       # This must run before we write anything into self.device_dirs.dm_dir | 
| 290       # or we may end up deleting our output on machines where they're the same. | 290       # or we may end up deleting our output on machines where they're the same. | 
| 291       host_dm_dir = os.path.join(self.swarm_out_dir, 'dm') | 291       host_dm_dir = os.path.join(self.swarm_out_dir, 'dm') | 
| 292       print 'host dm dir: %s' % host_dm_dir | 292       print 'host dm dir: %s' % host_dm_dir | 
| 293       self.flavor.create_clean_host_dir(host_dm_dir) | 293       self.flavor.create_clean_host_dir(host_dm_dir) | 
| 294       if str(host_dm_dir) != str(self.device_dirs.dm_dir): | 294       if str(host_dm_dir) != str(self.device_dirs.dm_dir): | 
| 295         self.flavor.create_clean_device_dir(self.device_dirs.dm_dir) | 295         self.flavor.create_clean_device_dir(self.device_dirs.dm_dir) | 
| 296 | 296 | 
| 297       # Obtain the list of already-generated hashes. | 297       # Obtain the list of already-generated hashes. | 
|  | 298       if not os.path.isdir(self.tmp_dir): | 
|  | 299         os.makedirs(self.tmp_dir) | 
| 298       hash_filename = 'uninteresting_hashes.txt' | 300       hash_filename = 'uninteresting_hashes.txt' | 
| 299       host_hashes_file = os.path.join(self.tmp_dir, hash_filename) | 301       host_hashes_file = os.path.join(self.tmp_dir, hash_filename) | 
| 300       hashes_file = self.flavor.device_path_join( | 302       hashes_file = self.flavor.device_path_join( | 
| 301           self.device_dirs.tmp_dir, hash_filename) | 303           self.device_dirs.tmp_dir, hash_filename) | 
| 302 | 304 | 
| 303       try: | 305       try: | 
| 304         get_uninteresting_hashes(host_hashes_file) | 306         get_uninteresting_hashes(host_hashes_file) | 
| 305       except Exception: | 307       except Exception: | 
| 306         pass | 308         pass | 
| 307 | 309 | 
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 359 | 361 | 
| 360     # See skia:2789. | 362     # See skia:2789. | 
| 361     if ('Valgrind' in self.name and | 363     if ('Valgrind' in self.name and | 
| 362         self.builder_cfg.get('cpu_or_gpu') == 'GPU'): | 364         self.builder_cfg.get('cpu_or_gpu') == 'GPU'): | 
| 363       abandonGpuContext = list(args) | 365       abandonGpuContext = list(args) | 
| 364       abandonGpuContext.append('--abandonGpuContext') | 366       abandonGpuContext.append('--abandonGpuContext') | 
| 365       self.flavor.run(abandonGpuContext) | 367       self.flavor.run(abandonGpuContext) | 
| 366       preAbandonGpuContext = list(args) | 368       preAbandonGpuContext = list(args) | 
| 367       preAbandonGpuContext.append('--preAbandonGpuContext') | 369       preAbandonGpuContext.append('--preAbandonGpuContext') | 
| 368       self.flavor.run(preAbandonGpuContext) | 370       self.flavor.run(preAbandonGpuContext) | 
| OLD | NEW | 
|---|