Index: client/tools/buildbot_annotated_steps.py |
=================================================================== |
--- client/tools/buildbot_annotated_steps.py (revision 3505) |
+++ client/tools/buildbot_annotated_steps.py (working copy) |
@@ -64,7 +64,8 @@ |
name = socket.gethostname().split('.')[0] |
if not version: |
pipe = subprocess.Popen( |
- ['svnversion', '-n'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) |
+ ['svnversion', '-n'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, |
+ shell=True) |
output = pipe.communicate() |
if pipe.returncode == 0: |
version = output[0] |
@@ -174,14 +175,18 @@ |
return subprocess.call(cmds, env=local_env) |
-def ProcessFrog(): |
+def ProcessFrog(name): |
''' |
build and test experimental frog build |
''' |
print 'ProcessFrog' |
+ if 'windows' in name: |
+ os.environ['PATH'] = (os.path.join('C:', 'Program Files (x86)', 'nodejs') + |
+ os.pathsep + os.environ['PATH']) |
return subprocess.call([sys.executable, |
- os.path.join('frog', 'scripts', 'buildbot_annotated_steps.py')]) |
+ os.path.join('frog', 'scripts', 'buildbot_annotated_steps.py')], |
+ env=os.environ, shell=True) |
def main(): |
print 'main' |
@@ -198,7 +203,7 @@ |
status = ProcessTools(mode, name, version) |
#TODO(sigmund): remove this indirection once we update our bots |
elif name.startswith('frog'): |
- status = ProcessFrog() |
+ status = ProcessFrog(name) |
else: |
status = ProcessDartClientTests(component, mode, platform, name) |