Mon Oct 6 14:04:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

31 files changed, 84 insertions, 51 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 06ff324ce08..0331c42fdaf 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,38 @@
+Mon Oct  6 14:04:45 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
+        * tests/CSD_Strategy_Tests/Broken/ClientApp.h
+        * tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
+        * tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
+        * tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
+        * tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
+        * tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
+        * tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
+        * tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
+        * tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
+        * tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
+        * tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
+        * tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
+        * tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
+        * tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
+        * tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
+        * tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
+        * tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
+        * tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
+        * tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
+        * tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
+        * tests/Bug_2289_Regression/server.cpp
+        * tests/Bug_2503_Regression/client.cpp
+        * tests/Bug_2683_Regression/client.cpp
+        * tests/Bug_2683_Regression/client.cpp
+        * tests/Bug_2936_Regression/PersistentPOA.cpp
+        * tests/CDR/alignment.cpp
+        * tests/Client_Leaks/Process_Factory.cpp
+          ACE_TCHAR fixes
+
+        * tests/Client_Leaks/run_test.pl
+          No need to specify ORB id
+
 Mon Oct  6 08:59:45 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/POA/Loader/Servant_Activator.cpp
diff --git a/TAO/tests/Bug_2289_Regression/server.cpp b/TAO/tests/Bug_2289_Regression/server.cpp
index bbf33626b63..86e7b583e64 100644
--- a/TAO/tests/Bug_2289_Regression/server.cpp
+++ b/TAO/tests/Bug_2289_Regression/server.cpp
@@ -109,7 +109,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
       else
         {
-          adapter->bind ("collocated_ior_bound_in_remote_iortable", client_ior);
+          adapter->bind ("collocated_ior_bound_in_remote_iortable",
+                         ACE_TEXT_ALWAYS_CHAR(client_ior));
         }
 
       orb->run ();
diff --git a/TAO/tests/Bug_2503_Regression/client.cpp b/TAO/tests/Bug_2503_Regression/client.cpp
index bfaaf6c5d92..7d5423d2d45 100644
--- a/TAO/tests/Bug_2503_Regression/client.cpp
+++ b/TAO/tests/Bug_2503_Regression/client.cpp
@@ -65,7 +65,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 
 void test_impl(
     CORBA::ORB_ptr orb,
-    char const * ior,
+    ACE_TCHAR const * ior,
     bool shutdown)
 {
   CORBA::Object_var object = orb->string_to_object(ior);
@@ -99,5 +99,5 @@ void test_colocated_calls(CORBA::ORB_ptr orb)
   CORBA::String_var ior =
     servant.create_and_activate_server();
 
-  test_impl(orb, ior.in(), false);
+  test_impl(orb, ACE_TEXT_CHAR_TO_TCHAR(ior.in()), false);
 }
diff --git a/TAO/tests/Bug_2683_Regression/client.cpp b/TAO/tests/Bug_2683_Regression/client.cpp
index a4904f430f5..4b5e1584200 100644
--- a/TAO/tests/Bug_2683_Regression/client.cpp
+++ b/TAO/tests/Bug_2683_Regression/client.cpp
@@ -69,7 +69,7 @@ public:
 };
 
 int port = 0;
