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 | |
186 if 'windows' in name: | 185 if 'windows' in name: |
187 os.environ['PATH'] = (os.path.join('C:', 'Program Files (x86)', 'nodejs') + | 186 os.environ['PATH'] = (os.path.join('C:', 'Program Files (x86)', 'nodejs') + |
188 os.pathsep + os.environ['PATH']) | 187 os.pathsep + os.environ['PATH']) |
189 # In Windows we need to run in the shell, so that we have all the | 188 # In Windows we need to run in the shell, so that we have all the |
190 # environment variables available. | 189 # environment variables available. |
191 has_shell=True | 190 return subprocess.call([sys.executable + ' ' + |
192 return subprocess.call([sys.executable, | |
193 os.path.join('frog', 'scripts', 'buildbot_annotated_steps.py')], | 191 os.path.join('frog', 'scripts', 'buildbot_annotated_steps.py')], |
194 env=os.environ, shell=has_shell) | 192 env=os.environ, shell=True) |
195 | 193 |
196 def main(): | 194 def main(): |
197 print 'main' | 195 print 'main' |
198 if len(sys.argv) == 0: | 196 if len(sys.argv) == 0: |
199 print 'Script pathname not known, giving up.' | 197 print 'Script pathname not known, giving up.' |
200 return 1 | 198 return 1 |
201 | 199 |
202 scriptdir = os.path.dirname(sys.argv[0]) | 200 scriptdir = os.path.dirname(sys.argv[0]) |
203 # Get at the top-level directory. This script is in client/tools | 201 # Get at the top-level directory. This script is in client/tools |
204 os.chdir(os.path.abspath(os.path.join(scriptdir, os.pardir, os.pardir))) | 202 os.chdir(os.path.abspath(os.path.join(scriptdir, os.pardir, os.pardir))) |
205 | 203 |
206 (name, version, component, mode, platform) = GetBuildInfo() | 204 (name, version, component, mode, platform) = GetBuildInfo() |
207 if name.startswith('dart-editor'): | 205 if name.startswith('dart-editor'): |
208 status = ProcessTools(mode, name, version) | 206 status = ProcessTools(mode, name, version) |
209 #TODO(sigmund): remove this indirection once we update our bots | 207 #TODO(sigmund): remove this indirection once we update our bots |
210 elif name.startswith('frog'): | 208 elif name.startswith('frog'): |
211 status = ProcessFrog(name) | 209 status = ProcessFrog(name) |
212 else: | 210 else: |
213 status = ProcessDartClientTests(component, mode, platform, name) | 211 status = ProcessDartClientTests(component, mode, platform, name) |
214 | 212 |
215 if status: | 213 if status: |
216 print '@@@STEP_FAILURE@@@' | 214 print '@@@STEP_FAILURE@@@' |
217 | 215 |
218 return status | 216 return status |
219 | 217 |
220 | 218 |
221 if __name__ == '__main__': | 219 if __name__ == '__main__': |
222 sys.exit(main()) | 220 sys.exit(main()) |
OLD | NEW |