Fix dlopen_path test on normal VS/Xcode

This restores the directories used before the MinGW support was added.
For some reason, in the CI the VS and Xcode builds do store the output
in directories not suffixed with Release or Debug, but this is not
usually the case.  As a consequence, on a typical build with those build
systems, this test failed.

Signed-off-by: Erik Boasson <[email protected]>

src/ddsrt/tests/CMakeLists.txt

@@ -36,9 +36,32 @@ endif()
 
 if(HAVE_DYNLIB)
   list(APPEND sources dynlib.c)
+  # Create a separate shared library for testing dynamic loading
+  add_library(cunit_ddsrt_dynlib SHARED dl.c)
+  target_include_directories(
+    cunit_ddsrt_dynlib PRIVATE "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
+
+  # Make sure we know where to find the library, even on multi-target generators
+  # which seem to usually append Debug/Release/... to the directory, but not, it
+  # seems, on Azure.
+  set_target_properties(
+    cunit_ddsrt_dynlib
+    PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY                ${CMAKE_CURRENT_BINARY_DIR}
+    RUNTIME_OUTPUT_DIRECTORY_DEBUG          ${CMAKE_CURRENT_BINARY_DIR}
+    RUNTIME_OUTPUT_DIRECTORY_RELEASE        ${CMAKE_CURRENT_BINARY_DIR}
+    RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_CURRENT_BINARY_DIR}
+    RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL     ${CMAKE_CURRENT_BINARY_DIR}
+    LIBRARY_OUTPUT_DIRECTORY                ${CMAKE_CURRENT_BINARY_DIR}
+    LIBRARY_OUTPUT_DIRECTORY_DEBUG          ${CMAKE_CURRENT_BINARY_DIR}
+    LIBRARY_OUTPUT_DIRECTORY_RELEASE        ${CMAKE_CURRENT_BINARY_DIR}
+    LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_CURRENT_BINARY_DIR}
+    LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL     ${CMAKE_CURRENT_BINARY_DIR} )
+  file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" test_lib_dir)
+
+  # Make the location of the test library available to the test program
   set(test_lib_base "cunit_ddsrt_dynlib")
   if(WIN32)
-    file(TO_NATIVE_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" test_lib_dir)
     # MinGW prefixes .dll files with lib by default
     set(test_lib_name "${CMAKE_SHARED_LIBRARY_PREFIX}${test_lib_base}")
     set(test_lib_sep "\\\\")
@@ -47,21 +70,37 @@ if(HAVE_DYNLIB)
       string(REPLACE "/" "\\" test_lib_dir "${test_lib_dir}")
     endif()
   else()
-    file(TO_NATIVE_PATH "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" test_lib_dir)
     set(test_lib_name "${test_lib_base}")
     set(test_lib_sep "/")
   endif()
   set(test_lib_file "${CMAKE_SHARED_LIBRARY_PREFIX}${test_lib_base}${CMAKE_SHARED_LIBRARY_SUFFIX}")
   string(REPLACE "\\" "\\\\" test_lib_dir "${test_lib_dir}")
   configure_file(dl.h.in include/dl.h @ONLY)
-
-  # Create a separate shared library for testing dynamic loading
-  add_library(cunit_ddsrt_dynlib SHARED dl.c)
-  target_include_directories(
-    cunit_ddsrt_dynlib PRIVATE "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
 endif()
 
 add_cunit_executable(cunit_ddsrt ${sources})
+
+# Ensure the directory containing the test library for the dlopen tests is in
+# PATH/LD_LIBRARY_PATH (macOS is fine by virtue of rpath) so that the tests that do not
+# specify the full file name can work.
+#
+# (Needs to be done after `add_cunit_executable`)
+if(HAVE_DYNLIB)
+  unset(test_lib_tests)
+  process_cunit_source_file("dynlib.c" test_lib_header test_lib_suites test_lib_tests)
+  foreach(libtest ${test_lib_tests})
+    string(REPLACE ":" ";" libtest ${libtest})
+    list(GET libtest 0 suite)
+    list(GET libtest 1 test)
+    set(libtestname "CUnit_${suite}_${test}")
+    if("${CMAKE_HOST_SYSTEM}" MATCHES ".*Windows.*")
+      set_property(TEST ${libtestname} APPEND PROPERTY ENVIRONMENT "${test_lib_dir}")
+    else()
+      set_property(TEST ${libtestname} APPEND PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${test_lib_dir};$ENV{LD_LIBRARY_PATH}")
+    endif()
+  endforeach()
+endif()
+
 add_coverage(cunit_ddsrt)
 target_link_libraries(
   cunit_ddsrt PRIVATE ddsrt)