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 1068 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1079 executable_suffix = '.exe' if self.platform == 'win32' else '' | 1079 executable_suffix = '.exe' if self.platform == 'win32' else '' |
1080 | 1080 |
1081 cmdline = [] | 1081 cmdline = [] |
1082 extra_files = [] | 1082 extra_files = [] |
1083 | 1083 |
1084 if test_type == 'nontest': | 1084 if test_type == 'nontest': |
1085 self.WriteFailureAndRaise('We should not be isolating %s.' % target, | 1085 self.WriteFailureAndRaise('We should not be isolating %s.' % target, |
1086 output_path=None) | 1086 output_path=None) |
1087 | 1087 |
1088 if android and test_type != "script": | 1088 if android and test_type != "script": |
1089 # TODO(crbug.com/693203): Reenable logcat logdog uploading when outage | |
1090 # has been resolved. | |
1091 cmdline = [ | 1089 cmdline = [ |
1092 self.PathJoin('bin', 'run_%s' % target), | 1090 '../../build/android/test_wrapper/logdog_wrapper.py', |
1093 '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', | 1091 '--target', target, |
1094 '--target-devices-file', '${SWARMING_BOT_FILE}', | 1092 '--swarming-bot-file', '${SWARMING_BOT_FILE}', |
1095 '-v' | 1093 '--logdog-bin-cmd', '../../bin/logdog_butler'] |
1096 ] | |
1097 elif use_xvfb and test_type == 'windowed_test_launcher': | 1094 elif use_xvfb and test_type == 'windowed_test_launcher': |
1098 extra_files = [ | 1095 extra_files = [ |
1099 '../../testing/test_env.py', | 1096 '../../testing/test_env.py', |
1100 '../../testing/xvfb.py', | 1097 '../../testing/xvfb.py', |
1101 ] | 1098 ] |
1102 cmdline = [ | 1099 cmdline = [ |
1103 '../../testing/xvfb.py', | 1100 '../../testing/xvfb.py', |
1104 './' + str(executable) + executable_suffix, | 1101 './' + str(executable) + executable_suffix, |
1105 '--brave-new-test-launcher', | 1102 '--brave-new-test-launcher', |
1106 '--test-launcher-bot-mode', | 1103 '--test-launcher-bot-mode', |
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1560 # Then check to see if the arg contains any metacharacters other than | 1557 # Then check to see if the arg contains any metacharacters other than |
1561 # double quotes; if it does, quote everything (including the double | 1558 # double quotes; if it does, quote everything (including the double |
1562 # quotes) for safety. | 1559 # quotes) for safety. |
1563 if any(a in UNSAFE_FOR_CMD for a in arg): | 1560 if any(a in UNSAFE_FOR_CMD for a in arg): |
1564 arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg) | 1561 arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg) |
1565 return arg | 1562 return arg |
1566 | 1563 |
1567 | 1564 |
1568 if __name__ == '__main__': | 1565 if __name__ == '__main__': |
1569 sys.exit(main(sys.argv[1:])) | 1566 sys.exit(main(sys.argv[1:])) |
OLD | NEW |