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

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

Issue 2503503002: MB: Run test with gtest-parallel on swarming. (Closed)
Patch Set: Modify gtest-parallel python magic line. Created 4 years, 1 month 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 | « third_party/gtest-parallel/gtest-parallel ('k') | no next file » | 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 1090 matching lines...) Expand 10 before | Expand all | Expand 10 after
1101 '--target-devices-file', '${SWARMING_BOT_FILE}', 1101 '--target-devices-file', '${SWARMING_BOT_FILE}',
1102 '-v' 1102 '-v'
1103 ] 1103 ]
1104 cmdline = (['./../../build/android/test_wrapper/logdog_wrapper.py'] 1104 cmdline = (['./../../build/android/test_wrapper/logdog_wrapper.py']
1105 + logdog_command + test_cmdline) 1105 + logdog_command + test_cmdline)
1106 elif use_x11 and test_type == 'windowed_test_launcher': 1106 elif use_x11 and test_type == 'windowed_test_launcher':
1107 extra_files = [ 1107 extra_files = [
1108 'xdisplaycheck', 1108 'xdisplaycheck',
1109 '../../testing/test_env.py', 1109 '../../testing/test_env.py',
1110 '../../testing/xvfb.py', 1110 '../../testing/xvfb.py',
1111 '../../third_party/gtest-parallel/gtest-parallel',
1111 ] 1112 ]
1112 cmdline = [ 1113 cmdline = [
1113 '../../testing/xvfb.py', 1114 '../../testing/xvfb.py',
1114 '.', 1115 '.',
1116 '../../third_party/gtest-parallel/gtest-parallel',
1115 './' + str(executable) + executable_suffix, 1117 './' + str(executable) + executable_suffix,
1116 '--brave-new-test-launcher', 1118 '--',
1117 '--test-launcher-bot-mode', 1119 '--test-launcher-bot-mode',
kjellander_webrtc 2016/11/14 21:12:20 We should get rid of --test-launcher-bot-mode too,
1118 '--asan=%d' % asan, 1120 '--asan=%d' % asan,
1119 '--msan=%d' % msan, 1121 '--msan=%d' % msan,
1120 '--tsan=%d' % tsan, 1122 '--tsan=%d' % tsan,
1121 ] 1123 ]
1122 elif test_type in ('windowed_test_launcher', 'console_test_launcher'): 1124 elif test_type in ('windowed_test_launcher', 'console_test_launcher'):
1123 extra_files = [ 1125 extra_files = [
1124 '../../testing/test_env.py' 1126 '../../testing/test_env.py',
1127 '../../third_party/gtest-parallel/gtest-parallel',
1125 ] 1128 ]
1126 cmdline = [ 1129 cmdline = [
1127 '../../testing/test_env.py', 1130 '../../testing/test_env.py',
1131 '../../third_party/gtest-parallel/gtest-parallel',
1128 './' + str(executable) + executable_suffix, 1132 './' + str(executable) + executable_suffix,
1129 '--brave-new-test-launcher', 1133 '--',
1130 '--test-launcher-bot-mode', 1134 '--test-launcher-bot-mode',
1131 '--asan=%d' % asan, 1135 '--asan=%d' % asan,
1132 '--msan=%d' % msan, 1136 '--msan=%d' % msan,
1133 '--tsan=%d' % tsan, 1137 '--tsan=%d' % tsan,
1134 ] 1138 ]
1135 elif test_type == 'gpu_browser_test': 1139 elif test_type == 'gpu_browser_test':
1136 extra_files = [ 1140 extra_files = [
1137 '../../testing/test_env.py' 1141 '../../testing/test_env.py'
1138 ] 1142 ]
1139 gtest_filter = isolate_map[target]['gtest_filter'] 1143 gtest_filter = isolate_map[target]['gtest_filter']
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
1571 # Then check to see if the arg contains any metacharacters other than 1575 # Then check to see if the arg contains any metacharacters other than
1572 # double quotes; if it does, quote everything (including the double 1576 # double quotes; if it does, quote everything (including the double
1573 # quotes) for safety. 1577 # quotes) for safety.
1574 if any(a in UNSAFE_FOR_CMD for a in arg): 1578 if any(a in UNSAFE_FOR_CMD for a in arg):
1575 arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg) 1579 arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg)
1576 return arg 1580 return arg
1577 1581
1578 1582
1579 if __name__ == '__main__': 1583 if __name__ == '__main__':
1580 sys.exit(main(sys.argv[1:])) 1584 sys.exit(main(sys.argv[1:]))
OLDNEW
« no previous file with comments | « third_party/gtest-parallel/gtest-parallel ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698