Make each NaCl glibc test copy its shared libraries into a unique directory.

native_client_sdk/src/tools/create_nmf.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from __future__ import with_statement
 
 import errno
 import optparse
 import os
@@ skipping 359 matching lines @@
   parser.add_option('-o', '--output', dest='output',
                     help='Write manifest file to FILE (default is stdout)',
                     metavar='FILE')
   parser.add_option('-D', '--objdump', dest='objdump', default='objdump',
                     help='Use TOOL as the "objdump" tool to run',
                     metavar='TOOL')
   parser.add_option('-L', '--library-path', dest='lib_path',
                     action='append', default=[],
                     help='Add DIRECTORY to library search path',
                     metavar='DIRECTORY')
+  parser.add_option('-P', '--path-prefix', dest='path_prefix', default='',
+                    help='A path to prepend to shared libraries in the .nmf',
+                    metavar='DIRECTORY')
   parser.add_option('-s', '--stage-dependencies', dest='stage_dependencies',
                     help='Destination directory for staging libraries',
                     metavar='DIRECTORY')
   parser.add_option('-r', '--remove', dest='remove',
                     help='Remove the prefix from the files.',
                     metavar='PATH')
   parser.add_option('-t', '--toolchain', dest='toolchain',
                     help='Add DIRECTORY to library search path',
                     default=None, metavar='TOOLCHAIN')
   parser.add_option('-n', '--name', dest='name',
@@ skipping 18 matching lines @@
   if options.toolchain not in ['newlib', 'glibc', 'pnacl']:
     raise Error('Unknown toolchain: ' + str(options.toolchain))
 
   remap = {}
   for ren in options.name:
     parts = ren.split(',')
     if len(parts) != 2:
       raise Error('Expecting --name=<orig_arch.so>,<new_name.so>')
     remap[parts[0]] = parts[1]
 
+  if options.path_prefix:
+    path_prefix = options.path_prefix.split('/')
+  else:
+    path_prefix = []
+
   nmf = NmfUtils(objdump=options.objdump,
                  main_files=args,
                  lib_path=options.lib_path,
+                 lib_prefix=path_prefix,
                  toolchain=options.toolchain,
                  remap=remap)
 
   manifest = nmf.GetManifest()
   if options.output is None:
     sys.stdout.write(nmf.GetJson())
   else:
     with open(options.output, 'w') as output:
       output.write(nmf.GetJson())
 
   if options.stage_dependencies:
     Trace("Staging dependencies...")
     nmf.StageDependencies(options.stage_dependencies)
 
   return 0
 
 
 # Invoke this file directly for simple testing.
 if __name__ == '__main__':
   try:
     rtn = Main(sys.argv[1:])
   except Error, e:
     print "%s: %s" % (os.path.basename(__file__), e)
     rtn = 1
   sys.exit(rtn)