diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-11-23 08:11:07 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-11-23 08:11:07 +0000 |
| commit | 7c87e40bf2dbe8198b92b33668fba06eef33ac33 (patch) | |
| tree | fd638fa29249bd11ee43a49f2e0ac2cab4cf08f9 /TAO/tests/ORB_Local_Config | |
| parent | 94c3009f7f5bab9527e574835f0948b5b03f5dcf (diff) | |
| download | ATCD-7c87e40bf2dbe8198b92b33668fba06eef33ac33.tar.gz | |
Fri Nov 23 08:08:57 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp:
* orbsvcs/tests/Bug_3486_Regression/server.cpp:
* orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp:
* orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp:
* orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp:
* orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp:
* orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp:
* orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp:
* orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp:
* tao/CSD_Framework/CSD_ORBInitializer.cpp:
* tao/Codeset/Codeset_Manager_i.cpp:
* tao/ORBInitializer_Registry.cpp:
* tao/ORB_Core.cpp:
* tao/PI/ORBInitInfo.cpp:
* tao/PortableServer/LifespanStrategyPersistent.cpp:
* tao/RTCORBA/RT_ORBInitializer.cpp:
* tao/TAO_Internal.cpp:
* tao/params.cpp:
* tests/Bug_2677_Regression/server.cpp:
* tests/Bug_2936_Regression/bug2936.cpp:
* tests/Bug_3542_Regression/server.cpp:
* tests/DLL_ORB/client.cpp:
* tests/DLL_ORB/server.cpp:
* tests/ORB_Local_Config/Bug_2612/Test.cpp:
* tests/ORB_Local_Config/Service_Dependency/Test.cpp:
* tests/TransportCurrent/Framework/simple.cpp:
Use ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE with the
TAO_VERSION
so that with Debian/Ubuntu packaged distro's we try to load
the correct library which for example are named
libTAO-6.1.1.so
Diffstat (limited to 'TAO/tests/ORB_Local_Config')
| -rw-r--r-- | TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp | 3 | ||||
| -rw-r--r-- | TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp index 33fcae3e2a7..2787fec934f 100644 --- a/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp +++ b/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp @@ -12,8 +12,9 @@ ACE_TCHAR const * const scpc_loadOrb = // NOTE due to the way ACE_DYNAMIC_SERVICE_DIRECTIVE() macro is defined, // each parameter CANNOT be split into multiple quoted strings "line1" "nextline" with the expectation that // they will be join together. Hence the long parameter 4. - ACE_DYNAMIC_SERVICE_DIRECTIVE ("testDllOrb", + ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE ("testDllOrb", "DllOrb", + TAO_VERSION, "_make_DllOrb", "DllOrb -t 1 -ORBGestalt Local -ORBDebugLevel 3 -ORBId testORB -ORBInitRef NameService=file:///tmp/test-ns.ior -ORBDottedDecimalAddresses 1" ); diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp index b8e310f35f2..338701e06fa 100644 --- a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp +++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp @@ -152,8 +152,9 @@ testORBInitializer_Registry (int , ACE_TCHAR *[]) if (oir == 0) { one->process_directive ( - ACE_DYNAMIC_SERVICE_DIRECTIVE("ORBInitializer_Registry", + ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("ORBInitializer_Registry", "TAO_PI", + TAO_VERSION, "_make_ORBInitializer_Registry", "")); oir = @@ -251,8 +252,9 @@ testORBInitializer_Registry (int , ACE_TCHAR *[]) " (although ORBInitializer_Registry already did it) ...\n")); one->process_directive - (ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader", + (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("PolicyFactory_Loader", "TAO_PI", + TAO_VERSION, "_make_TAO_PolicyFactory_Loader", "")); @@ -291,8 +293,9 @@ testServiceDependency (int , ACE_TCHAR *[]) ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt_Test> one (new ACE_Service_Gestalt_Test (10)); int result = one->process_directive - (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Codeset", + (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("TAO_Codeset", "TAO_Codeset", + TAO_VERSION, "_make_TAO_Codeset_Manager_Factory", "")); if (result != 0) |