[NaCl SDK] Run browser tests with --disable-component-update

native_client_sdk/src/build_tools/test_projects.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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 optparse
 import os
 import subprocess
 import sys
 import time
@@ skipping 49 matching lines @@
     # http://crbug.com/262379.
     {'name': 'graphics_3d', 'platform': ('win', 'linux')},
     # TODO(binji): These tests timeout on the trybots because the NEXEs take
     # more than 40 seconds to load (!). See http://crbug.com/280753
     {'name': 'nacl_io_test', 'platform': 'win', 'toolchain': 'glibc'},
     # We don't test "getting_started/part1" because it would complicate the
     # example.
     # TODO(binji): figure out a way to inject the testing code without
     # modifying the example; maybe an extension?
     {'name': 'part1'},
-    # TODO(binji): loading nacl_io_test.pexe on win/linux is > 40 seconds.
-    # See http://crbug.com/315253
-    {'name': 'nacl_io_test', 'platform': ('win', 'linux'),
-     'toolchain': 'pnacl', 'config': 'Release'},
 ]
 
 def ValidateToolchains(toolchains):
   invalid_toolchains = set(toolchains) - set(ALL_TOOLCHAINS)
   if invalid_toolchains:
     buildbot_common.ErrorExit('Invalid toolchain(s): %s' % (
         ', '.join(invalid_toolchains)))
 
 
 def GetServingDirForProject(desc):
@@ skipping 17 matching lines @@
     buildbot_common.ErrorExit('Failed to find chrome browser using FindChrome.')
 
   args = [
     sys.executable,
     browser_tester_py,
     '--browser_path', browser_path,
     '--timeout', '30.0',  # seconds
     # Prevent the infobar that shows up when requesting filesystem quota.
     '--browser_flag', '--unlimited-storage',
     '--enable_sockets',
+    # Prevent installing a new copy of PNaCl.
+    '--browser_flag', '--disable-component-update',
   ]
 
   args.extend(['--serving_dir', GetServingDirForProject(desc)])
   # Fall back on the example directory in the Chromium repo, to find test.js.
   args.extend(['--serving_dir', GetRepoServingDirForProject(desc)])
   # If it is not found there, fall back on the dummy one (in this directory.)
   args.extend(['--serving_dir', SCRIPT_DIR])
 
   if toolchain == platform:
     exe_dir = GetExecutableDirForProject(desc, toolchain, config)
@@ skipping 226 matching lines @@
 
 
 if __name__ == '__main__':
   script_name = os.path.basename(sys.argv[0])
   try:
     sys.exit(main(sys.argv))
   except parse_dsc.ValidationError as e:
     buildbot_common.ErrorExit('%s: %s' % (script_name, e))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('%s: interrupted' % script_name)