OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 | 5 |
6 import json | 6 import json |
7 import os | 7 import os |
8 import re | 8 import re |
9 import sys | 9 import sys |
10 | 10 |
(...skipping 744 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
755 | 755 |
756 target = 'nanobench' | 756 target = 'nanobench' |
757 if 'VisualBench' in self.builder_name: | 757 if 'VisualBench' in self.builder_name: |
758 target = 'visualbench' | 758 target = 'visualbench' |
759 args = [ | 759 args = [ |
760 target, | 760 target, |
761 '--undefok', # This helps branches that may not know new flags. | 761 '--undefok', # This helps branches that may not know new flags. |
762 '-i', self.device_dirs.resource_dir, | 762 '-i', self.device_dirs.resource_dir, |
763 '--skps', self.device_dirs.skp_dir, | 763 '--skps', self.device_dirs.skp_dir, |
764 '--images', self.flavor.device_path_join( | 764 '--images', self.flavor.device_path_join( |
765 self.device_dirs.images_dir, 'dm'), # Using DM images for now. | 765 self.device_dirs.images_dir, 'nanobench'), |
766 ] | 766 ] |
767 | 767 |
768 skip_flag = None | 768 skip_flag = None |
769 if self.builder_cfg.get('cpu_or_gpu') == 'CPU': | 769 if self.builder_cfg.get('cpu_or_gpu') == 'CPU': |
770 skip_flag = '--nogpu' | 770 skip_flag = '--nogpu' |
771 elif self.builder_cfg.get('cpu_or_gpu') == 'GPU': | 771 elif self.builder_cfg.get('cpu_or_gpu') == 'GPU': |
772 skip_flag = '--nocpu' | 772 skip_flag = '--nocpu' |
773 if skip_flag: | 773 if skip_flag: |
774 args.append(skip_flag) | 774 args.append(skip_flag) |
775 args.extend(self.nanobench_flags) | 775 args.extend(self.nanobench_flags) |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
857 # Don't bother to include role, which is always Test. | 857 # Don't bother to include role, which is always Test. |
858 # TryBots are uploaded elsewhere so they can use the same key. | 858 # TryBots are uploaded elsewhere so they can use the same key. |
859 blacklist = ['role', 'is_trybot'] | 859 blacklist = ['role', 'is_trybot'] |
860 | 860 |
861 flat = [] | 861 flat = [] |
862 for k in sorted(self.builder_cfg.keys()): | 862 for k in sorted(self.builder_cfg.keys()): |
863 if k not in blacklist: | 863 if k not in blacklist: |
864 flat.append(k) | 864 flat.append(k) |
865 flat.append(self.builder_cfg[k]) | 865 flat.append(self.builder_cfg[k]) |
866 return flat | 866 return flat |
OLD | NEW |