Enable browser tests with glibc.

tests/nameservice/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('env')
 
 nameservice_test_nexe = env.ComponentProgram(
                             'nameservice_test',
                             'nameservice_test.c',
@@ skipping 16 matching lines @@
                                     srpc_ns_obj,
                                     EXTRA_LIBS=[
                                         'srpc',
                                         'platform',
                                         'gio',
                                         'imc',
                                         'imc_syscalls',
                                         '${PTHREAD_LIBS}',
                                         '${NON_PPAPI_BROWSER_LIBS}'])
 env.Publish(srpc_ns_nexe_name, 'run',
-            ['srpc_nameservice_test.html',
-             'srpc_nameservice.nmf'])
+            ['srpc_nameservice_test.html'])
 
 # chrome_browser_tests
 
 node = env.PPAPIBrowserTester(
     'srpc_nameservice_browser_test.out',
     url='srpc_nameservice_test.html',
+    nmfs=['srpc_nameservice.nmf'],
     files=env.ExtractPublishedFiles(srpc_ns_nexe_name),
     args=['--debug', '--enable_experimental_js'])
 
 env.AddNodeToTestSuite(node,
                        ['chrome_browser_tests'],
                        'run_srpc_nameservice_chrome_browser_test',
                        is_broken=env.PPAPIBrowserTesterIsBroken())
 
 # postmessage version of srpc_nameservice_test
 
 pm_ns_obj = env.ComponentObject('pm_nameservice_test.o',
                                 'pm_nameservice_test.cc')
 pm_ns_nexe_name = 'pm_nameservice_test_%s' % env.get('TARGET_FULLARCH')
 pm_ns_nexe = env.ComponentProgram(pm_ns_nexe_name,
                                   pm_ns_obj,
                                   EXTRA_LIBS=['nacl_ppapi_util',
                                               'ppapi_cpp',
                                               '${PPAPI_LIBS}',
                                               'pthread',
                                               'srpc',
                                               'platform',
                                               'gio',
                                               'imc',
                                               'imc_syscalls',
                                               ])
 env.Publish(pm_ns_nexe_name, 'run',
-            ['pm_nameservice_test.html',
-             'pm_nameservice.nmf'])
+            ['pm_nameservice_test.html'])
 
 # chrome_browser_tests
 
 node = env.PPAPIBrowserTester(
     'pm_nameservice_browser_test.out',
     url='pm_nameservice_test.html',
+    nmfs=['pm_nameservice.nmf'],
     files=env.ExtractPublishedFiles(pm_ns_nexe_name),
     args=['--debug'],
     osenv=['NACLVERBOSITY=0:pp_weak_ref=0:weak_ref=0']
     )
 
 env.AddNodeToTestSuite(node,
                        ['chrome_browser_tests'],
                        'run_pm_nameservice_chrome_browser_test',
-                       is_broken=env.PPAPIBrowserTesterIsBroken())
+                       is_broken=env.PPAPIBrowserTesterIsBroken() or
+                                 env.Bit('nacl_glibc'))