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

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

Issue 20577003: NaCl: Re-enable nacl_integration tests on Mac OS X (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Retry upload Created 7 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 | « 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) 2012 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2012 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 if sys.platform == 'darwin':
13 print >> sys.stderr, "SKIPPING NACL INTEGRATION DUE TO BUG #261724."
14 return 0
15
16 pwd = os.environ.get('PWD', '') 12 pwd = os.environ.get('PWD', '')
17 is_integration_bot = 'nacl-chrome' in pwd 13 is_integration_bot = 'nacl-chrome' in pwd
18 14
19 # This environment variable check mimics what 15 # This environment variable check mimics what
20 # buildbot_chrome_nacl_stage.py does. 16 # buildbot_chrome_nacl_stage.py does.
21 is_win64 = (sys.platform in ('win32', 'cygwin') and 17 is_win64 = (sys.platform in ('win32', 'cygwin') and
22 ('64' in os.environ.get('PROCESSOR_ARCHITECTURE', '') or 18 ('64' in os.environ.get('PROCESSOR_ARCHITECTURE', '') or
23 '64' in os.environ.get('PROCESSOR_ARCHITEW6432', ''))) 19 '64' in os.environ.get('PROCESSOR_ARCHITEW6432', '')))
24 20
25 # On the main Chrome waterfall, we may need to control where the tests are 21 # On the main Chrome waterfall, we may need to control where the tests are
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 '--disable_glibc', 58 '--disable_glibc',
63 '--disable_tests=%s' % ','.join(tests_to_disable)] 59 '--disable_tests=%s' % ','.join(tests_to_disable)]
64 cmd += args 60 cmd += args
65 sys.stdout.write('Running %s\n' % ' '.join(cmd)) 61 sys.stdout.write('Running %s\n' % ' '.join(cmd))
66 sys.stdout.flush() 62 sys.stdout.flush()
67 return subprocess.call(cmd) 63 return subprocess.call(cmd)
68 64
69 65
70 if __name__ == '__main__': 66 if __name__ == '__main__':
71 sys.exit(Main(sys.argv[1:])) 67 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