[NaCl SDK] Fix create_nmf handling of missing libraries.

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 os
 import shutil
 import subprocess
 import sys
 import tempfile
 import unittest
@@ skipping 127 matching lines @@
     self.assertEqual(p.returncode, 0)
     return name
 
   def tearDown(self):
     if self.tempdir:
       shutil.rmtree(self.tempdir)
 
   def Mktemp(self):
     self.tempdir = tempfile.mkdtemp()
 
-  def CreateNmfUtils(self):
-    libdir = os.path.join(self.toolchain, 'x86_64-nacl', 'lib32')
+  def CreateNmfUtils(self, libdir=None):
+    if not libdir:
+      libdir = os.path.join(self.toolchain, 'x86_64-nacl', 'lib32')
     return create_nmf.NmfUtils([self.dyn_nexe],
                                lib_path=[libdir],
                                objdump=self.objdump)
 
   def testGetNeededStatic(self):
     nexe = os.path.join(DATA_DIR, 'test_static_x86_32.nexe')
     nmf = create_nmf.NmfUtils([nexe])
     needed = nmf.GetNeeded()
 
     # static nexe should have exactly one needed file
@@ skipping 27 matching lines @@
     # this nexe has 5 dependencies
     expected = set(self.dyn_deps)
     expected.add(os.path.basename(self.dyn_nexe))
 
     basenames = set(self.StripDependencies(names))
     self.assertEqual(expected, basenames)
 
   def testStageDependencies(self):
     self.Mktemp()
     nmf = self.CreateNmfUtils()
+    #create_nmf.DebugPrint.debug_mode = True
+    #create_nmf.Trace.verbose = True
 
     # Stage dependencies
     nmf.StageDependencies(self.tempdir)
 
     # Verify directory contents
     contents = set(os.listdir(self.tempdir))
     expectedContents = set((os.path.basename(self.dyn_nexe), 'lib32'))
     self.assertEqual(contents, expectedContents)
 
     contents = os.listdir(os.path.join(self.tempdir, 'lib32'))
     contents = self.StripDependencies(contents)
     contents = set(contents)
     expectedContents = self.dyn_deps
     self.assertEqual(contents, expectedContents)
 
+  def testMissingArchLibrary(self):
+    self.Mktemp()
+    nmf = self.CreateNmfUtils()
+    # CreateNmfUtils uses the 32-bit library path, but not the 64-bit one
+    # so searching for a 32-bit library should succeed while searching for
+    # a 64-bit one should fail.
+    nmf.GleanFromObjdump(['libgcc_s.so.1'], 'x86-32')
+    self.assertRaises(create_nmf.Error,
+                      nmf.GleanFromObjdump, ['libgcc_s.so.1'], 'x86-64')
+
 
 if __name__ == '__main__':
   unittest.main()