old_contents: #!/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
  
  
  def Main(args):
    pwd = os.environ.get('PWD', '')
    is_integration_bot = 'nacl-chrome' in pwd
  
    # This environment variable check mimics what
    # buildbot_chrome_nacl_stage.py does.
    is_win64 = (sys.platform in ('win32', 'cygwin') and
                ('64' in os.environ.get('PROCESSOR_ARCHITECTURE', '') or
                 '64' in os.environ.get('PROCESSOR_ARCHITEW6432', '')))
  
    # On the main Chrome waterfall, we may need to control where the tests are
    # run.
    # If there is serious skew in the PPAPI interface that causes all of
    # the NaCl integration tests to fail, you can uncomment the
    # following block.  (Make sure you comment it out when the issues
    # are resolved.)  *However*, it is much preferred to add tests to
    # the 'tests_to_disable' list below.
    #if not is_integration_bot:
    #  return
  
    tests_to_disable = []
  
    # In general, you should disable tests inside this conditional.  This turns
    # them off on the main Chrome waterfall, but not on NaCl's integration bots.
    # This makes it easier to see when things have been fixed NaCl side.
    if not is_integration_bot:
      # http://code.google.com/p/nativeclient/issues/detail?id=2511
      tests_to_disable.append('run_ppapi_ppb_image_data_browser_test')
  
      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'):
        # This one is only failing for nacl_glibc on x64 Windows
        # but it is not clear how to disable only that limited case.
        # See http://crbug.com/132395
        tests_to_disable.append('run_inbrowser_test_runner')
  
    script_dir = os.path.dirname(os.path.abspath(__file__))
    nacl_integration_script = os.path.join(script_dir,
                                           'buildbot_chrome_nacl_stage.py')
    cmd = [sys.executable,
           nacl_integration_script,
           # TODO(ncbray) re-enable.
           # https://code.google.com/p/chromium/issues/detail?id=133568
           '--disable_glibc',
           '--disable_tests=%s' % ','.join(tests_to_disable)]
    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:]))
  
new_contents: #!/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
  
  
  def Main(args):
    pwd = os.environ.get('PWD', '')
    is_integration_bot = 'nacl-chrome' in pwd
  
    # This environment variable check mimics what
    # buildbot_chrome_nacl_stage.py does.
    is_win64 = (sys.platform in ('win32', 'cygwin') and
                ('64' in os.environ.get('PROCESSOR_ARCHITECTURE', '') or
                 '64' in os.environ.get('PROCESSOR_ARCHITEW6432', '')))
  
    # On the main Chrome waterfall, we may need to control where the tests are
    # run.
    # If there is serious skew in the PPAPI interface that causes all of
    # the NaCl integration tests to fail, you can uncomment the
    # following block.  (Make sure you comment it out when the issues
    # are resolved.)  *However*, it is much preferred to add tests to
    # the 'tests_to_disable' list below.
    #if not is_integration_bot:
    #  return
  
    tests_to_disable = []
  
    # In general, you should disable tests inside this conditional.  This turns
    # them off on the main Chrome waterfall, but not on NaCl's integration bots.
    # This makes it easier to see when things have been fixed NaCl side.
    if not is_integration_bot:
      # http://code.google.com/p/nativeclient/issues/detail?id=2511
      tests_to_disable.append('run_ppapi_ppb_image_data_browser_test')
  
      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'):
        # This one is only failing for nacl_glibc on x64 Windows but it is not
        # clear how to disable only that limited case.
        # See http://crbug.com/132395
        tests_to_disable.append('run_inbrowser_test_runner')
        # run_breakpad_browser_process_crash_test is flaky.
        # See http://crbug.com/317890
        tests_to_disable.append('run_breakpad_browser_process_crash_test')
  
    script_dir = os.path.dirname(os.path.abspath(__file__))
    nacl_integration_script = os.path.join(script_dir,
                                           'buildbot_chrome_nacl_stage.py')
    cmd = [sys.executable,
           nacl_integration_script,
           # TODO(ncbray) re-enable.
           # https://code.google.com/p/chromium/issues/detail?id=133568
           '--disable_glibc',
           '--disable_tests=%s' % ','.join(tests_to_disable)]
    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:]))
  
subject: Disable a flaky NaCl test.