Revert 128139 - NaCl: Enable hardware exception handling test on 32-bit Windows

chrome/test/nacl_test_injection/buildbot_nacl_integration.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import subprocess
 import sys
 
 
@@ skipping 63 matching lines @@
 
     if sys.platform == 'darwin':
       # TODO(mseaborn) fix
       # http://code.google.com/p/nativeclient/issues/detail?id=1835
       tests_to_disable.append('run_ppapi_crash_browser_test')
 
   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 x86-64 Windows.
+    # Chromium on Windows for both x86-32 and x86-64.
     # See http://code.google.com/p/nativeclient/issues/detail?id=2602
-    if ('64' in os.environ.get('PROCESSOR_ARCHITECTURE', '') or
-        '64' in os.environ.get('PROCESSOR_ARCHITEW6432', '')):
-      tests_to_disable.append('run_inbrowser_exception_test')
+    tests_to_disable.append('run_inbrowser_exception_test')
 
   script_dir = os.path.dirname(os.path.abspath(__file__))
   test_dir = os.path.dirname(script_dir)
   chrome_dir = os.path.dirname(test_dir)
   src_dir = os.path.dirname(chrome_dir)
   nacl_integration_script = os.path.join(
       src_dir, 'native_client/build/buildbot_chrome_nacl_stage.py')
   cmd = [sys.executable,
          '/b/build/scripts/slave/runtest.py',
          '--run-python-script',
          '--target=',
          '--build-dir=',
          '--',
          nacl_integration_script,
          '--disable_tests=%s' % ','.join(tests_to_disable)]
   if not is_integration_bot:
     if sys.platform in ('win32', 'cygwin'):
       # http://code.google.com/p/nativeclient/issues/detail?id=2648
       cmd.append('--disable_glibc')
   cmd += args
   sys.stdout.write('Running %s\n' % ' '.join(cmd))
   sys.stdout.flush()
   return subprocess.call(cmd)
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv[1:]))