diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-02-28 18:31:33 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-02-28 18:31:33 +0000 |
| commit | 14d16bebda48d00d1eeb1195891f09185d477cc8 (patch) | |
| tree | 2e7ff4f0731805c38ea387742849cf25e9ea432d | |
| parent | 8a0a5378c5d6dc48a87b398356511435b8f9a7c0 (diff) | |
| download | ATCD-14d16bebda48d00d1eeb1195891f09185d477cc8.tar.gz | |
Thu Feb 28 18:28:39 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/bin/tao_orb_tests.lst | 2 | ||||
| -rw-r--r-- | TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp | 5 |
3 files changed, 17 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d48735bf7d1..3cefee43bdc 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Thu Feb 28 18:28:39 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * bin/tao_orb_tests.lst: + + The dynamic loader test requires shared libraries, so disable it for + static linked builds. + + * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp: + + The static linked build was not properly initalizing the POA factory. + Thu Feb 28 17:43:15 UTC 2013 Kevin Stanley <stanleyk@ociweb.com> * MPC/config/ftclientorb.mpb: diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst index f14d964a29a..0d71406f07d 100644 --- a/TAO/bin/tao_orb_tests.lst +++ b/TAO/bin/tao_orb_tests.lst @@ -456,7 +456,7 @@ TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl: !STATIC !ST !CORBA_E_M TAO/tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl: !ST !CORBA_E_MICRO !LynxOS TAO/tests/CSD_Collocation/run_test.pl: !ST !CORBA_E_COMPACT !CORBA_E_MICRO !MINIMUM !LynxOS TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/run_test.pl: !ST !CORBA_E_MICRO !CORBA_E_COMPACT !LynxOS -TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl: !ST !CORBA_E_MICRO !CORBA_E_COMPACT !LynxOS +TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/run_test.pl: !ST !STATIC !CORBA_E_MICRO !CORBA_E_COMPACT !LynxOS TAO/tests/Dynamic_TP/ORB_ThreadPool/run_test.pl: !ST !CORBA_E_MICRO !CORBA_E_COMPACT !LynxOS TAO/tests/Permanent_Forward/run_test.pl: TAO/tests/Parallel_Connect_Strategy/run_test.pl: !QUICK55 diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp index 88b2a0969d5..c33802363ef 100644 --- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp @@ -2,6 +2,11 @@ #include "Hello.h" #include "tao/Dynamic_TP/DTP_POA_Strategy.h" +#include "tao/Dynamic_TP/DTP_POA_Loader.h" +#include "tao/CSD_Framework/CSD_Framework_Loader.h" +#include "tao/CSD_Framework/CSD_ORBInitializer.h" +#include "tao/CSD_Threadpool/CSD_Threadpool.h" + #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" #include "ace/Thread_Manager.h" |