diff options
| author | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-11-03 13:26:57 +0000 |
|---|---|---|
| committer | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-11-03 13:26:57 +0000 |
| commit | 078c8ab664313e505ffd336b647e6e80f5c5e97e (patch) | |
| tree | 9f5ab89ce1245f961d1b39ff98eaf3e0380a4153 | |
| parent | 780c7c2c8daedbc23e232693166b252b0810ade1 (diff) | |
| download | ATCD-078c8ab664313e505ffd336b647e6e80f5c5e97e.tar.gz | |
Thu Nov 03 13:25:13 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl>
* tests/Collocation/Sender/Sender_exec.cpp:
* bin/ciao_tests.lst
Only if defined CCM_DIRECTCOLL run test.
| -rw-r--r-- | CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | CIAO/bin/ciao_tests.lst | 2 | ||||
| -rw-r--r-- | CIAO/tests/Collocation/Sender/Sender_exec.cpp | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 9535e5a18b3..10543471a9b 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Nov 03 13:25:13 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + + * tests/Collocation/Sender/Sender_exec.cpp: + * bin/ciao_tests.lst + Only if defined CCM_DIRECTCOLL run test. + Thu Nov 03 08:52:13 UTC 2011 Martin Corino <mcorino@remedy.nl> * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst index 933415ed8a9..c9356d865f0 100644 --- a/CIAO/bin/ciao_tests.lst +++ b/CIAO/bin/ciao_tests.lst @@ -18,7 +18,7 @@ TAO/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl: !STATIC !MINIMUM TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !CCM_NOEVENT TAO/CIAO/examples/Display/descriptors/run_all_in_one.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !CCM_NOEVENT TAO/CIAO/tutorials/Quoter/Simple/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !CCM_NOEVENT -TAO/CIAO/tests/Collocation/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST +TAO/CIAO/tests/Collocation/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST CCM_DIRECTCOLL TAO/CIAO/tests/Bug_3834_Regression/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE TAO/CIAO/tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE TAO/CIAO/tests/IDL3/Events/Any/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !CCM_NOEVENT diff --git a/CIAO/tests/Collocation/Sender/Sender_exec.cpp b/CIAO/tests/Collocation/Sender/Sender_exec.cpp index 168358136f5..a504b452849 100644 --- a/CIAO/tests/Collocation/Sender/Sender_exec.cpp +++ b/CIAO/tests/Collocation/Sender/Sender_exec.cpp @@ -29,7 +29,7 @@ namespace CIAO_Sender_Impl "Strategy desired <%C>, but no collocation " "because CIAO not build with " "ccm_diect_collocation = 1.\n", - start, (void *)&p)); + strat)); #else if ((ACE_OS::strcmp("direct", strat) == 0) || (ACE_OS::strcmp("best", strat) == 0)) |