| Index: scripts/slave/recipes/chromium_trybot.py
|
| diff --git a/scripts/slave/recipes/chromium_trybot.py b/scripts/slave/recipes/chromium_trybot.py
|
| index ca57bef55dc372da4387c8b4a3c2d668c81f926a..e1814edbee85f0470fa58ffe4911b2cd65635dc4 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.py
|
| +++ b/scripts/slave/recipes/chromium_trybot.py
|
| @@ -789,11 +789,18 @@ def GenSteps(api):
|
| if not api.platform.is_win and not bot_config.get('exclude_compile_all'):
|
| compile_targets = ['all'] + compile_targets
|
|
|
| + scripts_compile_targets = \
|
| + api.chromium.get_compile_targets_for_scripts().json.output
|
| +
|
| # Tests that are only run if their compile_targets are going to be built.
|
| conditional_tests = [api.chromium.steps.NaclIntegrationTest()]
|
| if bot_config.get('add_telemetry_tests', True):
|
| - conditional_tests += [api.chromium.steps.TelemetryUnitTests(),
|
| - api.chromium.steps.TelemetryPerfUnitTests()]
|
| + conditional_tests += [
|
| + api.chromium.steps.ScriptTest(
|
| + 'telemetry_unittests', 'telemetry_unittests.py',
|
| + scripts_compile_targets),
|
| + api.chromium.steps.TelemetryPerfUnitTests()
|
| + ]
|
|
|
| # See if the patch needs to compile on the current platform.
|
| # Don't run analyze for other projects, such as blink, as there aren't that
|
| @@ -814,7 +821,8 @@ def GenSteps(api):
|
| tests = []
|
| # TODO(phajdan.jr): Re-enable checkdeps on Windows when it works with git.
|
| if not api.platform.is_win:
|
| - tests.append(api.chromium.steps.ScriptTest('checkdeps', 'checkdeps.py'))
|
| + tests.append(api.chromium.steps.ScriptTest(
|
| + 'checkdeps', 'checkdeps.py', scripts_compile_targets))
|
| if api.platform.is_linux:
|
| tests.extend([
|
| api.chromium.steps.CheckpermsTest(),
|
| @@ -823,8 +831,7 @@ def GenSteps(api):
|
|
|
| conditional_tests = tests_in_compile_targets(
|
| api, compile_targets, conditional_tests)
|
| - tests.extend(find_test_named(api.chromium.steps.TelemetryUnitTests.name,
|
| - conditional_tests))
|
| + tests.extend(find_test_named('telemetry_unittests', conditional_tests))
|
| tests.extend(find_test_named(api.chromium.steps.TelemetryPerfUnitTests.name,
|
| conditional_tests))
|
| tests.extend(gtest_tests)
|
|
|