Mon Nov 30 13:00:37 UTC 2009 Marijke Hengstmengel <mhengstmengel@remedy.nl>

        * bin/ciao_tests.lst:
        * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc:
        * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc:
        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc:
          Corrected long project names and add tests to test list.

5 files changed, 33 insertions, 24 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 614960df127..2d44fefe7fa 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Mon Nov 30 13:00:37 UTC 2009  Marijke Hengstmengel <mhengstmengel@remedy.nl>
+
+        * bin/ciao_tests.lst:
+        * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc:
+        * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc:
+        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc:
+          Corrected long project names and add tests to test list.
+
 Mon Nov 30 12:27:37 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp:
diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst
index 26dc21097c5..4505436fb90 100644
--- a/CIAO/bin/ciao_tests.lst
+++ b/CIAO/bin/ciao_tests.lst
@@ -44,4 +44,5 @@ TAO/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: !FIXED_BU
 TAO/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
-TAO/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
+TAO/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
+TAO/CIAO/connectors/dds4ccm/tests/CSLQoS/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/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
index 3096cfeec95..119a667659e 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_DeadlineTest_Base -l .. -o ../lib -u DDS CSL_DeadlineTest_Connector"
 
-project(DDS_CSL_DeadlineTest_Connector_idl_gen) : connectoridldefaults {
+project(DDS_CSL_DT_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CSL_DEADLINETEST_CONNECTOR_STUB_Export \
@@ -19,9 +19,9 @@ project(DDS_CSL_DeadlineTest_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_CSL_DeadlineTest_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_CSL_DT_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
-  after += DDS_CSL_DeadlineTest_Connector_idl_gen
+  after += DDS_CSL_DT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=CSL_DEADLINETEST_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=CSL_DeadlineTest_Connector_lem_stub_export.h \
               -SS -Gxhst \
@@ -32,13 +32,13 @@ project(DDS_CSL_DeadlineTest_Connector_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(DDS_CSL_DeadlineTest_Connector_lem_stub) : ccm_svnt, dds4ccm_base   {
-  after += DDS_CSL_DeadlineTest_Connector_lem_gen DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub DDS4CCM_lem_stub
+project(DDS_CSL_DT_Connector_lem_stub) : ccm_svnt, dds4ccm_base   {
+  after += DDS_CSL_DT_Connector_lem_gen DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub DDS4CCM_lem_stub
   libs  += DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS4CCM_lem_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  sharedname = DDS_CSL_DeadlineTest_Connector_lem_stub
+  sharedname = DDS_CSL_DT_Connector_lem_stub
   dynamicflags   = CSL_DEADLINETEST_CONNECTOR_LEM_STUB_BUILD_DLL
 
   IDL_Files {
@@ -59,7 +59,7 @@ project(DDS_CSL_DeadlineTest_Connector_lem_stub) : ccm_svnt, dds4ccm_base   {
 }
 
 project(DDS_CSL_DeadlineTest_Connector_stub) : ccm_stub, dds4ccm_base   {
-  after += DDS_CSL_DeadlineTest_Connector_idl_gen DDS_CSL_DeadlineTest_Base_stub
+  after += DDS_CSL_DT_Connector_idl_gen DDS_CSL_DeadlineTest_Base_stub
   libs  += DDS_CSL_DeadlineTest_Base_stub
   libpaths += ../lib
   libout = ../lib
@@ -85,9 +85,9 @@ project(DDS_CSL_DeadlineTest_Connector_stub) : ccm_stub, dds4ccm_base   {
 }
 
 project(DDS_CSL_DeadlineTest_Connector_exec) : ciao_executor, dds4ccm_skel, nddslib {
-  after   += DDS_CSL_DeadlineTest_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl DDS_CSL_DeadlineTest_Base_NDDS_TS
+  after   += DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl DDS_CSL_DeadlineTest_Base_NDDS_TS
   sharedname = DDS_CSL_DeadlineTest_Connector_exec
-  libs += DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_lem_stub DDS_CSL_DeadlineTest_Base_stub CIAO_DDS4CCM_NDDS_Impl DDS4CCM_lem_stub DDS_CSL_DeadlineTest_Base_NDDS_TS
+  libs += DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Base_stub CIAO_DDS4CCM_NDDS_Impl DDS4CCM_lem_stub DDS_CSL_DeadlineTest_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -111,10 +111,10 @@ project(DDS_CSL_DeadlineTest_Connector_exec) : ciao_executor, dds4ccm_skel, ndds
 
 
 project(DDS_CSL_DeadlineTest_Connector_svnt) : ciao_servant, dds4ccm_skel, nddslib {
-  after      += DDS_CSL_DeadlineTest_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_exec DDS_CSL_DeadlineTest_Connector_stub DDS4CCM_lem_stub
+  after      += DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_exec DDS_CSL_DeadlineTest_Connector_stub DDS4CCM_lem_stub
   sharedname  = DDS_CSL_DeadlineTest_Connector_svnt
   libs       += DDS_CSL_DeadlineTest_Connector_stub \
-                DDS_CSL_DeadlineTest_Connector_lem_stub  \
+                DDS_CSL_DT_Connector_lem_stub  \
                 DDS_CSL_DeadlineTest_Base_stub \
                 DDS_CSL_DeadlineTest_Connector_exec \
                 DDS4CCM_lem_stub
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
index bc82978028f..f3224a4998a 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
@@ -2,7 +2,7 @@
 
 project(DDS_CSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
-  after += DDS_CSL_DeadlineTest_Connector_idl_gen
+  after += DDS_CSL_DT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
               -Wb,stub_export_include=Receiver_stub_export.h \
               -Wb,skel_export_macro=RECEIVER_SVNT_Export \
@@ -29,7 +29,7 @@ project(DDS_CSL_DeadlineTest_Receiver_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(DDS_CSL_DeadlineTest_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+project(DDS_CSL_DT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
   after += DDS_CSL_DeadlineTest_Receiver_lem_gen DDS_CSL_DeadlineTest_Receiver_stub  DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub
   libs  +=  Receiver_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub
   libpaths += ../lib
@@ -56,7 +56,7 @@ project(DDS_CSL_DeadlineTest_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
 }
 
 project(DDS_CSL_DeadlineTest_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_CSL_DeadlineTest_Receiver_idl_gen  DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_lem_gen
+  after += DDS_CSL_DeadlineTest_Receiver_idl_gen  DDS_CSL_DT_Connector_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DT_Connector_lem_gen
   libs  += DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Base_stub
   libpaths += ../lib
   libout = ../lib
@@ -82,9 +82,9 @@ project(DDS_CSL_DeadlineTest_Receiver_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_CSL_DeadlineTest_Receiver_exec) : ciao_executor, dds4ccm_base {
-  after   += DDS_CSL_DeadlineTest_Receiver_lem_stub DDS_CSL_DeadlineTest_Receiver_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_lem_stub DDS4CCM_lem_stub
+  after   += DDS_CSL_DT_Receiver_lem_stub DDS_CSL_DeadlineTest_Receiver_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub DDS4CCM_lem_stub
   sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_lem_stub DDS4CCM_lem_stub
+  libs += Receiver_stub Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub DDS4CCM_lem_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -108,9 +108,9 @@ project(DDS_CSL_DeadlineTest_Receiver_exec) : ciao_executor, dds4ccm_base {
 
 
 project(DDS_CSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
-  after      +=   DDS_CSL_DeadlineTest_Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DeadlineTest_Receiver_exec DDS_CSL_DeadlineTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
+  after      +=   DDS_CSL_DT_Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DeadlineTest_Receiver_exec DDS_CSL_DT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt Receiver_exec DDS_CSL_DeadlineTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
+  libs       += Receiver_stub Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt Receiver_exec DDS_CSL_DT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
index 06157d206ca..21da27dcb5b 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
@@ -2,7 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_DeadlineTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
 project(DDS_CSL_DeadlineTest_Sender_idl_gen) : componentidldefaults   {
-  after += DDS_CSL_DeadlineTest_Connector_idl_gen 
+  after += DDS_CSL_DT_Connector_idl_gen 
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
               -Wb,stub_export_include=Sender_stub_export.h \
@@ -84,9 +84,9 @@ project(DDS_CSL_DeadlineTest_Sender_stub) : ccm_stub, dds4ccm_base   {
 }
 
 project(DDS_CSL_DeadlineTest_Sender_exec) : ciao_executor, dds4ccm_base   {
-  after   += DDS_CSL_DeadlineTest_Sender_lem_stub DDS_CSL_DeadlineTest_Sender_stub DDS_CSL_DeadlineTest_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub  DDS4CCM_lem_stub
+  after   += DDS_CSL_DeadlineTest_Sender_lem_stub DDS_CSL_DeadlineTest_Sender_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub  DDS4CCM_lem_stub
   sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_lem_stub  DDS_CSL_DeadlineTest_Connector_stub  DDS4CCM_lem_stub
+  libs += Sender_stub Sender_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DT_Connector_lem_stub  DDS_CSL_DeadlineTest_Connector_stub  DDS4CCM_lem_stub
   libpaths += ../lib
   includes += ..
   libout = ../lib
@@ -110,10 +110,10 @@ project(DDS_CSL_DeadlineTest_Sender_exec) : ciao_executor, dds4ccm_base   {
 
 
 project(DDS_CSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
-  after      += DDS_CSL_DeadlineTest_Base_stub  DDS_CSL_DeadlineTest_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DeadlineTest_Connector_lem_stub 
+  after      += DDS_CSL_DeadlineTest_Base_stub  DDS_CSL_DeadlineTest_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DT_Connector_lem_stub 
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
-                DDS_CSL_DeadlineTest_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_DeadlineTest_Connector_stub  DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DeadlineTest_Connector_lem_stub 
+                DDS_CSL_DeadlineTest_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_DeadlineTest_Connector_stub  DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DT_Connector_lem_stub 
   libpaths += ../lib
   libout = ../lib
   includes += ..