OLD | NEW |
---|---|
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 """Set of utilities to add commands to a buildbot factory. | 5 """Set of utilities to add commands to a buildbot factory. |
6 | 6 |
7 This is based on commands.py and adds chromium-specific commands.""" | 7 This is based on commands.py and adds chromium-specific commands.""" |
8 | 8 |
9 import logging | 9 import logging |
10 import os | 10 import os |
(...skipping 930 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
941 # use the latest build. Instead we should trigger on the | 941 # use the latest build. Instead we should trigger on the |
942 # presence of new build and pass that info down for a | 942 # presence of new build and pass that info down for a |
943 # --build N arg. | 943 # --build N arg. |
944 '--latest'] | 944 '--latest'] |
945 if branch: # Fetch latest on given branch | 945 if branch: # Fetch latest on given branch |
946 cmd += ['--branch', str(branch)] | 946 cmd += ['--branch', str(branch)] |
947 self.AddTestStep(commands.WaterfallLoggingShellCommand, | 947 self.AddTestStep(commands.WaterfallLoggingShellCommand, |
948 'Download and extract official build', cmd, | 948 'Download and extract official build', cmd, |
949 halt_on_failure=True) | 949 halt_on_failure=True) |
950 | 950 |
951 def AddSoftGpuTests(self, factory_properties): | |
952 """Runs gpu_tests with software rendering and archives any results. | |
953 """ | |
954 # Put gpu data in /b/build/slave/SLAVE_NAME/gpu_data | |
955 gen_dir = self.PathJoin('..', 'soft_gpu_data', 'generated') | |
956 ref_dir = self.PathJoin('..', 'gpu_data', 'reference') | |
957 | |
958 self.AddBasicGTestTestStep('gpu_tests', factory_properties, | |
959 description='(soft)', | |
960 arg_list=['--generated-dir=%s' % gen_dir, | |
961 '--reference-dir=%s' % ref_dir, '--gtest_also_run_disabled_tests', | |
962 '--gtest_filter=GpuPixelBrowserTest.*'], | |
Peter Mayo
2012/03/06 21:46:27
Jonathan:
I've been looking at the target gpu_test
pkotwicz
2012/03/06 21:58:56
For completeness, you probably want to include Can
| |
963 test_tool_arg_list=['--llvmpipe']) | |
964 | |
965 # Note: we aren't archiving these for the moment. | |
966 | |
951 def AddGpuTests(self, factory_properties): | 967 def AddGpuTests(self, factory_properties): |
952 """Runs gpu_tests binary and archives any results. | 968 """Runs gpu_tests binary and archives any results. |
953 | 969 |
954 This binary contains all the tests that should be run on the gpu bots. | 970 This binary contains all the tests that should be run on the gpu bots. |
955 """ | 971 """ |
956 # Put gpu data in /b/build/slave/SLAVE_NAME/gpu_data | 972 # Put gpu data in /b/build/slave/SLAVE_NAME/gpu_data |
957 gpu_data = self.PathJoin('..', 'gpu_data') | 973 gpu_data = self.PathJoin('..', 'gpu_data') |
958 gen_dir = self.PathJoin(gpu_data, 'generated') | 974 gen_dir = self.PathJoin(gpu_data, 'generated') |
959 ref_dir = self.PathJoin(gpu_data, 'reference') | 975 ref_dir = self.PathJoin(gpu_data, 'reference') |
960 | 976 |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1034 # ArchiveCommand.createSummary. | 1050 # ArchiveCommand.createSummary. |
1035 return '%s/%s/%s' % (config.Master.archive_url, archive_type, builder_name) | 1051 return '%s/%s/%s' % (config.Master.archive_url, archive_type, builder_name) |
1036 | 1052 |
1037 def _GetSnapshotUrl(factory_properties=None, builder_name='%(build_name)s'): | 1053 def _GetSnapshotUrl(factory_properties=None, builder_name='%(build_name)s'): |
1038 if not factory_properties or 'gs_bucket' not in factory_properties: | 1054 if not factory_properties or 'gs_bucket' not in factory_properties: |
1039 return (_GetArchiveUrl('snapshots', builder_name), None) | 1055 return (_GetArchiveUrl('snapshots', builder_name), None) |
1040 gs_bucket = factory_properties['gs_bucket'] | 1056 gs_bucket = factory_properties['gs_bucket'] |
1041 gs_bucket = re.sub(r'^gs://', 'http://commondatastorage.googleapis.com/', | 1057 gs_bucket = re.sub(r'^gs://', 'http://commondatastorage.googleapis.com/', |
1042 gs_bucket) | 1058 gs_bucket) |
1043 return ('%s/index.html?path=%s' % (gs_bucket, builder_name), '/') | 1059 return ('%s/index.html?path=%s' % (gs_bucket, builder_name), '/') |
OLD | NEW |