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

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

Issue 2530463002: Remove xdisplaycheck from the tree (Closed)
Patch Set: Rebase again Created 4 years 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 | « services/ui/ws/BUILD.gn ('k') | tools/perf/chrome_telemetry_build/BUILD.gn » ('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 2015 The Chromium Authors. All rights reserved. 2 # Copyright 2015 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 """MB - the Meta-Build wrapper around GYP and GN 6 """MB - the Meta-Build wrapper around GYP and GN
7 7
8 MB is a wrapper script for GYP and GN that can be used to generate build files 8 MB is a wrapper script for GYP and GN that can be used to generate build files
9 for sets of canned configurations and analyze them. 9 for sets of canned configurations and analyze them.
10 """ 10 """
(...skipping 1087 matching lines...) Expand 10 before | Expand all | Expand 10 after
1098 test_cmdline = [ 1098 test_cmdline = [
1099 self.PathJoin('bin', 'run_%s' % target), 1099 self.PathJoin('bin', 'run_%s' % target),
1100 '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', 1100 '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
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',
1109 '../../testing/test_env.py', 1108 '../../testing/test_env.py',
1110 '../../testing/xvfb.py', 1109 '../../testing/xvfb.py',
1111 ] 1110 ]
1112 cmdline = [ 1111 cmdline = [
1113 '../../testing/xvfb.py', 1112 '../../testing/xvfb.py',
1114 '.', 1113 '.',
1115 './' + str(executable) + executable_suffix, 1114 './' + str(executable) + executable_suffix,
1116 '--brave-new-test-launcher', 1115 '--brave-new-test-launcher',
1117 '--test-launcher-bot-mode', 1116 '--test-launcher-bot-mode',
1118 '--asan=%d' % asan, 1117 '--asan=%d' % asan,
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
1571 # Then check to see if the arg contains any metacharacters other than 1570 # Then check to see if the arg contains any metacharacters other than
1572 # double quotes; if it does, quote everything (including the double 1571 # double quotes; if it does, quote everything (including the double
1573 # quotes) for safety. 1572 # quotes) for safety.
1574 if any(a in UNSAFE_FOR_CMD for a in arg): 1573 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) 1574 arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg)
1576 return arg 1575 return arg
1577 1576
1578 1577
1579 if __name__ == '__main__': 1578 if __name__ == '__main__':
1580 sys.exit(main(sys.argv[1:])) 1579 sys.exit(main(sys.argv[1:]))
OLDNEW
« no previous file with comments | « services/ui/ws/BUILD.gn ('k') | tools/perf/chrome_telemetry_build/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698