Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(215)

Unified Diff: scripts/slave/recipe_modules/chromium/steps.py

Issue 666023004: Use src-side launcher for telemetry_unittests in chromium_trybot recipe (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: rebase & add TODO Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipe_modules/chromium/api.py ('k') | scripts/slave/recipes/chromium_trybot.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/chromium/steps.py
diff --git a/scripts/slave/recipe_modules/chromium/steps.py b/scripts/slave/recipe_modules/chromium/steps.py
index 5a5fa86c9ef7f439928c9bbf8e8082c541537a09..f7ea3f5cdd74ded59f0652324b9fc43f06058138 100644
--- a/scripts/slave/recipe_modules/chromium/steps.py
+++ b/scripts/slave/recipe_modules/chromium/steps.py
@@ -98,19 +98,29 @@ class ScriptTest(Test): # pylint: disable=W0232
All new tests are strongly encouraged to use this infrastructure.
"""
- def __init__(self, name, script):
+ def __init__(self, name, script, all_compile_targets):
super(ScriptTest, self).__init__()
self._name = name
self._script = script
+ self._all_compile_targets = all_compile_targets
@property
def name(self):
return self._name
- @staticmethod
- def compile_targets(_):
- # TODO(phajdan.jr): Implement this (http://crbug.com/422235).
- return []
+ def compile_targets(self, api):
+ try:
+ return self._all_compile_targets[self._script]
+ except KeyError:
+ # Not all scripts will have test data inside recipes,
+ # so return a default value.
+ # TODO(phajdan.jr): Revisit this when all script tests
+ # lists move src-side. We should be able to provide
+ # test data then.
+ if api.chromium._test_data.enabled:
+ return []
+
+ raise
def run(self, api, suffix):
name = self.name
@@ -123,7 +133,8 @@ class ScriptTest(Test): # pylint: disable=W0232
# for consistency.
api.path['checkout'].join(
'testing', 'scripts', api.path.basename(self._script)),
- args=['run', '--output', api.json.output()],
+ args=(api.chromium.get_common_args_for_scripts() +
+ ['run', '--output', api.json.output()]),
step_test_data=lambda: api.json.test_api.output(
{'valid': True, 'failures': []}))
finally:
« no previous file with comments | « scripts/slave/recipe_modules/chromium/api.py ('k') | scripts/slave/recipes/chromium_trybot.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698