Enable browser tests with glibc.

buildbot/buildbot_standard.py

 #!/usr/bin/python
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Enable 'with' statements in Python 2.5
 from __future__ import with_statement
 
 import os.path
 import re
@@ skipping 83 matching lines @@
   # The branch is set to native_client on the main bots, on the trybots it's
   # set to ''.  Otherwise, we should assume a particular branch is being used.
   context['branch'] = os.environ.get('BUILDBOT_BRANCH', 'native_client')
   context['off_trunk'] = context['branch'] not in ['native_client', '']
 
 
 def BuildScript(status, context):
   inside_toolchain = context['inside_toolchain']
   # When off the trunk, we don't have anywhere to get Chrome binaries
   # from the appropriate branch, so we can't test the right Chrome.
-  do_integration_tests = (not context['use_glibc'] and
-                          not inside_toolchain and
+  do_integration_tests = (not inside_toolchain and
                           not context['off_trunk'])
   do_dso_tests = (context['use_glibc'] and
                   not inside_toolchain and
                   not context['off_trunk'])
 
   # If we're running browser tests on a 64-bit Windows machine, build a 32-bit
   # plugin.
   need_plugin_32 = (context.Windows() and
                     context['bits'] == '64' and
                     not inside_toolchain)
@@ skipping 127 matching lines @@
       SCons(
           context,
           browser_test=True,
           args=['force_ppapi_plugin=' + plugin,
                 'force_sel_ldr=' + sel_ldr,
                 'SILENT=1',
                 'chrome_browser_tests'])
 
     # TODO(mcgrathr): Clean up how we organize tests and do this differently.
     # See http://code.google.com/p/nativeclient/issues/detail?id=1691
-    with Step('chrome_browser_tests without IRT', status, halt_on_fail=False):
-      SCons(context, browser_test=True,
-            args=['SILENT=1', 'irt=0', 'chrome_browser_tests'])
+    if not do_dso_tests:
+      with Step('chrome_browser_tests without IRT', status, halt_on_fail=False):
+        SCons(context, browser_test=True,
+              args=['SILENT=1', 'irt=0', 'chrome_browser_tests'])
 
     with Step('pyauto_tests', status, halt_on_fail=False):
       SCons(context, browser_test=True, args=['SILENT=1', 'pyauto_tests'])
 
   if do_dso_tests:
     with Step('dynamic_library_browser_tests', status, halt_on_fail=False):
       SCons(context, browser_test=True,
             args=['SILENT=1', 'dynamic_library_browser_tests'])
 
   # IRT is incompatible with glibc startup hacks.
@@ skipping 29 matching lines @@
     SetupLinuxEnvironment(context)
   elif context.Mac():
     SetupMacEnvironment(context)
   else:
     raise Exception("Unsupported platform.")
   RunBuild(BuildScript, status, context)
 
 
 if __name__ == '__main__':
   Main()