| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright 2015 The Chromium Authors. All rights reserved. | 2 # Copyright 2015 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 """MB - the Meta-Build wrapper around GYP and GN | 6 """MB - the Meta-Build wrapper around GYP and GN |
| 7 | 7 |
| 8 MB is a wrapper script for GYP and GN that can be used to generate build files | 8 MB is a wrapper script for GYP and GN that can be used to generate build files |
| 9 for sets of canned configurations and analyze them. | 9 for sets of canned configurations and analyze them. |
| 10 """ | 10 """ |
| (...skipping 969 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 980 | 980 |
| 981 target_name = self.GNTargetName(target) | 981 target_name = self.GNTargetName(target) |
| 982 test_type = gn_isolate_map[target_name]['type'] | 982 test_type = gn_isolate_map[target_name]['type'] |
| 983 | 983 |
| 984 executable = gn_isolate_map[target_name].get('executable', target_name) | 984 executable = gn_isolate_map[target_name].get('executable', target_name) |
| 985 executable_suffix = '.exe' if self.platform == 'win32' else '' | 985 executable_suffix = '.exe' if self.platform == 'win32' else '' |
| 986 | 986 |
| 987 cmdline = [] | 987 cmdline = [] |
| 988 extra_files = [] | 988 extra_files = [] |
| 989 | 989 |
| 990 if android: | 990 if android and test_type != "script": |
| 991 # TODO(jbudorick): This won't work with instrumentation test targets. | 991 # TODO(jbudorick): This won't work with instrumentation test targets. |
| 992 # Revisit this logic when those are added to gn_isolate_map.pyl. | 992 # Revisit this logic when those are added to gn_isolate_map.pyl. |
| 993 cmdline = [self.PathJoin('bin', 'run_%s' % target_name)] | 993 cmdline = [self.PathJoin('bin', 'run_%s' % target_name)] |
| 994 elif use_x11 and test_type == 'windowed_test_launcher': | 994 elif use_x11 and test_type == 'windowed_test_launcher': |
| 995 extra_files = [ | 995 extra_files = [ |
| 996 'xdisplaycheck', | 996 'xdisplaycheck', |
| 997 '../../testing/test_env.py', | 997 '../../testing/test_env.py', |
| 998 '../../testing/xvfb.py', | 998 '../../testing/xvfb.py', |
| 999 ] | 999 ] |
| 1000 cmdline = [ | 1000 cmdline = [ |
| (...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1464 # Then check to see if the arg contains any metacharacters other than | 1464 # Then check to see if the arg contains any metacharacters other than |
| 1465 # double quotes; if it does, quote everything (including the double | 1465 # double quotes; if it does, quote everything (including the double |
| 1466 # quotes) for safety. | 1466 # quotes) for safety. |
| 1467 if any(a in UNSAFE_FOR_CMD for a in arg): | 1467 if any(a in UNSAFE_FOR_CMD for a in arg): |
| 1468 arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg) | 1468 arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg) |
| 1469 return arg | 1469 return arg |
| 1470 | 1470 |
| 1471 | 1471 |
| 1472 if __name__ == '__main__': | 1472 if __name__ == '__main__': |
| 1473 sys.exit(main(sys.argv[1:])) | 1473 sys.exit(main(sys.argv[1:])) |
| OLD | NEW |