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

Unified Diff: client/tools/buildbot_annotated_steps.py

Issue 9193021: Revert "Make changes to test.dart and frogsh for Windows." (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 11 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 | frog/frogsh.bat » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/tools/buildbot_annotated_steps.py
diff --git a/client/tools/buildbot_annotated_steps.py b/client/tools/buildbot_annotated_steps.py
index bdf7858cbb232698d790044ed662057a4d17c142..998a36d19c1d51562f7f722b69a026dfdfd3e464 100644
--- a/client/tools/buildbot_annotated_steps.py
+++ b/client/tools/buildbot_annotated_steps.py
@@ -64,8 +64,7 @@ def GetBuildInfo():
name = socket.gethostname().split('.')[0]
if not version:
pipe = subprocess.Popen(
- ['svnversion', '-n'], stdout=subprocess.PIPE, stderr=subprocess.PIPE,
- shell=True)
+ ['svnversion', '-n'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
output = pipe.communicate()
if pipe.returncode == 0:
version = output[0]
@@ -175,18 +174,14 @@ def ProcessTools(mode, name, version):
return subprocess.call(cmds, env=local_env)
-def ProcessFrog(name):
+def ProcessFrog():
'''
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')],
- env=os.environ, shell=True)
+ os.path.join('frog', 'scripts', 'buildbot_annotated_steps.py')])
def main():
print 'main'
@@ -203,7 +198,7 @@ def main():
status = ProcessTools(mode, name, version)
#TODO(sigmund): remove this indirection once we update our bots
elif name.startswith('frog'):
- status = ProcessFrog(name)
+ status = ProcessFrog()
else:
status = ProcessDartClientTests(component, mode, platform, name)
« no previous file with comments | « no previous file | frog/frogsh.bat » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698