Fix frogsh + Windows + test.dart take 2

client/tools/buildbot_annotated_steps.py

Index: client/tools/buildbot_annotated_steps.py
===================================================================
--- client/tools/buildbot_annotated_steps.py	(revision 3517)
+++ client/tools/buildbot_annotated_steps.py	(working copy)
@@ -63,8 +63,14 @@
   if not name:
     name = socket.gethostname().split('.')[0]
   if not version:
+    has_shell = False
+    if platform == 'windows':
+      # In Windows we need to run in the shell, so that we have all the
+      # environment variables available.
+      has_shell = True
     pipe = subprocess.Popen(
-        ['svnversion', '-n'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        ['svnversion', '-n'], stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+        shell=has_shell)
     output = pipe.communicate()
     if pipe.returncode == 0:
       version = output[0]
@@ -174,14 +180,22 @@
 
   return subprocess.call(cmds, env=local_env)
 
-def ProcessFrog():
+def ProcessFrog(name):
   '''
   build and test experimental frog build
   '''
   print 'ProcessFrog'
+  has_shell = False
+  if 'windows' in name:
+    os.environ['PATH'] = (os.path.join('C:', 'Program Files (x86)', 'nodejs') +
+                         os.pathsep + os.environ['PATH'])
+    # In Windows we need to run in the shell, so that we have all the
+    # environment variables available.
+    has_shell = True
 
-  return subprocess.call([sys.executable,
-      os.path.join('frog', 'scripts', 'buildbot_annotated_steps.py')])
+  return subprocess.call([sys.executable + ' ' +
+      os.path.join('frog', 'scripts', 'buildbot_annotated_steps.py')],
+      env=os.environ, shell=has_shell)
 
 def main():
   print 'main'
@@ -198,7 +212,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)