Skip to content

Commit

Permalink
[Unittests] Change linker flags of dynamic library tests
Browse files Browse the repository at this point in the history
A recent change https://reviews.llvm.org/D46898 which had no intended
behavior change, actually modified the linker flags used when linking
the dynamic libraries used by the DynamicLibraryTests unit test. This
made the test fail in our testing environment which runs the tests
from an NFS share. Prior to D46898 the two libraries used by the test
were different (because the library name used to be embedded into the
binary), and after the change they became bit-to-bit identical. This
causes dlopen to return the same handle when these two libraries are
loaded from an NFS share, and the test expects two different handles.

This patch reverts the part of D46898 that is responsible for
changing the linker flags.

Differential Revision: https://reviews.llvm.org/D47469

llvm-svn: 334394
  • Loading branch information
miyuki committed Jun 11, 2018
1 parent 3351381 commit fa5a728
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion llvm/unittests/Support/DynamicLibrary/CMakeLists.txt
Expand Up @@ -15,7 +15,7 @@ target_link_libraries(DynamicLibraryTests PRIVATE DynamicLibraryLib)
export_executable_symbols(DynamicLibraryTests)

function(dynlib_add_module NAME)
add_library(${NAME} MODULE
add_library(${NAME} SHARED
PipSqueak.cpp
)
set_target_properties(${NAME} PROPERTIES FOLDER "Tests")
Expand All @@ -33,5 +33,12 @@ function(dynlib_add_module NAME)
add_dependencies(DynamicLibraryTests ${NAME})
endfunction(dynlib_add_module)

# Revert -Wl,-z,nodelete on this test since it relies on the file
# being unloaded.
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
string(REPLACE "-Wl,-z,nodelete" "" CMAKE_SHARED_LINKER_FLAGS
${CMAKE_SHARED_LINKER_FLAGS})
endif()

dynlib_add_module(PipSqueak)
dynlib_add_module(SecondLib)

0 comments on commit fa5a728

Please sign in to comment.