| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 import copy | 5 import copy |
| 6 | 6 |
| 7 from recipe_engine import recipe_api | 7 from recipe_engine import recipe_api |
| 8 | 8 |
| 9 | 9 |
| 10 class iOSApi(recipe_api.RecipeApi): | 10 class iOSApi(recipe_api.RecipeApi): |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 # The same test may be configured to run on multiple simulators. | 306 # The same test may be configured to run on multiple simulators. |
| 307 # Only specify each test once for the analyzer. | 307 # Only specify each test once for the analyzer. |
| 308 tests = list(set(test['app'] for test in self.__config['tests'])) | 308 tests = list(set(test['app'] for test in self.__config['tests'])) |
| 309 | 309 |
| 310 test_targets, compile_targets = ( | 310 test_targets, compile_targets = ( |
| 311 self.m.chromium_tests.analyze( | 311 self.m.chromium_tests.analyze( |
| 312 affected_files, | 312 affected_files, |
| 313 tests, | 313 tests, |
| 314 self.__config['additional_compile_targets'] + tests, | 314 self.__config['additional_compile_targets'] + tests, |
| 315 'trybot_analyze_config.json', | 315 'trybot_analyze_config.json', |
| 316 self.m.properties['mastername'], |
| 317 self.m.properties['buildername'], |
| 316 additional_names=['chromium', 'ios'] | 318 additional_names=['chromium', 'ios'] |
| 317 ) | 319 ) |
| 318 ) | 320 ) |
| 319 | 321 |
| 320 test_targets = set(test_targets) | 322 test_targets = set(test_targets) |
| 321 | 323 |
| 322 for test in self.__config['tests']: | 324 for test in self.__config['tests']: |
| 323 if test['app'] not in test_targets: | 325 if test['app'] not in test_targets: |
| 324 test['skip'] = True | 326 test['skip'] = True |
| 325 | 327 |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 473 self.configuration, | 475 self.configuration, |
| 474 'iossim', | 476 'iossim', |
| 475 ), | 477 ), |
| 476 'ninja': self.m.path.join( | 478 'ninja': self.m.path.join( |
| 477 'src', | 479 'src', |
| 478 build_dir, | 480 build_dir, |
| 479 '%s-%s' % (self.configuration, platform), | 481 '%s-%s' % (self.configuration, platform), |
| 480 'iossim', | 482 'iossim', |
| 481 ), | 483 ), |
| 482 }[self.compiler] | 484 }[self.compiler] |
| OLD | NEW |