| 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 983 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 994 cmdline = [] | 994 cmdline = [] |
| 995 extra_files = [] | 995 extra_files = [] |
| 996 | 996 |
| 997 if android and test_type != "script": | 997 if android and test_type != "script": |
| 998 cmdline = [ | 998 cmdline = [ |
| 999 self.PathJoin('bin', 'run_%s' % target_name), | 999 self.PathJoin('bin', 'run_%s' % target_name), |
| 1000 '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats', | 1000 '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats', |
| 1001 '--target-devices-file', '${SWARMING_BOT_FILE}', | 1001 '--target-devices-file', '${SWARMING_BOT_FILE}', |
| 1002 '-v', | 1002 '-v', |
| 1003 ] | 1003 ] |
| 1004 # '&&', 'logdog_butler', '-project', 'chromium', '-output', |
| 1005 # 'logdog,host=luci-logdog-dev.appspot.com', 'stream', '-source', |
| 1006 # '${ISOLATED_OUTDIR}/logcats/device_logcats' |
| 1007 #] |
| 1004 elif use_x11 and test_type == 'windowed_test_launcher': | 1008 elif use_x11 and test_type == 'windowed_test_launcher': |
| 1005 extra_files = [ | 1009 extra_files = [ |
| 1006 'xdisplaycheck', | 1010 'xdisplaycheck', |
| 1007 '../../testing/test_env.py', | 1011 '../../testing/test_env.py', |
| 1008 '../../testing/xvfb.py', | 1012 '../../testing/xvfb.py', |
| 1009 ] | 1013 ] |
| 1010 cmdline = [ | 1014 cmdline = [ |
| 1011 '../../testing/xvfb.py', | 1015 '../../testing/xvfb.py', |
| 1012 '.', | 1016 '.', |
| 1013 './' + str(executable) + executable_suffix, | 1017 './' + str(executable) + executable_suffix, |
| (...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1486 # Then check to see if the arg contains any metacharacters other than | 1490 # Then check to see if the arg contains any metacharacters other than |
| 1487 # double quotes; if it does, quote everything (including the double | 1491 # double quotes; if it does, quote everything (including the double |
| 1488 # quotes) for safety. | 1492 # quotes) for safety. |
| 1489 if any(a in UNSAFE_FOR_CMD for a in arg): | 1493 if any(a in UNSAFE_FOR_CMD for a in arg): |
| 1490 arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg) | 1494 arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg) |
| 1491 return arg | 1495 return arg |
| 1492 | 1496 |
| 1493 | 1497 |
| 1494 if __name__ == '__main__': | 1498 if __name__ == '__main__': |
| 1495 sys.exit(main(sys.argv[1:])) | 1499 sys.exit(main(sys.argv[1:])) |
| OLD | NEW |