-char const * target_host = "localhost";
+ACE_TCHAR const * target_host = ACE_TEXT("localhost");
 
 int
 parse_args (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp b/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp
index 76b2887c39a..fef044a350d 100644
--- a/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp
+++ b/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp
@@ -9,9 +9,8 @@
 #include "PersistentPOA.h"
 #include "DllORB.h"
 
-const char *POAname_ = 0;
-const char *ORBname_ = 0;
-
+const ACE_TCHAR *POAname_ = 0;
+const ACE_TCHAR *ORBname_ = 0;
 
 PersistentPoa::PersistentPoa ( )
 {
@@ -75,7 +74,7 @@ int PersistentPoa::init (int argc, ACE_TCHAR *argv[])
     policies[2] = mv_rootPOA->create_id_assignment_policy(PortableServer::USER_ID);
 
     mv_thisPOA = mv_rootPOA->create_POA(
-      POAname_,
+      ACE_TEXT_ALWAYS_CHAR(POAname_),
       PortableServer::POAManager::_nil(),
       policies
     );
diff --git a/TAO/tests/Bug_2936_Regression/bug2936.cpp b/TAO/tests/Bug_2936_Regression/bug2936.cpp
index 6660cac066d..dd7c7a4790d 100644
--- a/TAO/tests/Bug_2936_Regression/bug2936.cpp
+++ b/TAO/tests/Bug_2936_Regression/bug2936.cpp
@@ -6,25 +6,24 @@
 
 char const * const scpc_orbId = "testDllOrb";
 
-char const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE(
   "testDllOrb",
   "bug2936",
   "_make_DllORB",
   "testDllOrb -ORBDebugLevel 0 -ORBId testDllOrb -ORBDottedDecimalAddresses 1"
 );
 
-char const * const scpc_unloadOrb = ACE_REMOVE_SERVICE_DIRECTIVE("testDllOrb");
+ACE_TCHAR const * const scpc_unloadOrb = ACE_REMOVE_SERVICE_DIRECTIVE("testDllOrb");
 
 
-char const * const scpc_loadPersistentPoa = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadPersistentPoa = ACE_DYNAMIC_SERVICE_DIRECTIVE(
   "testPersistentPoa",
   "bug2936",
   "_make_PersistentPoa",
   "testPersistentPoa testDllOrb"
 );
 
-char const * const scpc_unloadPersistentPoa = ACE_REMOVE_SERVICE_DIRECTIVE("testPersistentPoa");
-
+ACE_TCHAR const * const scpc_unloadPersistentPoa = ACE_REMOVE_SERVICE_DIRECTIVE("testPersistentPoa");
 
 void loadunloadcycle()
 {
diff --git a/TAO/tests/CDR/alignment.cpp b/TAO/tests/CDR/alignment.cpp
index f3f39a3d93d..4f77c1cf601 100644
--- a/TAO/tests/CDR/alignment.cpp
+++ b/TAO/tests/CDR/alignment.cpp
@@ -76,13 +76,13 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
               ACE_HEX_DUMP ((LM_DEBUG,
                              j->rd_ptr (),
                              j->length (),
-                             "Output CDR stream"));
+                             ACE_TEXT("Output CDR stream")));
             }
           TAO_InputCDR debug (cdr);
           ACE_HEX_DUMP ((LM_DEBUG,
                          debug.rd_ptr (),
                          debug.length (),
-                         "Input CDR stream"));
+                         ACE_TEXT("Input CDR stream")));
         }
     }
 
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
index 211fab13a24..38cc37de3d4 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
@@ -17,7 +17,7 @@ ClientApp::ClientApp()
   num_servants_ (1),
   num_csd_threads_ (1),
   num_orb_threads_ (1),
