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

Side by Side Diff: chrome/test/nacl_test_injection/buildbot_nacl_integration.py

Issue 8823014: Re-enable nacl_integration on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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) 2011 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2011 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 import os 6 import os
7 import subprocess 7 import subprocess
8 import sys 8 import sys
9 9
10 10
11 def Main(args): 11 def Main(args):
12 pwd = os.environ.get('PWD', '') 12 pwd = os.environ.get('PWD', '')
13 is_integration_bot = 'nacl-chrome' in pwd 13 is_integration_bot = 'nacl-chrome' in pwd
14 14
15 if not is_integration_bot and sys.platform == 'darwin':
16 # TODO: Reenable.
17 sys.stdout.write('Skipping nacl_integration, see http://crbug.com/105406\n')
18 return
19
20 # On the main Chrome waterfall, we may need to control where the tests are 15 # On the main Chrome waterfall, we may need to control where the tests are
21 # run. 16 # run.
22 # If there is serious skew in the PPAPI interface that causes all of 17 # If there is serious skew in the PPAPI interface that causes all of
23 # the NaCl integration tests to fail, you can uncomment the 18 # the NaCl integration tests to fail, you can uncomment the
24 # following block. (Make sure you comment it out when the issues 19 # following block. (Make sure you comment it out when the issues
25 # are resolved.) *However*, it is much preferred to add tests to 20 # are resolved.) *However*, it is much preferred to add tests to
26 # the 'tests_to_disable' list below. 21 # the 'tests_to_disable' list below.
27 #if not is_integration_bot: 22 #if not is_integration_bot:
28 # return 23 # return
29 24
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 '--', 80 '--',
86 nacl_integration_script, 81 nacl_integration_script,
87 '--disable_tests=%s' % ','.join(tests_to_disable)] + args 82 '--disable_tests=%s' % ','.join(tests_to_disable)] + args
88 sys.stdout.write('Running %s\n' % ' '.join(cmd)) 83 sys.stdout.write('Running %s\n' % ' '.join(cmd))
89 sys.stdout.flush() 84 sys.stdout.flush()
90 return subprocess.call(cmd) 85 return subprocess.call(cmd)
91 86
92 87
93 if __name__ == '__main__': 88 if __name__ == '__main__':
94 sys.exit(Main(sys.argv[1:])) 89 sys.exit(Main(sys.argv[1:]))
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698