Make chrome_browser_tests work with irt=0 again

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'])
+        '${PTHREAD_LIBS}'])
 env.Publish(srpc_test_nexe_name, 'run',
     ['srpc_basic.html',
      'srpc_perf.html',
      'srpc_test.nmf'])
 
 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'])
+        '${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'])
+        '${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'])
 
 
 cat_nexe_name = ('cat_%s' % env.get('TARGET_FULLARCH'))
 cat_nexe = env.ComponentProgram(
     cat_nexe_name, 'cat.c',
     EXTRA_LIBS=['${NON_PPAPI_BROWSER_LIBS}',
-                'srpc', 'imc_syscalls', 'platform', 'gio', 'pthread'])
+                'srpc', 'imc_syscalls', 'platform', 'gio', '${PTHREAD_LIBS}'])
 env.Publish(cat_nexe_name, 'run',
     ['srpc_url_as_nacl_desc.html',
      'srpc_url_as_nacl_desc_success.html',
      'cat.nmf'])
 
 
 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'])
@@ skipping 59 matching lines @@
 # TODO(sehr): fix this test on windows.
 node = env.PPAPIBrowserTester(
     'srpc_url_as_nacl_desc_chrome_browser_test.out',
     url='srpc_url_as_nacl_desc.html',
     files=env.ExtractPublishedFiles(cat_nexe_name),
     args=['--enable_experimental_js', '--allow_404'])
 env.AddNodeToTestSuite(node,
                        ['chrome_browser_tests'],
                        'run_srpc_url_as_nacl_desc_chrome_browser_test',
                        is_broken=env.PPAPIBrowserTesterIsBroken())