Wed Aug 15 12:15:16 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com>

11 files changed, 61 insertions, 31 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 0e4c62166b9..9c526a7dc6f 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,18 @@
+Wed Aug 15 12:15:16 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * protocols/tests/HTBP/Reactor_Tests/client.cpp:
+        * protocols/tests/HTBP/Reactor_Tests/server.cpp:
+        * protocols/tests/HTBP/Send_Large_Msg/client.cpp:
+        * protocols/tests/HTBP/Send_Large_Msg/server.cpp:
+        * protocols/tests/HTBP/Send_Recv_Tests/Makefile.am:
+        * protocols/tests/HTBP/Send_Recv_Tests/client.cpp:
+        * protocols/tests/HTBP/Send_Recv_Tests/server.cpp:
+        * protocols/tests/HTBP/ping/client.cpp:
+        * protocols/tests/HTBP/ping/server.cpp:
+        * protocols/tests/HTBP/htbptest.mpb:
+
+          Fix up tests to build correctly on wchar platforms and automake. 
+
 Wed Aug 15 11:47:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Manual_Event_Test.cpp:
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp b/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp
index 1f5cd6feda6..bd3dade90b1 100644
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp
+++ b/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp
@@ -18,9 +18,9 @@ const ACE_TCHAR * config_file = 0;
 unsigned remote_port = 8088;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "p:h:c:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("p:h:c:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp b/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp
index fad3e03b36d..9037d05ed10 100644
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp
+++ b/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp
@@ -19,9 +19,9 @@
 unsigned port = 8088;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "p:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("p:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp b/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp
index cf97a18eb78..8dd00c84446 100644
--- a/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp
+++ b/ACE/protocols/tests/HTBP/Send_Large_Msg/client.cpp
@@ -17,9 +17,9 @@ const ACE_TCHAR * config_file = 0;
 unsigned remote_port = 8088;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "p:h:c:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("p:h:c:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp b/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp
index bd3d844c058..e9b96ab1659 100644
--- a/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp
+++ b/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp
@@ -18,9 +18,9 @@ const size_t Total_Size = Send_Size * Loops;
 unsigned port = 8088;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "p:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("p:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am b/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am
index c9628903cf1..17c1b324f0a 100644
--- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am
+++ b/ACE/protocols/tests/HTBP/Send_Recv_Tests/Makefile.am
@@ -11,27 +11,49 @@
 ACE_BUILDDIR = $(top_builddir)
 ACE_ROOT = $(top_srcdir)
 
+## Makefile.SendRecv_Test_Client.am
 
-## Makefile.SendRecv_Test.am
-
+if BUILD_ACE_UUID
 if !BUILD_ACE_FOR_TAO
 
-noinst_PROGRAMS = SendRecv_Test
+noinst_PROGRAMS += client
 
-SendRecv_Test_CPPFLAGS = \
+client_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(ACE_ROOT)/protocols
 
-SendRecv_Test_SOURCES = \
-  SendRecv_Test.cpp
+client_SOURCES = \
+  client.cpp
+
+client_LDADD = \
+  $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_ACE_FOR_TAO
+endif BUILD_ACE_UUID
+
+## Makefile.SendRecv_Test_Server.am
+
+if BUILD_ACE_UUID
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += server
+
+server_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(ACE_ROOT)/protocols 
+
+server_SOURCES = \
+  server.cpp
 
-SendRecv_Test_LDADD = \
-  $(top_builddir)/tests/libTest_Output.la \
+server_LDADD = \
   $(ACE_BUILDDIR)/protocols/ace/HTBP/libACE_HTBP.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
+endif BUILD_ACE_UUID
 
 ## Clean up template repositories, etc.
 clean-local:
diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp b/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp
index e8a7756f9be..dd5db726790 100644
--- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp
+++ b/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp
@@ -48,9 +48,9 @@ const ACE_TCHAR * config_file = 0;
 unsigned remote_port = 8088;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "p:h:c:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("p:h:c:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp b/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp
index afe6acaa5bf..6a852adfc9e 100644
--- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp
+++ b/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp
@@ -52,9 +52,9 @@ const size_t Test3_Total_Size = Test3_Send_Size * Test3_Loops;
 unsigned port = 8088;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "p:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("p:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/ACE/protocols/tests/HTBP/htbptest.mpb b/ACE/protocols/tests/HTBP/htbptest.mpb
deleted file mode 100644
index ca87bbf8542..00000000000
--- a/ACE/protocols/tests/HTBP/htbptest.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-//
-// $Id$
-project : aceexe, htbp {
-  after += Test_Output
-  libs += Test_Output
-}
diff --git a/ACE/protocols/tests/HTBP/ping/client.cpp b/ACE/protocols/tests/HTBP/ping/client.cpp
index 7e74c290ba1..80e96af9f8c 100644
--- a/ACE/protocols/tests/HTBP/ping/client.cpp
+++ b/ACE/protocols/tests/HTBP/ping/client.cpp
@@ -19,9 +19,9 @@ const ACE_TCHAR * config_file = 0;
 unsigned remote_port = 8088;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "p:h:c:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("p:h:c:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/ACE/protocols/tests/HTBP/ping/server.cpp b/ACE/protocols/tests/HTBP/ping/server.cpp
index 81405f8d1f3..12d4424285b 100644
--- a/ACE/protocols/tests/HTBP/ping/server.cpp
+++ b/ACE/protocols/tests/HTBP/ping/server.cpp
@@ -17,9 +17,9 @@
 unsigned port = 8088;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "p:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("p:"));
   int c;
 
   while ((c = get_opts ()) != -1)