Enable browser tests with glibc.

tests/srpc/nacl.scons

 # -*- 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.
 
 import platform
 
 Import('env')
 
 
 ######################################################################
 # Publish nexes and corresponding html to scons-out/.../staging/
 ######################################################################
 
 srpc_test_objs = env.ComponentObject('srpc_test', 'srpc_test.c')
 srpc_test_libs = ['srpc', 'imc_syscalls', 'platform', 'gio', 'm']
 
 srpc_test_nexe_name = 'srpc_test_%s' % env.get('TARGET_FULLARCH')
 srpc_test_nexe = env.ComponentProgram(
     srpc_test_nexe_name, srpc_test_objs,
     EXTRA_LIBS=srpc_test_libs + [
         '${NON_PPAPI_BROWSER_LIBS}',
         '${PTHREAD_LIBS}'])
 env.Publish(srpc_test_nexe_name, 'run',
     ['srpc_basic.html',
-     'srpc_perf.html',
-     'srpc_test.nmf'])
+     'srpc_perf.html'])
 
 srpc_test_nonbrowser = env.ComponentProgram(
     'srpc_test_nonbrowser', srpc_test_objs,
     EXTRA_LIBS=srpc_test_libs + ['${PTHREAD_LIBS}', '${NONIRT_LIBS}'])
 
 
 srpc_nrd_server_nexe_name = ('srpc_nrd_server_%s' %
                              env.get('TARGET_FULLARCH'))
 srpc_nrd_server_nexe = env.ComponentProgram(
     srpc_nrd_server_nexe_name, 'srpc_nrd_server.c',
     EXTRA_LIBS=[
         '${NON_PPAPI_BROWSER_LIBS}',
         'srpc',
         'imc_syscalls',
         'platform',
         'gio',
         'm',
         '${PTHREAD_LIBS}'])
-env.Publish(srpc_nrd_server_nexe_name, 'run',
-    ['srpc_nrd_server.nmf'])
-
 
 srpc_nrd_client_nexe_name = ('srpc_nrd_client_%s' %
                              env.get('TARGET_FULLARCH'))
 srpc_nrd_client_nexe = env.ComponentProgram(
     srpc_nrd_client_nexe_name, 'srpc_nrd_client.c',
     EXTRA_LIBS=[
         '${NON_PPAPI_BROWSER_LIBS}',
         'srpc',
         'imc_syscalls',
         'platform',
         'gio',
         'm',
         '${PTHREAD_LIBS}'])
 env.Publish(srpc_nrd_client_nexe_name, 'run',
     ['srpc_nrd_xfer.html',
-     'srpc_nrd_client.nmf',
-     srpc_nrd_server_nexe,
-     'srpc_nrd_server.nmf'])
+     srpc_nrd_server_nexe])
 
 
 srpc_bidir_nexe_name = ('srpc_bidir_%s' % env.get('TARGET_FULLARCH'))
 srpc_bidir_nexe = env.ComponentProgram(
     srpc_bidir_nexe_name, 'srpc_bidir.c',
     EXTRA_LIBS=['srpc', 'imc_syscalls', 'platform', 'gio', 'm', 'pthread'])
 env.Publish(srpc_bidir_nexe_name, 'run', [])
 
 
 # NOTE: at least for ARM the EXTRA_LIBS list should include 'srpc'
@@ skipping 28 matching lines @@
                        ['sel_ldr_tests', 'small_tests'],
                        'run_srpc_bad_service_test')
 
 ######################################################################
 ## Automated testing using chrome
 ######################################################################
 
 node = env.PPAPIBrowserTester(
     'srpc_basic_chrome_browser_test.out',
     url='srpc_basic.html',
+    nmfs=['srpc_test.nmf'],
     files=env.ExtractPublishedFiles(srpc_test_nexe_name),
     args=['--enable_experimental_js'])
 env.AddNodeToTestSuite(node,
                        ['chrome_browser_tests'],
                        'run_srpc_basic_chrome_browser_test',
                        is_broken=env.PPAPIBrowserTesterIsBroken())
 
 node = env.PPAPIBrowserTester(
     'srpc_nrd_xfer_chrome_browser_test.out',
     url='srpc_nrd_xfer.html',
+    nmfs=['srpc_nrd_client.nmf', 'srpc_nrd_server.nmf'],
     files=env.ExtractPublishedFiles(srpc_nrd_client_nexe_name),
     args=['--enable_experimental_js'])
 env.AddNodeToTestSuite(node,
                        ['chrome_browser_tests'],
                        'run_srpc_nrd_xfer_chrome_browser_test',
-                       is_broken=env.PPAPIBrowserTesterIsBroken())
+                       is_broken=env.PPAPIBrowserTesterIsBroken() or
+                                 env.Bit('nacl_glibc'))