Chromium Code Reviews| Index: scripts/slave/recipe_modules/chromium_tests/api.py |
| diff --git a/scripts/slave/recipe_modules/chromium_tests/api.py b/scripts/slave/recipe_modules/chromium_tests/api.py |
| index dcbee88bbf3edfcddcc4a7ca2ff25f63ee22570b..df3093061bc8b48d97ebc964bf69843a949cb2db 100644 |
| --- a/scripts/slave/recipe_modules/chromium_tests/api.py |
| +++ b/scripts/slave/recipe_modules/chromium_tests/api.py |
| @@ -484,7 +484,7 @@ class ChromiumTestsApi(recipe_api.RecipeApi): |
| deapply_patch_fn) |
| def analyze(self, affected_files, exes, compile_targets, config_file_name, |
| - additional_names=None): |
| + additional_names=None, legacy_postprocess=True): |
| """Runs "analyze" step to determine targets affected by the patch. |
| Returns a tuple of: |
| @@ -514,18 +514,21 @@ class ChromiumTestsApi(recipe_api.RecipeApi): |
| # Patch does not require compile. |
| return False, [], [] |
| - if 'all' in compile_targets: |
| - compile_targets = self.m.filter.compile_targets |
| + if legacy_postprocess: |
| + if 'all' in compile_targets: |
| + compile_targets = self.m.filter.compile_targets |
| + else: |
| + compile_targets = list(set(compile_targets) & |
| + set(self.m.filter.compile_targets)) |
| + # Always add |matching_exes|. They will be covered by |compile_targets|, |
| + # but adding |matching_exes| makes determing if conditional tests are |
| + # necessary easier. For example, if we didn't do this we could end up |
| + # with chrome_run as a compile_target and not chrome (since chrome_run |
| + # depends upon chrome). This results in not picking up |
| + # NaclIntegrationTest as it depends upon chrome not chrome_run. |
| + compile_targets = list(set(self.m.filter.matching_exes + compile_targets)) |
|
Adrian Kuegel
2015/06/15 14:19:44
I have the feeling that this should be done in any
Paweł Hajdan Jr.
2015/06/15 15:02:44
I believe this should be handled by the analyzer.
|
| else: |
| - compile_targets = list(set(compile_targets) & |
| - set(self.m.filter.compile_targets)) |
| - # Always add |matching_exes|. They will be covered by |compile_targets|, |
| - # but adding |matching_exes| makes determing if conditional tests are |
| - # necessary easier. For example, if we didn't do this we could end up |
| - # with chrome_run as a compile_target and not chrome (since chrome_run |
| - # depends upon chrome). This results in not picking up |
| - # NaclIntegrationTest as it depends upon chrome not chrome_run. |
| - compile_targets = list(set(self.m.filter.matching_exes + compile_targets)) |
| + compile_targets = self.m.filter.compile_targets |
| # Add crash_service to compile_targets. This is done after filtering compile |
| # targets out because crash_service should always be there on windows. |