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

Side by Side Diff: infra/bots/common.py

Issue 1746063002: Swarming tests: Fix uninteresting hash file path (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 9 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 hash_filename = 'uninteresting_hashes.txt' 298 hash_filename = 'uninteresting_hashes.txt'
299 host_hashes_file = self.tmp_dir.join(hash_filename) 299 host_hashes_file = os.path.join(self.tmp_dir, hash_filename)
300 hashes_file = self.flavor.device_path_join( 300 hashes_file = self.flavor.device_path_join(
301 self.device_dirs.tmp_dir, hash_filename) 301 self.device_dirs.tmp_dir, hash_filename)
302 302
303 try: 303 try:
304 get_uninteresting_hashes(host_hashes_file) 304 get_uninteresting_hashes(host_hashes_file)
305 except Exception: 305 except Exception:
306 pass 306 pass
307 307
308 if os.path.exists(host_hashes_file): 308 if os.path.exists(host_hashes_file):
309 self.flavor.copy_file_to_device(host_hashes_file, hashes_file) 309 self.flavor.copy_file_to_device(host_hashes_file, hashes_file)
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 359
360 # See skia:2789. 360 # See skia:2789.
361 if ('Valgrind' in self.name and 361 if ('Valgrind' in self.name and
362 self.builder_cfg.get('cpu_or_gpu') == 'GPU'): 362 self.builder_cfg.get('cpu_or_gpu') == 'GPU'):
363 abandonGpuContext = list(args) 363 abandonGpuContext = list(args)
364 abandonGpuContext.append('--abandonGpuContext') 364 abandonGpuContext.append('--abandonGpuContext')
365 self.flavor.run(abandonGpuContext) 365 self.flavor.run(abandonGpuContext)
366 preAbandonGpuContext = list(args) 366 preAbandonGpuContext = list(args)
367 preAbandonGpuContext.append('--preAbandonGpuContext') 367 preAbandonGpuContext.append('--preAbandonGpuContext')
368 self.flavor.run(preAbandonGpuContext) 368 self.flavor.run(preAbandonGpuContext)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698