Thu Apr 14 13:39:08 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * bin/ciao_tests.lst:
        * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc:
        * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc:
        * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc:
        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc:
        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc:
        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc:
        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README:
          Disabled these tests for the moment, they are using ndds without
          the cck which causes a lot of warnings on the scoreboard, making
          it impossible to see if there are other issues

9 files changed, 23 insertions, 3 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 4c98a24a362..d8ec25738a1 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,17 @@
+Thu Apr 14 13:39:08 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/ciao_tests.lst:
+        * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc:
+        * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc:
+        * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc:
+        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc:
+        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc:
+        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc:
+        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README:
+          Disabled these tests for the moment, they are using ndds without
+          the cck which causes a lot of warnings on the scoreboard, making
+          it impossible to see if there are other issues
+
 Thu Apr 14 11:56:09 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * MPC/config/dds4ccm.mpb:
diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst
index fa47cf1a68a..cecf4b13b9d 100644
--- a/CIAO/bin/ciao_tests.lst
+++ b/CIAO/bin/ciao_tests.lst
@@ -121,8 +121,8 @@ TAO/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/descriptors/run_test.
 TAO/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 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: !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: !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/tests/QueryCondition/DDS/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc
index 1390b8ab990..9a0c83da240 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc
@@ -1,6 +1,7 @@
 // $Id$
 
 project(Base_stub) : ndds_ts_defaults, nddslib {
+  requires += dummy_label
   sharedname = Base_stub
   dynamicflags += NDDS_USER_DLL_EXPORT
   libout = ../descriptors
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc
index 920505cdd81..222f20202e9 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc
@@ -1,6 +1,7 @@
 // $Id$
 
 project(*qc_receiver) : aceexe, nddslib, ndds_ts_defaults {
+  requires += dummy_label
   exename = DDS_receiver
   after += Base_stub
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc
index 72aa1a8c62a..d1c0b2e65d8 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc
@@ -1,6 +1,7 @@
 // $Id$
 
 project(*qc_sender) : aceexe, nddslib, ndds_ts_defaults {
+  requires += dummy_label
   exename = DDS_Sender
   after += Base_stub
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc
index 624f91e0fc7..552933e2d0e 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/Base/Base_ObO.mpc
@@ -1,6 +1,7 @@
 // $Id$
 
 project(Base_obo_stub) : ndds_ts_defaults, nddslib {
+  requires += dummy_label
   sharedname = Base_obo_stub
   dynamicflags += NDDS_USER_DLL_EXPORT
   libout = ../descriptors
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc
index 856c3d75054..5c9b0a24036 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Receiver/DDS_ObO_Receiver.mpc
@@ -1,6 +1,7 @@
 // $Id$
 
 project(*qc_receiver) : aceexe, nddslib, ndds_ts_defaults {
+  requires += dummy_label
   exename = DDS_ObO_receiver
   after += Base_obo_stub
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc
index da502e4a8be..353bcba5d1c 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/DDS_Sender/DDS_ObO_Sender.mpc
@@ -1,6 +1,7 @@
 // $Id$
 
 project(*qc_sender) : aceexe, nddslib, ndds_ts_defaults {
+  requires += dummy_label
   exename = DDS_ObO_Sender
   after += Base_obo_stub
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README
index b24ff683875..1bd40b0d86e 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README
@@ -21,7 +21,7 @@ read_w_condition with this querycondition.
 What we expect is that the receiver receives two samples (key_1 and key_2) with iteration 5.
 
 Next, the sender writes samples with symbol <KEY_1> and <KEY_2> and iteration <7> through <9>
-The receiver deletes the query condition and creates the next  readcondition:
+The receiver deletes the query condition and creates the next readcondition:
   "DDS_NOT_READ_SAMPLE_STATE,DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE"
 and uses, in a loop, a read_w_condition with this readcondition and number of samples = 1.