OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file | 2 # Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file |
3 # for details. All rights reserved. Use of this source code is governed by a | 3 # for details. All rights reserved. Use of this source code is governed by a |
4 # BSD-style license that can be found in the LICENSE file. | 4 # BSD-style license that can be found in the LICENSE file. |
5 | 5 |
6 import os | 6 import os |
7 import platform | 7 import platform |
8 import string | 8 import string |
9 import subprocess | 9 import subprocess |
10 import sys | 10 import sys |
11 | 11 |
12 from utils import GuessOS | 12 import utils |
| 13 |
13 | 14 |
14 def Main(): | 15 def Main(): |
15 args = sys.argv[1:] | 16 args = sys.argv[1:] |
16 tools_dir = os.path.dirname(os.path.realpath(__file__)) | 17 tools_dir = os.path.dirname(os.path.realpath(__file__)) |
17 dart_binary_prefix = os.path.join(tools_dir, 'testing', 'bin') | 18 dart_binary_prefix = os.path.join(tools_dir, 'testing', 'bin') |
18 if GuessOS() == "win32": | 19 if utils.IsWindows(): |
19 dart_binary = os.path.join(dart_binary_prefix, 'windows', 'dart.exe') | 20 dart_binary = os.path.join(dart_binary_prefix, 'windows', 'dart.exe') |
20 else: | 21 else: |
21 dart_binary = os.path.join(dart_binary_prefix, GuessOS(), 'dart') | 22 dart_binary = os.path.join(dart_binary_prefix, utils.GuessOS(), 'dart') |
22 current_directory = os.path.abspath(''); | 23 current_directory = os.path.abspath(''); |
23 client = os.path.abspath(os.path.join(tools_dir, '..')); | 24 client = os.path.abspath(os.path.join(tools_dir, '..')); |
24 if current_directory == os.path.join(client, 'runtime'): | 25 if current_directory == os.path.join(client, 'runtime'): |
25 dart_script_name = 'test-runtime.dart' | 26 dart_script_name = 'test-runtime.dart' |
26 elif current_directory == os.path.join(client, 'compiler'): | 27 elif current_directory == os.path.join(client, 'compiler'): |
27 dart_script_name = 'test-compiler.dart' | 28 dart_script_name = 'test-compiler.dart' |
28 else: | 29 else: |
29 dart_script_name = 'test.dart' | 30 dart_script_name = 'test.dart' |
30 dart_test_script = string.join([tools_dir, dart_script_name], os.sep) | 31 dart_test_script = string.join([tools_dir, dart_script_name], os.sep) |
31 command = [dart_binary, dart_test_script] + args | 32 command = [dart_binary, dart_test_script] + args |
32 return subprocess.call(command) | 33 exit_code = subprocess.call(command) |
| 34 utils.DiagnoseExitCode(exit_code, command) |
| 35 return exit_code |
| 36 |
33 | 37 |
34 if __name__ == '__main__': | 38 if __name__ == '__main__': |
35 sys.exit(Main()) | 39 sys.exit(Main()) |
OLD | NEW |