Enable browser tests with glibc.

buildbot/buildbot_standard.py

Index: buildbot/buildbot_standard.py
===================================================================
--- buildbot/buildbot_standard.py	(revision 6583)
+++ buildbot/buildbot_standard.py	(working copy)
@@ -101,8 +101,7 @@
   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
@@ -250,9 +249,10 @@
 
     # 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'])