| 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 1073 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 cmdline = [ | 1089 cmdline = [ |
| 1090 '../../build/android/test_wrapper/logdog_wrapper.py', | 1090 '../../build/android/test_wrapper/logdog_wrapper.py', |
| 1091 '--target', target, | 1091 '--target', target, |
| 1092 '--target-devices-file', '${SWARMING_BOT_FILE}', | 1092 '--target-devices-file', '${SWARMING_BOT_FILE}', |
| 1093 '--logdog-bin-cmd', '../../bin/logdog_butler', | 1093 '--logdog-bin-cmd', '../../bin/logdog_butler', |
| 1094 '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats'] | 1094 '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', |
| 1095 '--store-tombstones'] |
| 1095 elif use_xvfb and test_type == 'windowed_test_launcher': | 1096 elif use_xvfb and test_type == 'windowed_test_launcher': |
| 1096 extra_files = [ | 1097 extra_files = [ |
| 1097 '../../testing/test_env.py', | 1098 '../../testing/test_env.py', |
| 1098 '../../testing/xvfb.py', | 1099 '../../testing/xvfb.py', |
| 1099 ] | 1100 ] |
| 1100 cmdline = [ | 1101 cmdline = [ |
| 1101 '../../testing/xvfb.py', | 1102 '../../testing/xvfb.py', |
| 1102 './' + str(executable) + executable_suffix, | 1103 './' + str(executable) + executable_suffix, |
| 1103 '--brave-new-test-launcher', | 1104 '--brave-new-test-launcher', |
| 1104 '--test-launcher-bot-mode', | 1105 '--test-launcher-bot-mode', |
| (...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1545 # Then check to see if the arg contains any metacharacters other than | 1546 # Then check to see if the arg contains any metacharacters other than |
| 1546 # double quotes; if it does, quote everything (including the double | 1547 # double quotes; if it does, quote everything (including the double |
| 1547 # quotes) for safety. | 1548 # quotes) for safety. |
| 1548 if any(a in UNSAFE_FOR_CMD for a in arg): | 1549 if any(a in UNSAFE_FOR_CMD for a in arg): |
| 1549 arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg) | 1550 arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg) |
| 1550 return arg | 1551 return arg |
| 1551 | 1552 |
| 1552 | 1553 |
| 1553 if __name__ == '__main__': | 1554 if __name__ == '__main__': |
| 1554 sys.exit(main(sys.argv[1:])) | 1555 sys.exit(main(sys.argv[1:])) |
| OLD | NEW |