work with b2 on posix (claude)

Author: jll63

test/Jamfile

@@ -49,40 +49,42 @@ for local src in [ glob compile_fail_*.cpp ]
 # Dynamic loading test
 # Requires Boost.DLL; builds three shared libraries and a test executable
 # that loads them at runtime.
-lib dl_test_registry
+lib boost_openmethod-dl_test_registry
     : dynamic_loading/registry.cpp
     : <link>shared
       <define>BOOST_DLL_FORCE_ALIAS_INSTANTIATION
       <visibility>global
       <library>/boost/dll//boost_dll
     ;
 
-lib dl_test_method
+lib boost_openmethod-dl_test_method
     : dynamic_loading/method.cpp
     : <link>shared
       <define>BOOST_DLL_FORCE_ALIAS_INSTANTIATION
       <visibility>global
       <library>/boost/dll//boost_dll
-      <library>dl_test_registry
+      <library>boost_openmethod-dl_test_registry
     ;
 
-lib dl_test_overrider
+lib boost_openmethod-dl_test_overrider
     : dynamic_loading/overrider.cpp
     : <link>shared
       <define>BOOST_DLL_FORCE_ALIAS_INSTANTIATION
       <visibility>global
       <library>/boost/dll//boost_dll
-      <library>dl_test_method
+      <library>boost_openmethod-dl_test_method
     ;
 
 run dynamic_loading/main.cpp
     unit_test_framework
     : # args
-    : dl_test_method dl_test_overrider dl_test_registry # input-files (runtime deps)
+    : boost_openmethod-dl_test_method boost_openmethod-dl_test_overrider boost_openmethod-dl_test_registry # input-files (runtime deps)
     : <link>shared
       <visibility>global
       <library>/boost/dll//boost_dll
-      <library>dl_test_registry
+      <library>boost_openmethod-dl_test_registry
+      <toolset>gcc,<target-os>linux:<linkflags>-rdynamic
+      <toolset>clang,<target-os>linux:<linkflags>-rdynamic
     : test_dynamic_loading
     ;
 

test/dynamic_loading/main.cpp

@@ -20,8 +20,6 @@
 using namespace boost::openmethod;
 namespace mp11 = boost::mp11;
 
-constexpr auto n_policies = mp11::mp_size<default_registry::policy_list>::value;
-
 using policy_ids_fn = const void**();
 using method_fn = const void*();
 
