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

Unified Diff: scripts/slave/recipes/blink_trybot.py

Issue 17635005: Make blink_trybot recipe work on windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 7 years, 6 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
Index: scripts/slave/recipes/blink_trybot.py
diff --git a/scripts/slave/recipes/blink_trybot.py b/scripts/slave/recipes/blink_trybot.py
index 25312fac13610518c5541e90ceca82dc6cbb89a8..60ea580d1bd103b8927067f8f9a4f7e6b38e0c6e 100644
--- a/scripts/slave/recipes/blink_trybot.py
+++ b/scripts/slave/recipes/blink_trybot.py
@@ -2,11 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-DEPS = ['step', 'chromium', 'step_history', 'path', 'gclient', 'rietveld',
- 'properties', 'json']
+DEPS = ['python', 'chromium', 'step_history', 'path', 'gclient', 'rietveld',
agable 2013/06/25 15:55:28 Can we please sort these DEPS everywhere?
iannucci 2013/06/25 21:22:09 Done.
+ 'properties', 'json', 'step']
def GenSteps(api):
- api.chromium.set_config('blink')
+ api.chromium.set_config('blink', GIT_MODE=True)
api.chromium.apply_config('trybot_flavor')
api.step.auto_resolve_conflicts = True
@@ -29,14 +29,14 @@ def GenSteps(api):
api.chromium.runhooks(),
api.chromium.compile(),
api.chromium.runtests('webkit_unit_tests'),
- api.step('webkit_lint', [
- 'python', webkit_lint, '--build-dir', api.path.checkout('out'),
- '--target', api.properties['build_config']]),
+ api.python('webkit_lint', webkit_lint, [
+ '--build-dir', api.path.checkout('out'),
+ '--target', api.properties['build_config']])
)
yield BlinkTestsStep(with_patch=True)
if api.step_history.last_step().retcode == 0:
- yield api.step('webkit_tests', ['python', '-c', 'print "ALL IS WELL"'])
+ yield api.python.inline('webkit_tests', 'print "ALL IS WELL"')
return
failing_tests = api.step_history.last_step().json.output
@@ -49,13 +49,13 @@ def GenSteps(api):
)
base_failing_tests = api.step_history.last_step().json.output
- final_script = ['python',
+ yield api.python(
+ 'webkit_tests',
api.path.checkout('third_party', 'WebKit', 'Tools', 'Scripts',
'print-json-test-results'),
- '--ignored-failures-path', api.json.input(base_failing_tests),
- api.json.input(failing_tests),
- ]
- yield api.step('webkit_tests', final_script)
+ ['--ignored-failures-path', api.json.input(base_failing_tests),
+ api.json.input(failing_tests)]
+ )
def GenTests(api):

Powered by Google App Engine
This is Rietveld 408576698