| 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 1088 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1099 else: | 1099 else: |
| 1100 extra_files = ['../../testing/test_env.py'] | 1100 extra_files = ['../../testing/test_env.py'] |
| 1101 | 1101 |
| 1102 # This needs to mirror the settings in //build/config/ui.gni: | 1102 # This needs to mirror the settings in //build/config/ui.gni: |
| 1103 # use_x11 = is_linux && !use_ozone. | 1103 # use_x11 = is_linux && !use_ozone. |
| 1104 use_x11 = is_linux and not 'use_ozone=true' in vals['gn_args'] | 1104 use_x11 = is_linux and not 'use_ozone=true' in vals['gn_args'] |
| 1105 | 1105 |
| 1106 xvfb = use_x11 and test_type == 'windowed_test_launcher' | 1106 xvfb = use_x11 and test_type == 'windowed_test_launcher' |
| 1107 if xvfb: | 1107 if xvfb: |
| 1108 extra_files += [ | 1108 extra_files += [ |
| 1109 'xdisplaycheck', | |
| 1110 '../../testing/xvfb.py', | 1109 '../../testing/xvfb.py', |
| 1111 ] | 1110 ] |
| 1112 | 1111 |
| 1113 # Memcheck is only supported for linux. Ignore in other platforms. | 1112 # Memcheck is only supported for linux. Ignore in other platforms. |
| 1114 memcheck = is_linux and 'rtc_use_memcheck=true' in vals['gn_args'] | 1113 memcheck = is_linux and 'rtc_use_memcheck=true' in vals['gn_args'] |
| 1115 memcheck_cmdline = [ | 1114 memcheck_cmdline = [ |
| 1116 'bash', | 1115 'bash', |
| 1117 '../../tools/valgrind-webrtc/webrtc_tests.sh', | 1116 '../../tools/valgrind-webrtc/webrtc_tests.sh', |
| 1118 '--tool', | 1117 '--tool', |
| 1119 'memcheck', | 1118 'memcheck', |
| (...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1563 # Then check to see if the arg contains any metacharacters other than | 1562 # Then check to see if the arg contains any metacharacters other than |
| 1564 # double quotes; if it does, quote everything (including the double | 1563 # double quotes; if it does, quote everything (including the double |
| 1565 # quotes) for safety. | 1564 # quotes) for safety. |
| 1566 if any(a in UNSAFE_FOR_CMD for a in arg): | 1565 if any(a in UNSAFE_FOR_CMD for a in arg): |
| 1567 arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg) | 1566 arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg) |
| 1568 return arg | 1567 return arg |
| 1569 | 1568 |
| 1570 | 1569 |
| 1571 if __name__ == '__main__': | 1570 if __name__ == '__main__': |
| 1572 sys.exit(main(sys.argv[1:])) | 1571 sys.exit(main(sys.argv[1:])) |
| OLD | NEW |