Chromium Code Reviews| 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 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1093 'memcheck', | 1093 'memcheck', |
| 1094 '--target', | 1094 '--target', |
| 1095 'Release', | 1095 'Release', |
| 1096 '--build-dir', | 1096 '--build-dir', |
| 1097 '..', | 1097 '..', |
| 1098 '--test', | 1098 '--test', |
| 1099 ] | 1099 ] |
| 1100 | 1100 |
| 1101 gtest_parallel = (test_type != 'non_parallel_console_test_launcher' and | 1101 gtest_parallel = (test_type != 'non_parallel_console_test_launcher' and |
| 1102 not memcheck) | 1102 not memcheck) |
| 1103 gtest_parallel_wrapper = [ | |
| 1104 '../../third_party/gtest-parallel/gtest-parallel-wrapper.py' | |
| 1105 ] | |
| 1106 if gtest_parallel: | 1103 if gtest_parallel: |
| 1107 extra_files += [ | 1104 extra_files += [ |
| 1108 '../../third_party/gtest-parallel/gtest-parallel', | 1105 '../../third_party/gtest-parallel/gtest-parallel', |
| 1109 '../../third_party/gtest-parallel/gtest-parallel-wrapper.py', | 1106 '../../third_party/gtest-parallel/gtest-parallel-wrapper.py', |
| 1110 ] | 1107 ] |
| 1108 sep = '\\' if self.platform == 'win32' else '/' | |
|
kjellander_webrtc
2017/02/07 20:41:39
Just use os.sep instead? https://docs.python.org/2
ehmaldonado_webrtc
2017/02/10 17:50:27
I guess the platform for which the isolate files a
kjellander_webrtc
2017/02/13 05:46:47
Ah, you're right. I thought only to check this fil
| |
| 1109 output_dir = '${ISOLATED_OUTDIR}' + sep + 'test_logs' | |
| 1110 gtest_parallel_wrapper = [ | |
| 1111 '../../third_party/gtest-parallel/gtest-parallel-wrapper.py', | |
| 1112 '--output_dir=%s' % output_dir, | |
| 1113 '--timeout=900', # 15 min. | |
|
kjellander_webrtc
2017/02/07 20:41:39
I think we should make this more visible (but keep
ehmaldonado_webrtc
2017/02/10 17:50:27
Acknowledged.
| |
| 1114 ] | |
| 1111 | 1115 |
| 1112 asan = 'is_asan=true' in vals['gn_args'] | 1116 asan = 'is_asan=true' in vals['gn_args'] |
| 1113 msan = 'is_msan=true' in vals['gn_args'] | 1117 msan = 'is_msan=true' in vals['gn_args'] |
| 1114 tsan = 'is_tsan=true' in vals['gn_args'] | 1118 tsan = 'is_tsan=true' in vals['gn_args'] |
| 1115 | 1119 |
| 1116 executable_prefix = '.\\' if self.platform == 'win32' else './' | 1120 executable_prefix = '.\\' if self.platform == 'win32' else './' |
| 1117 executable_suffix = '.exe' if self.platform == 'win32' else '' | 1121 executable_suffix = '.exe' if self.platform == 'win32' else '' |
| 1118 executable = executable_prefix + target + executable_suffix | 1122 executable = executable_prefix + target + executable_suffix |
| 1119 | 1123 |
| 1120 cmdline = (['../../testing/xvfb.py'] if xvfb else | 1124 cmdline = (['../../testing/xvfb.py'] if xvfb else |
| (...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1537 # Then check to see if the arg contains any metacharacters other than | 1541 # Then check to see if the arg contains any metacharacters other than |
| 1538 # double quotes; if it does, quote everything (including the double | 1542 # double quotes; if it does, quote everything (including the double |
| 1539 # quotes) for safety. | 1543 # quotes) for safety. |
| 1540 if any(a in UNSAFE_FOR_CMD for a in arg): | 1544 if any(a in UNSAFE_FOR_CMD for a in arg): |
| 1541 arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg) | 1545 arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg) |
| 1542 return arg | 1546 return arg |
| 1543 | 1547 |
| 1544 | 1548 |
| 1545 if __name__ == '__main__': | 1549 if __name__ == '__main__': |
| 1546 sys.exit(main(sys.argv[1:])) | 1550 sys.exit(main(sys.argv[1:])) |
| OLD | NEW |