From 3332105c712cc8a9ee536b01fd90fdf1f7d9ad85 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 14 Apr 2011 09:30:48 +0000 Subject: Thu Apr 14 09:29:54 UTC 2011 Johnny Willemsen * MPC/config/dds4ccm_impl.mpb: * connectors/dds4ccm/impl/dds4ccm_impl.mpc: Added needed base projects * bin/ciao_tests.lst: All tests should now run --- CIAO/ChangeLog | 11 +++++++++-- CIAO/MPC/config/dds4ccm_impl.mpb | 2 +- CIAO/bin/ciao_tests.lst | 2 +- CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index df644652156..b8c6a6e86d8 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,7 +1,15 @@ +Thu Apr 14 09:29:54 UTC 2011 Johnny Willemsen + + * MPC/config/dds4ccm_impl.mpb: + * connectors/dds4ccm/impl/dds4ccm_impl.mpc: + Added needed base projects + + * bin/ciao_tests.lst: + All tests should now run + Wed Apr 13 19:13:43 UTC 2011 William R. Otte * ciao/Containers/Session/Session_Container.cpp: - Additional error reporting. Wed Apr 13 19:12:44 UTC 2011 William R. Otte @@ -14,7 +22,6 @@ Wed Apr 13 19:12:44 UTC 2011 William R. Otte * tests/DAnCE/Launch-Failures/descriptors/EntrypointIncorrect.cdp: * tests/DAnCE/Launch-Failures/descriptors/IncorrectLibraryName.cdp: * tests/DAnCE/Launch-Failures/descriptors/InvalidInstanceType.cdp: - Additional failure testing. Wed Apr 13 07:48:22 UTC 2011 Johnny Willemsen diff --git a/CIAO/MPC/config/dds4ccm_impl.mpb b/CIAO/MPC/config/dds4ccm_impl.mpb index e33a8fcec20..f9c1523a5d2 100644 --- a/CIAO/MPC/config/dds4ccm_impl.mpb +++ b/CIAO/MPC/config/dds4ccm_impl.mpb @@ -11,7 +11,7 @@ feature(dds4ccm_splice) : dds4ccm_skel, dds4ccm_lem_stub, dds4ccm_logger { libs += CIAO_DDS4CCM_DDS_Impl } -feature(dds4ccm_ndds) : dds4ccm_skel, dds4ccm_lem_stub, ndds_idltocpp_impl { +feature(dds4ccm_ndds) : dds4ccm_skel, dds4ccm_lem_stub, ndds_idltocpp_impl, ndds_idltocpp_lem_stub { after += CIAO_DDS4CCM_DDS_Impl libs += CIAO_DDS4CCM_DDS_Impl } diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst index fc309b994b8..fa47cf1a68a 100644 --- a/CIAO/bin/ciao_tests.lst +++ b/CIAO/bin/ciao_tests.lst @@ -122,7 +122,7 @@ TAO/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_te TAO/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS -TAO/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/run_test.pl: !FIXED_BUGS_ONLY !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS +TAO/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc index 29e399e89f9..9eeda2cf038 100644 --- a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc +++ b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc @@ -1,7 +1,7 @@ // $Id$ project(CIAO_DDS4CCM_DDS_Impl) : install, dds4ccm_skel, dds4ccm_lem_stub, taolib, \ - ciao_output, ccm_stub, dds4ccm_logger, ndds_idltocpp_impl { + ciao_output, ccm_stub, dds4ccm_logger, ndds_idltocpp_impl, ndds_idltocpp_lem_stub { dynamicflags += DDS4CCM_DDS_IMPL_BUILD_DLL macros += BUILDING_DDS_LIB -- cgit v1.2.1