-  ior_("Not Set"),
+  ior_(ACE_TEXT("Not Set")),
   client_kind_(0),
   client_id_(0)
 {
@@ -247,7 +247,7 @@ ClientApp::usage_statement()
 int
 ClientApp::arg_dependency_checks()
 {
-  if (this->ior_ == "Not Set")
+  if (this->ior_ == ACE_TEXT("Not Set"))
     {
       ACE_ERROR((LM_ERROR,
                  "Error: Missing required command-line option (-i <ior>).\n"));
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
index 4c69d4e6318..f319293d3ed 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
@@ -69,7 +69,7 @@ class ClientApp : public TestAppBase
     unsigned num_csd_threads_;
     unsigned num_orb_threads_;
 
-    ACE_CString         ior_;
+    ACE_TString         ior_;
     unsigned            client_kind_;
     unsigned            client_id_;
 };
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
index 45218cf6d6c..5e37ac5617e 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
@@ -15,7 +15,7 @@
 
 ServerApp::ServerApp()
   : TestAppBase("TP_Test_3_Server"),
-    ior_filename_prefix_("foo"),
+    ior_filename_prefix_(ACE_TEXT("foo")),
     num_servants_(1),
     num_csd_threads_(1),
     num_orb_threads_(1),
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
index 2cddb374de7..f1979e1a13d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
@@ -4,11 +4,11 @@
 void
 AppHelper::ref_to_file(CORBA::ORB_ptr    orb,
                        CORBA::Object_ptr obj,
-                       const char*       filename)
+                       const ACE_TCHAR*  filename)
 {
   CORBA::String_var ior = orb->object_to_string(obj);
 
-  FILE* ior_file = ACE_OS::fopen(filename, (const ACE_TCHAR *)("w"));
+  FILE* ior_file = ACE_OS::fopen(filename, ACE_TEXT("w"));
 
   if (ior_file == 0)
     {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
index b94f5605d23..e3b8a8a84eb 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
@@ -17,7 +17,7 @@ struct RefHelper
   typedef typename T::_var_type T_var;
 
   static T_ptr string_to_ref(CORBA::ORB_ptr orb,
-                             const char* ior)
+                             const ACE_TCHAR* ior)
   {
     CORBA::Object_var obj = orb->string_to_object(ior);
 
@@ -75,7 +75,7 @@ struct CSD_TP_Test_Export AppHelper
 
   static void ref_to_file(CORBA::ORB_ptr    orb,
                           CORBA::Object_ptr obj,
-                          const char*       filename);
+                          const ACE_TCHAR*  filename);
 
   static PortableServer::POA_ptr create_poa
                               (const char*                    name,
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
index 5eeabeb2536..5bd3e2fd165 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
@@ -21,13 +21,13 @@ void
 ServantList<T>::create_and_activate(unsigned                num_servants,
                                     CORBA::ORB_ptr          orb,
                                     PortableServer::POA_ptr poa,
-                                    const char*             ior_fname_prefix)
+                                    const ACE_TCHAR*        ior_fname_prefix)
 {
   for (unsigned i = 0; i < num_servants; i++)
     {
-      char buf[32];
-      ACE_OS::sprintf(buf, "%02d", i + 1);
-      ACE_CString filename = ACE_CString(ior_fname_prefix) + "_" + buf + ".ior";
+      ACE_TCHAR buf[32];
+      ACE_OS::sprintf(buf, ACE_TEXT("%02d"), i + 1);
+      ACE_TString filename = ACE_TString(ior_fname_prefix) + ACE_TEXT("_") + buf + ACE_TEXT(".ior");
       ServantRecord record;
       record.servant_ = new T();
       record.safe_servant_ = record.servant_;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
index 8770b8f3ec9..43e639c9beb 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
@@ -24,7 +24,7 @@ class ServantList
     void create_and_activate(unsigned                num_servants,
                              CORBA::ORB_ptr          orb,
                              PortableServer::POA_ptr poa,
-                             const char*             ior_fname_prefix);
+                             const ACE_TCHAR*        ior_fname_prefix);
 
     /// Activate servant and not output ior to a file.
     void create_and_activate(unsigned                num_servants,
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
index c7a5855713e..413b57bb450 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
@@ -22,7 +22,7 @@ class ClientApp : public TestAppBase
 
     int parse_args(int argc, ACE_TCHAR* argv[]);
 
-    ACE_CString ior_;
+    ACE_TString ior_;
 };
 
 #endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
index 290d1f657da..b5910996e11 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
@@ -23,7 +23,7 @@ class ServerApp : public TestAppBase
 
     int parse_args(int argc, ACE_TCHAR* argv[]);
 
-    ACE_CString ior_filename_;
+    ACE_TString ior_filename_;
     unsigned    num_clients_;
 };
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
index 3dbb4fb8282..4ebb3c385ef 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
@@ -8,7 +8,7 @@
 
 ClientApp::ClientApp()
   : TestAppBase("TP_Test_2_Client"),
-    ior_("Not Set"),
+    ior_(ACE_TEXT("Not Set")),
     client_kind_(0),
     client_id_(0)
 {
@@ -143,7 +143,7 @@ ClientApp::usage_statement()
 int
 ClientApp::arg_dependency_checks()
 {
-  if (this->ior_ == "Not Set")
+  if (this->ior_ == ACE_TEXT("Not Set"))
     {
       ACE_ERROR((LM_ERROR,
                  "Error: Missing required command-line option (-i <ior>).\n"));
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
index aa5b1ff3d9b..3ed51561d1d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
@@ -41,8 +41,8 @@ class ClientApp : public TestAppBase
 
 
     CORBA::ORB_var      orb_;
-    ACE_CString         exe_name_;
-    ACE_CString         ior_;
+    ACE_TString         exe_name_;
+    ACE_TString         ior_;
     unsigned            client_kind_;
     ClientEngine_Handle engine_;
     unsigned            client_id_;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
index f54f0ae03c7..285c20bb698 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
@@ -13,7 +13,7 @@
 
 ServerApp::ServerApp()
   : TestAppBase("TP_Test_2_Server"),
-    ior_filename_prefix_("foo"),
+    ior_filename_prefix_(ACE_TEXT("foo")),
     num_servants_(1),
     num_csd_threads_(1),
     num_orb_threads_(1),
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
index 470d0d9f1a1..6238c5a253c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
@@ -16,7 +16,7 @@ ClientApp::ClientApp()
   num_servants_ (1),
   num_csd_threads_ (1),
   num_orb_threads_ (1),
-  ior_("Not Set"),
+  ior_(ACE_TEXT("Not Set")),
   client_kind_(0),
   client_id_(0)
 {
@@ -245,7 +245,7 @@ ClientApp::usage_statement()
 int
 ClientApp::arg_dependency_checks()
 {
-  if (this->ior_ == "Not Set")
+  if (this->ior_ == ACE_TEXT("Not Set"))
     {
       ACE_ERROR((LM_ERROR,
                  "Error: Missing required command-line option (-i <ior>).\n"));
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
index 19e60e52a28..02d78238a8c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
@@ -69,7 +69,7 @@ class ClientApp : public TestAppBase
     unsigned num_csd_threads_;
     unsigned num_orb_threads_;
 
-    ACE_CString         ior_;
+    ACE_TString         ior_;
     unsigned            client_kind_;
     unsigned            client_id_;
 };
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
index 42a09151ca6..83795c6e49c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
@@ -15,7 +15,7 @@
 
 ServerApp::ServerApp()
   : TestAppBase("TP_Test_3_Server"),
-    ior_filename_prefix_("foo"),
+    ior_filename_prefix_(ACE_TEXT("foo")),
     num_servants_(1),
     num_csd_threads_(1),
     num_orb_threads_(1),
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
index 2feb9f4cfaf..02e5f8d531e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
@@ -8,7 +8,7 @@
 
 ClientApp::ClientApp()
   : TestAppBase("TP_Test_4_Client"),
-    ior_("Not Set"),
+    ior_(ACE_TEXT("Not Set")),
     client_kind_(0),
     client_id_(0)
 {
@@ -146,7 +146,7 @@ ClientApp::usage_statement()
 int
 ClientApp::arg_dependency_checks()
 {
-  if (this->ior_ == "Not Set")
+  if (this->ior_ == ACE_TEXT("Not Set"))
     {
       ACE_ERROR((LM_ERROR,
                  "Error: Missing required command-line option (-i <ior>).\n"));
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
index 46c1390e1c9..a9dad6ccc1b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
@@ -42,8 +42,8 @@ class ClientApp : public TestAppBase
 
 
     CORBA::ORB_var      orb_;
-    ACE_CString         exe_name_;
-    ACE_CString         ior_;
+    ACE_TString         exe_name_;
+    ACE_TString         ior_;
     unsigned            client_kind_;
     ClientEngine_Handle engine_;
     unsigned            client_id_;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
index 75e6882546b..3614fd0350c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
@@ -15,7 +15,7 @@
 
 ServerApp::ServerApp()
   : TestAppBase("TP_Test_4_Server"),
-    ior_filename_prefix_("foo"),
+    ior_filename_prefix_(ACE_TEXT("foo")),
     num_servants_(1),
     num_csd_threads_(1),
     num_orb_threads_(1),
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
index 4c05dcd13eb..e73f297a0c7 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
@@ -11,7 +11,7 @@
 
 ClientApp::ClientApp()
   : TestAppBase("TP_Test_1_Client"),
-    ior_ ("file://test.ior")
+    ior_ (ACE_TEXT("file://test.ior"))
 {
 }
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
index c7a5855713e..413b57bb450 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
@@ -22,7 +22,7 @@ class ClientApp : public TestAppBase
 
     int parse_args(int argc, ACE_TCHAR* argv[]);
 
-    ACE_CString ior_;
+    ACE_TString ior_;
 };
 
 #endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
index 5cc212d0c75..db7bd534377 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
@@ -20,7 +20,7 @@ class ServerApp : public TestAppBase
 
     int parse_args (int argc, ACE_TCHAR *argv[]);
 
-    ACE_CString ior_filename_;
+    ACE_TString ior_filename_;
     unsigned    num_clients_;
 };
 
diff --git a/TAO/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp
index e2bb3e1d94f..367b6871170 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.cpp
+++ b/TAO/tests/Client_Leaks/Process_Factory.cpp
@@ -48,7 +48,7 @@ Process_Factory::create_new_process (void)
 
   const ACE_TCHAR* argv[3] = {
     ACE_TEXT("child"),
-    ior.in (),
+    ACE_TEXT_CHAR_TO_TCHAR(ior.in ()),
     0};
 
   ACE_Process_Options options;
diff --git a/TAO/tests/Client_Leaks/run_test.pl b/TAO/tests/Client_Leaks/run_test.pl
index 56e2335bc07..7d3d7fb0724 100755
--- a/TAO/tests/Client_Leaks/run_test.pl
+++ b/TAO/tests/Client_Leaks/run_test.pl
@@ -15,7 +15,7 @@ $iorfile = $target->LocalFile ("server.ior");
 $target->DeleteFile ($iorfile);
 $status = 0;
 
-$SV = $target->CreateProcess ("server", "-ORBid Client_Leaks_server -o $iorfile");
+$SV = $target->CreateProcess ("server", " -o $iorfile");
 $CL = $target->CreateProcess ("client", " -k file://$iorfile");
 
 $SV->Spawn ();
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
index 7fd86895259..862ade1d4f5 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
@@ -341,8 +341,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       // Wait for task to exit.
-      result =
-        thread_manager.wait ();
+      result = thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
   catch (const CORBA::Exception& ex)