Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: tools-webrtc/mb/mb.py

Issue 2686563002: Pass isolate output dir to gtest-parallel-wrapper.py (Closed)
Patch Set: Don't pass timeout. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | tools-webrtc/mb/mb_unittest.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 '/'
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 ]
1111 1114
1112 asan = 'is_asan=true' in vals['gn_args'] 1115 asan = 'is_asan=true' in vals['gn_args']
1113 msan = 'is_msan=true' in vals['gn_args'] 1116 msan = 'is_msan=true' in vals['gn_args']
1114 tsan = 'is_tsan=true' in vals['gn_args'] 1117 tsan = 'is_tsan=true' in vals['gn_args']
1115 1118
1116 executable_prefix = '.\\' if self.platform == 'win32' else './' 1119 executable_prefix = '.\\' if self.platform == 'win32' else './'
1117 executable_suffix = '.exe' if self.platform == 'win32' else '' 1120 executable_suffix = '.exe' if self.platform == 'win32' else ''
1118 executable = executable_prefix + target + executable_suffix 1121 executable = executable_prefix + target + executable_suffix
1119 1122
1120 cmdline = (['../../testing/xvfb.py'] if xvfb else 1123 cmdline = (['../../testing/xvfb.py'] if xvfb else
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
1537 # Then check to see if the arg contains any metacharacters other than 1540 # Then check to see if the arg contains any metacharacters other than
1538 # double quotes; if it does, quote everything (including the double 1541 # double quotes; if it does, quote everything (including the double
1539 # quotes) for safety. 1542 # quotes) for safety.
1540 if any(a in UNSAFE_FOR_CMD for a in arg): 1543 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) 1544 arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg)
1542 return arg 1545 return arg
1543 1546
1544 1547
1545 if __name__ == '__main__': 1548 if __name__ == '__main__':
1546 sys.exit(main(sys.argv[1:])) 1549 sys.exit(main(sys.argv[1:]))
OLDNEW
« no previous file with comments | « no previous file | tools-webrtc/mb/mb_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698