diff options
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/functionalities/load_unload')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile | 1 | ||||
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py | 12 |
2 files changed, 4 insertions, 9 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile index 31572f2b82a..779745c4d26 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile @@ -12,7 +12,6 @@ a.out: lib_a lib_b lib_c lib_d hidden_lib_d lib_%: $(MAKE) -f $*.mk - if [ "$(OS)" = "Darwin" -a -f libloadunload_d.dylib ]; then install_name_tool -id @executable_path/libloadunload_d.dylib libloadunload_d.dylib; fi hidden_lib_d: $(MAKE) -C hidden diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py index 8e548e11658..027968a727f 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py @@ -56,14 +56,10 @@ class LoadUnloadTestCase(TestBase): Does nothing in case of non-remote platforms. """ if lldb.remote_platform: - ext = 'so' - if self.platformIsDarwin(): - ext = 'dylib' - - shlibs = ['libloadunload_a.' + ext, 'libloadunload_b.' + ext, - 'libloadunload_c.' + ext, 'libloadunload_d.' + ext] - wd = lldb.remote_platform.GetWorkingDirectory() cwd = os.getcwd() + shlibs = ['libloadunload_a.so', 'libloadunload_b.so', + 'libloadunload_c.so', 'libloadunload_d.so'] + wd = lldb.remote_platform.GetWorkingDirectory() for f in shlibs: err = lldb.remote_platform.Put( lldb.SBFileSpec(os.path.join(cwd, f)), @@ -73,7 +69,7 @@ class LoadUnloadTestCase(TestBase): "Unable copy '%s' to '%s'.\n>>> %s" % (f, wd, err.GetCString())) if hidden_dir: - shlib = 'libloadunload_d.' + ext + shlib = 'libloadunload_d.so' hidden_dir = os.path.join(wd, 'hidden') hidden_file = os.path.join(hidden_dir, shlib) err = lldb.remote_platform.MakeDirectory(hidden_dir) |
