diff options
| author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-24 18:11:38 +0000 |
|---|---|---|
| committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-24 18:11:38 +0000 |
| commit | fb335fe0cf9bce0888dd72b84359e83cc5b08991 (patch) | |
| tree | da4a9a8ade30b26eac8d128e2eafe72fc4823b86 /chrome/test | |
| parent | 2ded2ee298c09a45032fe6cdf8349370f01003d3 (diff) | |
| download | chromium_src-fb335fe0cf9bce0888dd72b84359e83cc5b08991.zip chromium_src-fb335fe0cf9bce0888dd72b84359e83cc5b08991.tar.gz chromium_src-fb335fe0cf9bce0888dd72b84359e83cc5b08991.tar.bz2 | |
NaCl: Make hardware exception handling work on 64-bit Windows
In order to support untrusted hardware exception handling on 64-bit
Windows, we need to have a 64-bit process attach as a debugger to the
64-bit NaCl loader process, so we extend the NaCl broker process to do
this.
The new code in nacl_broker_listener.cc for attaching a 64-bit
debugger is similar to the 32-bit code in nacl_process_host.cc. I
intend to unify the two in a later change.
BUG=http://code.google.com/p/nativeclient/issues/detail?id=2651
TEST=run_inbrowser_exception_test in nacl_integration
Review URL: https://chromiumcodereview.appspot.com/9835003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128764 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rwxr-xr-x | chrome/test/nacl_test_injection/buildbot_nacl_integration.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py index e571f02..f44a4e6 100755 --- a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py +++ b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py @@ -80,10 +80,11 @@ def Main(args): if sys.platform in ('win32', 'cygwin'): tests_to_disable.append('run_ppapi_ppp_input_event_browser_test') - # TODO(mseaborn): Remove this when exception handling works inside - # Chromium on Windows for both x86-32 and x86-64. + # TODO(mseaborn): Enable this test for 32-bit Windows. # See http://code.google.com/p/nativeclient/issues/detail?id=2602 - tests_to_disable.append('run_inbrowser_exception_test') + if not ('64' in os.environ.get('PROCESSOR_ARCHITECTURE', '') or + '64' in os.environ.get('PROCESSOR_ARCHITEW6432', '')): + tests_to_disable.append('run_inbrowser_exception_test') script_dir = os.path.dirname(os.path.abspath(__file__)) test_dir = os.path.dirname(script_dir) |