[NaCl SDK] Fix create_nmf on dynamic bionic nexes

native_client_sdk/src/tools/lib/tests/get_shared_deps_test.py

 #!/usr/bin/env python
 # Copyright 2014 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
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 LIB_DIR = os.path.dirname(SCRIPT_DIR)
 TOOLS_DIR = os.path.dirname(LIB_DIR)
+SDK_DIR = os.path.dirname(TOOLS_DIR)
 DATA_DIR = os.path.join(SCRIPT_DIR, 'data')
+BUILD_TOOLS_DIR = os.path.join(SDK_DIR, 'build_tools')
 
 sys.path.append(LIB_DIR)
 sys.path.append(TOOLS_DIR)
+sys.path.append(BUILD_TOOLS_DIR)

[Sam Clegg, 2014/06/18 18:21:30]

These changes are not needed are they?

[binji, 2014/06/18 18:29:35]

This test script doesn't run from the source directory without this change, only
from test_all.py. I could put it in another CL, but it seems related enough.

 
 import build_paths
 import get_shared_deps
 import getos
 
 TOOLCHAIN_OUT = os.path.join(build_paths.OUT_DIR, 'sdk_tests', 'toolchain')
 NACL_X86_GLIBC_TOOLCHAIN = os.path.join(TOOLCHAIN_OUT,
                                         '%s_x86' % getos.GetPlatform(),
                                         'nacl_x86_glibc')
 
@@ skipping 100 matching lines @@
 
     needed = get_shared_deps.GetNeeded([self.dyn_nexe],
                                        lib_path=lib_path,
                                        objdump=self.objdump)
     for arch in needed.itervalues():
       self.assertEqual(arch, 'x86-32')
 
 
 if __name__ == '__main__':
   unittest.main()