OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. |
3 # | 3 # |
4 # Use of this source code is governed by a BSD-style license | 4 # Use of this source code is governed by a BSD-style license |
5 # that can be found in the LICENSE file in the root of the source | 5 # that can be found in the LICENSE file in the root of the source |
6 # tree. An additional intellectual property rights grant can be found | 6 # tree. An additional intellectual property rights grant can be found |
7 # in the file PATENTS. All contributing project authors may | 7 # in the file PATENTS. All contributing project authors may |
8 # be found in the AUTHORS file in the root of the source tree. | 8 # be found in the AUTHORS file in the root of the source tree. |
9 | 9 |
10 """MB - the Meta-Build wrapper around GYP and GN | 10 """MB - the Meta-Build wrapper around GYP and GN |
(...skipping 1039 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1050 'additional_compile_target', 'junit_test'): | 1050 'additional_compile_target', 'junit_test'): |
1051 self.WriteFailureAndRaise('No command line for %s found (test type %s).' | 1051 self.WriteFailureAndRaise('No command line for %s found (test type %s).' |
1052 % (target, test_type), output_path=None) | 1052 % (target, test_type), output_path=None) |
1053 | 1053 |
1054 cmdline = [] | 1054 cmdline = [] |
1055 extra_files = [] | 1055 extra_files = [] |
1056 | 1056 |
1057 if android: | 1057 if android: |
1058 cmdline = ['../../build/android/test_wrapper/logdog_wrapper.py', | 1058 cmdline = ['../../build/android/test_wrapper/logdog_wrapper.py', |
1059 '--target', target, | 1059 '--target', target, |
1060 '--logdog-bin-cmd', '../../bin/logdog_butler'] | 1060 '--logdog-bin-cmd', '../../bin/logdog_butler', |
| 1061 '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', |
| 1062 '--store-tombstones'] |
| 1063 |
1061 if test_type != 'junit_test': | 1064 if test_type != 'junit_test': |
1062 cmdline += ['--target-devices-file', '${SWARMING_BOT_FILE}'] | 1065 cmdline += ['--target-devices-file', '${SWARMING_BOT_FILE}'] |
1063 else: | 1066 else: |
1064 extra_files = ['../../testing/test_env.py'] | 1067 extra_files = ['../../testing/test_env.py'] |
1065 | 1068 |
1066 # This needs to mirror the settings in //build/config/ui.gni: | 1069 # This needs to mirror the settings in //build/config/ui.gni: |
1067 # use_x11 = is_linux && !use_ozone. | 1070 # use_x11 = is_linux && !use_ozone. |
1068 use_x11 = is_linux and not 'use_ozone=true' in vals['gn_args'] | 1071 use_x11 = is_linux and not 'use_ozone=true' in vals['gn_args'] |
1069 | 1072 |
1070 xvfb = use_x11 and test_type == 'windowed_test_launcher' | 1073 xvfb = use_x11 and test_type == 'windowed_test_launcher' |
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1540 # Then check to see if the arg contains any metacharacters other than | 1543 # Then check to see if the arg contains any metacharacters other than |
1541 # double quotes; if it does, quote everything (including the double | 1544 # double quotes; if it does, quote everything (including the double |
1542 # quotes) for safety. | 1545 # quotes) for safety. |
1543 if any(a in UNSAFE_FOR_CMD for a in arg): | 1546 if any(a in UNSAFE_FOR_CMD for a in arg): |
1544 arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg) | 1547 arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg) |
1545 return arg | 1548 return arg |
1546 | 1549 |
1547 | 1550 |
1548 if __name__ == '__main__': | 1551 if __name__ == '__main__': |
1549 sys.exit(main(sys.argv[1:])) | 1552 sys.exit(main(sys.argv[1:])) |
OLD | NEW |