OLD | NEW |
1 # Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file | 1 # Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file |
2 # for details. All rights reserved. Use of this source code is governed by a | 2 # for details. All rights reserved. Use of this source code is governed by a |
3 # BSD-style license that can be found in the LICENSE file. | 3 # BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 #!/usr/bin/python | 5 #!/usr/bin/python |
6 | 6 |
7 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 7 # Copyright (c) 2011 The Chromium Authors. All rights reserved. |
8 # Use of this source code is governed by a BSD-style license that can be | 8 # Use of this source code is governed by a BSD-style license that can be |
9 # found in the LICENSE file. | 9 # found in the LICENSE file. |
10 | 10 |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 local_env['PATH'] = (os.path.join(javahome, 'bin') + | 175 local_env['PATH'] = (os.path.join(javahome, 'bin') + |
176 os.pathsep + local_env['PATH']) | 176 os.pathsep + local_env['PATH']) |
177 | 177 |
178 return subprocess.call(cmds, env=local_env) | 178 return subprocess.call(cmds, env=local_env) |
179 | 179 |
180 def ProcessFrog(name): | 180 def ProcessFrog(name): |
181 ''' | 181 ''' |
182 build and test experimental frog build | 182 build and test experimental frog build |
183 ''' | 183 ''' |
184 print 'ProcessFrog' | 184 print 'ProcessFrog' |
| 185 has_shell=False |
185 if 'windows' in name: | 186 if 'windows' in name: |
186 os.environ['PATH'] = (os.path.join('C:', 'Program Files (x86)', 'nodejs') + | 187 os.environ['PATH'] = (os.path.join('C:', 'Program Files (x86)', 'nodejs') + |
187 os.pathsep + os.environ['PATH']) | 188 os.pathsep + os.environ['PATH']) |
188 # In Windows we need to run in the shell, so that we have all the | 189 # In Windows we need to run in the shell, so that we have all the |
189 # environment variables available. | 190 # environment variables available. |
190 return subprocess.call([sys.executable + ' ' + | 191 has_shell=True |
| 192 return subprocess.call([sys.executable, |
191 os.path.join('frog', 'scripts', 'buildbot_annotated_steps.py')], | 193 os.path.join('frog', 'scripts', 'buildbot_annotated_steps.py')], |
192 env=os.environ, shell=True) | 194 env=os.environ, shell=has_shell) |
193 | 195 |
194 def main(): | 196 def main(): |
195 print 'main' | 197 print 'main' |
196 if len(sys.argv) == 0: | 198 if len(sys.argv) == 0: |
197 print 'Script pathname not known, giving up.' | 199 print 'Script pathname not known, giving up.' |
198 return 1 | 200 return 1 |
199 | 201 |
200 scriptdir = os.path.dirname(sys.argv[0]) | 202 scriptdir = os.path.dirname(sys.argv[0]) |
201 # Get at the top-level directory. This script is in client/tools | 203 # Get at the top-level directory. This script is in client/tools |
202 os.chdir(os.path.abspath(os.path.join(scriptdir, os.pardir, os.pardir))) | 204 os.chdir(os.path.abspath(os.path.join(scriptdir, os.pardir, os.pardir))) |
203 | 205 |
204 (name, version, component, mode, platform) = GetBuildInfo() | 206 (name, version, component, mode, platform) = GetBuildInfo() |
205 if name.startswith('dart-editor'): | 207 if name.startswith('dart-editor'): |
206 status = ProcessTools(mode, name, version) | 208 status = ProcessTools(mode, name, version) |
207 #TODO(sigmund): remove this indirection once we update our bots | 209 #TODO(sigmund): remove this indirection once we update our bots |
208 elif name.startswith('frog'): | 210 elif name.startswith('frog'): |
209 status = ProcessFrog(name) | 211 status = ProcessFrog(name) |
210 else: | 212 else: |
211 status = ProcessDartClientTests(component, mode, platform, name) | 213 status = ProcessDartClientTests(component, mode, platform, name) |
212 | 214 |
213 if status: | 215 if status: |
214 print '@@@STEP_FAILURE@@@' | 216 print '@@@STEP_FAILURE@@@' |
215 | 217 |
216 return status | 218 return status |
217 | 219 |
218 | 220 |
219 if __name__ == '__main__': | 221 if __name__ == '__main__': |
220 sys.exit(main()) | 222 sys.exit(main()) |
OLD | NEW |