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

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

Issue 9815026: NaCl: Enable hardware exception handling test on 32-bit Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 74
75 if sys.platform == 'darwin': 75 if sys.platform == 'darwin':
76 # TODO(mseaborn) fix 76 # TODO(mseaborn) fix
77 # http://code.google.com/p/nativeclient/issues/detail?id=1835 77 # http://code.google.com/p/nativeclient/issues/detail?id=1835
78 tests_to_disable.append('run_ppapi_crash_browser_test') 78 tests_to_disable.append('run_ppapi_crash_browser_test')
79 79
80 if sys.platform in ('win32', 'cygwin'): 80 if sys.platform in ('win32', 'cygwin'):
81 tests_to_disable.append('run_ppapi_ppp_input_event_browser_test') 81 tests_to_disable.append('run_ppapi_ppp_input_event_browser_test')
82 82
83 # TODO(mseaborn): Remove this when exception handling works inside 83 # TODO(mseaborn): Remove this when exception handling works inside
84 # Chromium on Windows for both x86-32 and x86-64. 84 # Chromium on x86-64 Windows.
85 # See http://code.google.com/p/nativeclient/issues/detail?id=2602 85 # See http://code.google.com/p/nativeclient/issues/detail?id=2602
86 tests_to_disable.append('run_inbrowser_exception_test') 86 if ('64' in os.environ.get('PROCESSOR_ARCHITECTURE', '') or
87 '64' in os.environ.get('PROCESSOR_ARCHITEW6432', '')):
88 tests_to_disable.append('run_inbrowser_exception_test')
87 89
88 script_dir = os.path.dirname(os.path.abspath(__file__)) 90 script_dir = os.path.dirname(os.path.abspath(__file__))
89 test_dir = os.path.dirname(script_dir) 91 test_dir = os.path.dirname(script_dir)
90 chrome_dir = os.path.dirname(test_dir) 92 chrome_dir = os.path.dirname(test_dir)
91 src_dir = os.path.dirname(chrome_dir) 93 src_dir = os.path.dirname(chrome_dir)
92 nacl_integration_script = os.path.join( 94 nacl_integration_script = os.path.join(
93 src_dir, 'native_client/build/buildbot_chrome_nacl_stage.py') 95 src_dir, 'native_client/build/buildbot_chrome_nacl_stage.py')
94 cmd = [sys.executable, 96 cmd = [sys.executable,
95 '/b/build/scripts/slave/runtest.py', 97 '/b/build/scripts/slave/runtest.py',
96 '--run-python-script', 98 '--run-python-script',
97 '--target=', 99 '--target=',
98 '--build-dir=', 100 '--build-dir=',
99 '--', 101 '--',
100 nacl_integration_script, 102 nacl_integration_script,
101 '--disable_tests=%s' % ','.join(tests_to_disable)] 103 '--disable_tests=%s' % ','.join(tests_to_disable)]
102 if not is_integration_bot: 104 if not is_integration_bot:
103 if sys.platform in ('win32', 'cygwin'): 105 if sys.platform in ('win32', 'cygwin'):
104 # http://code.google.com/p/nativeclient/issues/detail?id=2648 106 # http://code.google.com/p/nativeclient/issues/detail?id=2648
105 cmd.append('--disable_glibc') 107 cmd.append('--disable_glibc')
106 cmd += args 108 cmd += args
107 sys.stdout.write('Running %s\n' % ' '.join(cmd)) 109 sys.stdout.write('Running %s\n' % ' '.join(cmd))
108 sys.stdout.flush() 110 sys.stdout.flush()
109 return subprocess.call(cmd) 111 return subprocess.call(cmd)
110 112
111 113
112 if __name__ == '__main__': 114 if __name__ == '__main__':
113 sys.exit(Main(sys.argv[1:])) 115 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