Enable browser tests with glibc.

tools/browser_tester/browser_tester.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.
 
 import glob
 import optparse
 import os.path
 import sys
 import thread
@@ skipping 20 matching lines @@
                     default='0', help='The TCP port the server will bind to. '
                     'The default is to pick an unused port number.')
   parser.add_option('--browser_path', dest='browser_path', action='store',
                     type='string', default=None,
                     help='Use the browser located here.')
   parser.add_option('--map_file', dest='map_files', action='append',
                     type='string', nargs=2, default=[],
                     metavar='DEST SRC',
                     help='Add file SRC to be served from the HTTP server, '
                     'to be made visible under the path DEST.')
+  parser.add_option('--serving_dir', dest='serving_dirs', action='append',
+                    type='string', default=[],
+                    metavar='DIRNAME',
+                    help='Add directory DIRNAME to be served from the HTTP '
+                    'server to be made visible under the root.')
   parser.add_option('--test_arg', dest='test_args', action='append',
                     type='string', nargs=2, default=[],
                     metavar='KEY VALUE',
                     help='Parameterize the test with a key/value pair.')
   parser.add_option('--redirect_url', dest='map_redirects', action='append',
                     type='string', nargs=2, default=[],
                     metavar='DEST SRC',
                     help='Add a redirect to the HTTP server, '
                     'requests for SRC will result in a redirect (302) to DEST.')
   parser.add_option('--enable_experimental_js', dest='enable_experimental_js',
@@ skipping 99 matching lines @@
   def ShutdownCallback():
     server.TestingEnded()
     close_browser = options.tool is not None and not options.interactive
     return close_browser
 
   listener = browsertester.rpclistener.RPCListener(ShutdownCallback)
   server.Configure(file_mapping,
                    dict(options.map_redirects),
                    options.allow_404,
                    options.bandwidth,
-                   listener)
+                   listener,
+                   options.serving_dirs)
 
   browser = browsertester.browserlauncher.ChromeLauncher(options)
 
   full_url = 'http://%s:%d/%s' % (host, port, url)
   if len(options.test_args) > 0:
     full_url += '?' + urllib.urlencode(options.test_args)
   browser.Run(full_url, port)
   server.TestingBegun(0.125)
 
   # In Python 2.5, server.handle_request may block indefinitely.  Serving pages
@@ skipping 45 matching lines @@
     return 1
   else:
     return 0
 
 
 def RunFromCommandLine():
   parser = BuildArgParser()
   options, args = parser.parse_args()
 
   if len(args) != 0:
+    print args
     parser.error('Invalid arguments')
 
   # Validate the URL
   url = options.url
   if url is None:
     parser.error('Must specify a URL')
 
   if options.hard_timeout is None:
     options.hard_timeout = options.timeout * 3
 
   return Run(url, options)
 
 
 if __name__ == '__main__':
   sys.exit(RunFromCommandLine())