Applied changes to chromium tree for new NaCl toolchain directories.

native_client_sdk/src/tools/tests/create_nmf_test.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.
 import json
 import os
 import posixpath
 import shutil
 import subprocess
 import sys
@@ skipping 66 matching lines @@
     self.assertTrue(any(os.path.join('ports', 'lib') in p for p in paths),
                     "naclports libpath missing: %s" % str(paths))
 
 
 class TestNmfUtils(unittest.TestCase):
   """Tests for the main NmfUtils class in create_nmf."""
 
   def setUp(self):
     self.tempdir = None
     toolchain = os.path.join(CHROME_SRC, 'native_client', 'toolchain')
-    self.toolchain = os.path.join(toolchain, '%s_x86' % getos.GetPlatform())
+    self.toolchain = os.path.join(toolchain, '%s_x86' % getos.GetPlatform(),
+                                  'nacl_x86_glibc')
     self.objdump = os.path.join(self.toolchain, 'bin', 'i686-nacl-objdump')
     if os.name == 'nt':
       self.objdump += '.exe'
     self._Mktemp()
 
   def _CreateTestNexe(self, name, arch):
     """Create an empty test .nexe file for use in create_nmf tests.
 
     This is used rather than checking in test binaries since the
     checked in binaries depend on .so files that only exist in the
@@ skipping 495 matching lines @@
             'optlevel': 0,
           }
         }
       }
     }
     self.assertManifestEquals(nmf, expected_manifest)
 
 
 if __name__ == '__main__':
   unittest.main()