@@ -59,21 +57,47 @@ bool same_ids(const void** ids1, const void** ids2) {
 
 BOOST_AUTO_TEST_CASE(test_shared_state) {
     namespace dll = boost::dll;
-    auto lib_dir = dll::program_location().parent_path();
+    namespace fs = boost::filesystem;
+    namespace ut = boost::unit_test;
+
+    // b2 passes input-files as extra argv in alphabetical-path order (not
+    // necessarily the order listed in the Jamfile). CMake puts all outputs in
+    // one directory, found via program_location(), with no extra argv.
+    auto& mts = ut::framework::master_test_suite();
+    fs::path method_path, overrider_path;
+    dll::load_mode::type load_flags;
+
+    // Search argv for paths containing the library names (b2 mode).
+    for (int i = 1; i < mts.argc; ++i) {
+        std::string arg = mts.argv[i];
+        if (arg.find("dl_test_method") != std::string::npos) {
+            method_path = arg;
+        } else if (arg.find("dl_test_overrider") != std::string::npos) {
+            overrider_path = arg;
+        }
+    }
+
+    if (!method_path.empty()) {
+        // b2 mode: full versioned paths passed as argv (e.g. libfoo.so.1.91.0)
+        load_flags = dll::load_mode::default_mode;
+    } else {
+        // CMake mode: libraries are alongside the executable, use decorations
+        auto lib_dir = dll::program_location().parent_path();
+        method_path = lib_dir / "boost_openmethod-dl_test_method";
+        overrider_path = lib_dir / "boost_openmethod-dl_test_overrider";
+        load_flags = dll::load_mode::append_decorations;
+    }
 
     // Load all three shared libraries via Boost.DLL.
     // Use rtld_global for registry and method so their symbols (fn, policy
     // statics) are visible globally and win over any locally-instantiated
     // copies when the overrider library is subsequently loaded.
-    dll::shared_library method_lib(
-        lib_dir / "boost_openmethod-dl_test_method",
-        dll::load_mode::append_decorations);
-    auto& method_get_ids = method_lib.get_alias<policy_ids_fn>("get_ids");
+    dll::shared_library method_lib(method_path, load_flags);
+    auto& method_get_ids = method_lib.get_alias<policy_ids_fn>("method_get_ids");
     auto& method_speak =
-        method_lib.get_alias<const char*(virtual_ptr<Animal>)>("call_speak");
+        method_lib.get_alias<const char*(virtual_ptr<Animal>)>("method_call_speak");
     auto& method_make_dog =
-        method_lib.get_alias<unique_virtual_ptr<Animal>()>("make_dog");
-    auto& method_get_fn = method_lib.get_alias<method_fn>("get_fn");
+        method_lib.get_alias<unique_virtual_ptr<Animal>()>("method_make_dog");
 
     BOOST_TEST(same_ids(get_ids(), method_get_ids()));
 
@@ -88,15 +112,12 @@ BOOST_AUTO_TEST_CASE(test_shared_state) {
     BOOST_TEST(method_speak(main_dog) == "?");
     BOOST_TEST(method_speak(method_dog) == "?");
 
-    dll::shared_library overrider_lib(
-        lib_dir / "boost_openmethod-dl_test_overrider",
-        dll::load_mode::append_decorations);
-    auto& overrider_get_ids = overrider_lib.get_alias<policy_ids_fn>("get_ids");
+    dll::shared_library overrider_lib(overrider_path, load_flags);
+    auto& overrider_get_ids = overrider_lib.get_alias<policy_ids_fn>("overrider_get_ids");
     auto& overrider_speak =
-        overrider_lib.get_alias<const char*(virtual_ptr<Animal>)>("call_speak");
+        overrider_lib.get_alias<const char*(virtual_ptr<Animal>)>("overrider_call_speak");
     auto& overrider_make_dog =
-        overrider_lib.get_alias<unique_virtual_ptr<Animal>()>("make_dog");
-    auto& overrider_get_fn = overrider_lib.get_alias<method_fn>("get_fn");
+        overrider_lib.get_alias<unique_virtual_ptr<Animal>()>("overrider_make_dog");
 
     BOOST_TEST(same_ids(get_ids(), overrider_get_ids()));
 

test/dynamic_loading/method.cpp

@@ -32,7 +32,7 @@ DEFINE_MAKE_DOG()
 DEFINE_GET_FN()
 DEFINE_CALL_SPEAK()
 
-BOOST_DLL_AUTO_ALIAS(get_ids)
-BOOST_DLL_AUTO_ALIAS(get_fn)
-BOOST_DLL_AUTO_ALIAS(make_dog)
-BOOST_DLL_AUTO_ALIAS(call_speak)
+BOOST_DLL_ALIAS(get_ids, method_get_ids)
+BOOST_DLL_ALIAS(get_fn, method_get_fn)
+BOOST_DLL_ALIAS(make_dog, method_make_dog)
+BOOST_DLL_ALIAS(call_speak, method_call_speak)

test/dynamic_loading/overrider.cpp

@@ -22,7 +22,7 @@ DEFINE_MAKE_DOG()
 DEFINE_GET_FN()
 DEFINE_CALL_SPEAK()
 
-BOOST_DLL_AUTO_ALIAS(get_ids)
-BOOST_DLL_AUTO_ALIAS(get_fn)
-BOOST_DLL_AUTO_ALIAS(make_dog)
-BOOST_DLL_AUTO_ALIAS(call_speak)
+BOOST_DLL_ALIAS(get_ids, overrider_get_ids)
+BOOST_DLL_ALIAS(get_fn, overrider_get_fn)
+BOOST_DLL_ALIAS(make_dog, overrider_make_dog)
+BOOST_DLL_ALIAS(call_speak, overrider_call_speak)