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

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

Issue 7462016: NaCl: Update revision in DEPS, r6339 -> r6386 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Re-enable on Mac Created 9 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « DEPS ('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/python 1 #!/usr/bin/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
16 if sys.platform == 'darwin' and 'Debug' in args:
17 # The nacl integration tests don't work with clang in debug mode. Disable
18 # them to get the waterfall green until this is resolved.
19 # http://crbug.com/91371
20 sys.stdout.write('Skipping nacl_integration, see http://crbug.com/91371\n')
21 sys.stdout.flush()
22 return
23
24 # 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
25 # run. 16 # run.
26 # 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
27 # the NaCl integration tests to fail, you can uncomment the 18 # the NaCl integration tests to fail, you can uncomment the
28 # following block. (Make sure you comment it out when the issues 19 # following block. (Make sure you comment it out when the issues
29 # are resolved.) *However*, it is much preferred to add tests to 20 # are resolved.) *However*, it is much preferred to add tests to
30 # the 'tests_to_disable' list below. 21 # the 'tests_to_disable' list below.
31 #if not is_integration_bot: 22 #if not is_integration_bot:
32 # return 23 # return
33 24
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 cmd = [sys.executable, 56 cmd = [sys.executable,
66 nacl_integration_script, 57 nacl_integration_script,
67 '--disable_tests=%s' % ','.join(tests_to_disable)] + args 58 '--disable_tests=%s' % ','.join(tests_to_disable)] + args
68 sys.stdout.write('Running %s\n' % ' '.join(cmd)) 59 sys.stdout.write('Running %s\n' % ' '.join(cmd))
69 sys.stdout.flush() 60 sys.stdout.flush()
70 return subprocess.call(cmd) 61 return subprocess.call(cmd)
71 62
72 63
73 if __name__ == '__main__': 64 if __name__ == '__main__':
74 sys.exit(Main(sys.argv[1:])) 65 sys.exit(Main(sys.argv[1:]))
OLDNEW
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698