ChangeLogTag: Thu Apr 27 15:03:08 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com>

7 files changed, 23 insertions, 14 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2d7083bdb4e..c6dc7457f0d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Thu Apr 27 15:03:08 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/ORB_Local_Config/Bunch/Test.cpp:
+        * tests/ORB_Local_Config/Limits/Test.cpp:
+        * tests/ORB_Local_Config/Simple/Test.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp:
+
+          Fixed fuzz issues (unmatched ACE_TRACE)
+
+        * tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp:
+        * tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc:
+
+          Modified to change the DLL name to avoid name conflict with the
+          one in ACE_ROOT/tests.
+
 Thu Apr 27 14:20:02 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * tao/IIOP_Endpoint.cpp:
diff --git a/TAO/tests/ORB_Local_Config/Bunch/Test.cpp b/TAO/tests/ORB_Local_Config/Bunch/Test.cpp
index 1e4b802bf75..ddaae2341c3 100644
--- a/TAO/tests/ORB_Local_Config/Bunch/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Bunch/Test.cpp
@@ -44,7 +44,7 @@ testCompatibility (int , ACE_TCHAR *[])
 
     ACE_DEBUG ((LM_DEBUG, "\tglobal.services_count () -> %d\n",
                 one.services_count ()));
-    ACE_ASSERT (32 == one.services_count ());
+    ACE_ASSERT (33 == one.services_count ());
 
     // Exiting this scope should fini all services ...
   }
diff --git a/TAO/tests/ORB_Local_Config/Limits/Test.cpp b/TAO/tests/ORB_Local_Config/Limits/Test.cpp
index 5f8e5da7d8a..c0b3b4ecc75 100644
--- a/TAO/tests/ORB_Local_Config/Limits/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Limits/Test.cpp
@@ -10,8 +10,6 @@
 int
 run_main (int , ACE_TCHAR *[])
 {
-  ACE_TRACE ("testTooMany");
-
   ACE_Service_Gestalt one(1); // Room for just one ...
   ACE_ASSERT (0 == one.process_directive (ace_svc_desc_TAO_CORBANAME_Parser));
   ACE_ASSERT (-1 == one.process_directive (ace_svc_desc_TAO_CORBALOC_Parser));
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp
index 8e47b64f3a5..2ffbdab6f80 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp
@@ -44,18 +44,18 @@ Service_Config_DLL::init (int argc, ACE_TCHAR *argv[])
 
       ACE_OS::sprintf (this->directive_[0],
 #if (ACE_USES_CLASSIC_SVC_CONF == 1)
-                       ACE_TEXT ("dynamic Test_Object_%s Service_Object * Service_Config_DLL:_make_Service_Config_DLL() \"Test_Object_%s\""),
+                       ACE_TEXT ("dynamic Test_Object_%s Service_Object * Service_Config_Dependent_DLL:_make_Service_Config_DLL() \"Test_Object_%s\""),
 #else
-                       ACE_TEXT ("<?xml version='1.0'?> <dynamic id='Test_Object_%s' type='service_object'> <initializer init='_make_Service_Config_DLL' path='Service_Config_DLL' params='Test_Object_%s'/> </dynamic>"),
+                       ACE_TEXT ("<?xml version='1.0'?> <dynamic id='Test_Object_%s' type='service_object'> <initializer init='_make_Service_Config_DLL' path='Service_Config_Dependent_DLL' params='Test_Object_%s'/> </dynamic>"),
 #endif
                        argv[0],
                        argv[0]);
 
       ACE_OS::sprintf (this->directive_[1],
 #if (ACE_USES_CLASSIC_SVC_CONF == 1)
-                       ACE_TEXT ("dynamic Test_Object_%s Service_Object * Service_Config_DLL:_make_Service_Config_DLL() \"Test_Object_%s\""),
+                       ACE_TEXT ("dynamic Test_Object_%s Service_Object * Service_Config_Dependent_DLL:_make_Service_Config_DLL() \"Test_Object_%s\""),
 #else
-                       ACE_TEXT ("<?xml version='1.0'?> <dynamic id='Test_Object_%s' type='service_object'> <initializer init='_make_Service_Config_DLL' path='Service_Config_DLL' params='Test_Object_%s'/> </dynamic>"),
+                       ACE_TEXT ("<?xml version='1.0'?> <dynamic id='Test_Object_%s' type='service_object'> <initializer init='_make_Service_Config_DLL' path='Service_Config_Dependent_DLL' params='Test_Object_%s'/> </dynamic>"),
 #endif
 
                        argv[1],
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc
index 76c9f08d074..2701ce4e293 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Dependency.mpc
@@ -2,7 +2,7 @@
 // $Id$
 
 project(*) : ../../../tests/acetest, taoserver {
-  after += lib Service_Config_DLL TAO
+  after += lib Service_Config_Dependent_DLL TAO
   exename = Test
   includes += ../lib
   libpaths += ../lib
@@ -12,8 +12,8 @@ project(*) : ../../../tests/acetest, taoserver {
   }
 }
 
-project(Service Config DLL) : acelib {
-  sharedname   = Service_Config_DLL
+project(Service Config Dependent DLL) : acelib {
+  sharedname   = Service_Config_Dependent_DLL
   dynamicflags = SERVICE_CONFIG_DLL_BUILD_DLL
 
   Source_Files {
diff --git a/TAO/tests/ORB_Local_Config/Simple/Test.cpp b/TAO/tests/ORB_Local_Config/Simple/Test.cpp
index f0285549bac..e6ecf217d95 100644
--- a/TAO/tests/ORB_Local_Config/Simple/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Simple/Test.cpp
@@ -13,8 +13,6 @@
 int
 run_main (int , ACE_TCHAR *[])
 {
-  ACE_TRACE ("testSimple");
-
   ACE_Service_Gestalt_Test one; // Use the ACE_Service_Repository::instance ()
 
   one.process_directive (ace_svc_desc_TAO_CORBANAME_Parser);
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp
index d39bea396c5..d61650d07e6 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp
@@ -11,8 +11,6 @@
 int
 run_main (int , ACE_TCHAR *argv[])
 {
-  ACE_TRACE ("testORBBasedService");
-
   ACE_ARGV new_argv;
 
   ACE_DEBUG ((LM_DEBUG, "Looking for conf file %s\n", file_Service_Config_ORB_Test ()));