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

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

Issue 18718003: Add both node paths to both Polymer steps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 7 years, 5 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 | « no previous file | scripts/slave/recipes/polymer.expected/polymer-win.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/polymer.py
diff --git a/scripts/slave/recipes/polymer.py b/scripts/slave/recipes/polymer.py
index 035cb27e1eedf127318e76e4602bc2841f16fc3a..c3de3e14e93061ed4c8b3d8c8e6227dd45f95246 100644
--- a/scripts/slave/recipes/polymer.py
+++ b/scripts/slave/recipes/polymer.py
@@ -62,21 +62,22 @@ def GenSteps(api):
tmp_args = ['--tmp', tmp_path]
cmd_suffix = ''
- npm_env = grunt_env = {}
+ node_env = {}
if api.platform.is_win:
cmd_suffix = '.cmd'
- npm_env = {'PATH': r'C:\Program Files (x86)\nodejs;%(PATH)s'}
- grunt_env = {'PATH': r'C:\Users\chrome-bot\AppData\Roaming\npm;%(PATH)s'}
+ node_env = {'PATH': r'C:\Program Files (x86)\nodejs;'
+ r'C:\Users\chrome-bot\AppData\Roaming\npm;'
+ r'%(PATH)s'}
test_prefix = []
if api.platform.is_linux:
test_prefix = ['xvfb-run']
yield api.step('update-install', ['npm' + cmd_suffix, 'install'] + tmp_args,
- cwd=api.path.checkout(), env=npm_env)
+ cwd=api.path.checkout(), env=node_env)
yield api.step('test', test_prefix + ['grunt' + cmd_suffix, 'test-buildbot'],
- cwd=api.path.checkout(), env=grunt_env,
+ cwd=api.path.checkout(), env=node_env,
allow_subannotations=True)
« no previous file with comments | « no previous file | scripts/slave/recipes/polymer.expected/polymer-win.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698