Thu Mar 28 15:25:46 UTC 2013 Byron Harris <harrisb@ociweb.com>

6 files changed, 31 insertions, 8 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 265c1a762e1..ef5a193daf2 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,24 @@
+Thu Mar 28 15:25:46 UTC 2013  Byron Harris  <harrisb@ociweb.com>
+
+        * bin/tao_other_tests.lst:
+
+          Added servers_interact_on_startup test but disabled from
+          test statistics for now as it exposes a problem with the
+          ImR currently being addressed.
+
+        * orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp:
+
+          Fixed missing protocol seen on certain compilers.
+
+        * orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp:
+        * orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp:
+
+          Fixed to build with wide characters enabled.
+
+        * orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl:
+
+          Made server reply delay long enough to reveal problem under Linux.
+
 Wed Mar 27 13:11:36 UTC 2013  Byron Harris  <harrisb@ociweb.com>
 
         * orbsvcs/tests/ImplRepo/servers_interact_on_startup:
diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst
index 4926eb0cfce..8b858de93bf 100644
--- a/TAO/bin/tao_other_tests.lst
+++ b/TAO/bin/tao_other_tests.lst
@@ -136,6 +136,7 @@ TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl: !MINIMUM !CORBA_E_COMPAC
 TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -forwardalways: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
 TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -forwardonce: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
 TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS
+TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS !FIXED_BUGS_ONLY
 TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ST !ACE_FOR_TAO !LynxOS
 TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO !WCHAR
 TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !NO_MESSAGING !ACE_FOR_TAO !LynxOS
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp
index b911ccfaca5..b623f0e3c55 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.cpp
@@ -1,6 +1,7 @@
 /* -*- C++ -*- $Id$ */
 
 #include "Test_i.h"
+#include "ace/OS_NS_unistd.h"
 
 Test_i::Test_i (CORBA::Short server_num,
                 CORBA::Short reply_delay_secs)
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
index 1bdafe6b282..75a025f8551 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
@@ -6,7 +6,7 @@
 #include "ace/OS_NS_unistd.h"
 
 int client_num = 0;
-ACE_CString server_ior;
+ACE_TCHAR *server_ior = 0;
 
 int
 parse_args (int argc, ACE_TCHAR *argv[])
@@ -50,9 +50,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     ACE_DEBUG ((LM_DEBUG,
                 "(%P|%t|%T) Client %d sending request to %s\n",
-                client_num, server_ior.c_str ()));
+                client_num, server_ior));
     CORBA::Object_var obj =
-      orb->string_to_object (server_ior.c_str ());
+      orb->string_to_object (server_ior);
     ACE_ASSERT (!CORBA::is_nil (obj.in ()));
     Test_var test = Test::_narrow (obj.in());
     ACE_ASSERT (!CORBA::is_nil (test.in()));
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl
index 73783d38303..0975d46b500 100755
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl
@@ -15,7 +15,7 @@ my $debug_level = '0';
 my $imr_debug_level = $debug_level;
 my $servers_count = 3;
 my $client_count = 2;
-my $server_reply_delay = 5;
+my $server_reply_delay = 20;
 my $usage = 0;
 
 # Ping interval in milliseconds
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
index fe6e8980ca7..08210a261cf 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
@@ -50,7 +50,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   try {
     CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
-    ACE_CString other_server_ior;
+    ACE_TCHAR *other_server_ior = 0;
 
     int server_num = 0;
     int reply_delay_secs = 0;
@@ -124,13 +124,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     table->bind(poa_name.c_str (), test_ior.in());
 
     // Make invocation to other server before POA is activated.
-    if (other_server_ior.length () > 0)
+    if (other_server_ior != 0)
       {
         ACE_DEBUG ((LM_DEBUG,
                     "(%P|%t|%T) Server %d sending request to %s\n",
-                    server_num, other_server_ior.c_str ()));
+                    server_num, other_server_ior));
         CORBA::Object_var other_server =
-          orb->string_to_object (other_server_ior.c_str ());
+          orb->string_to_object (other_server_ior);
         ACE_ASSERT (!CORBA::is_nil (other_server.in ()));
         Test_var test = Test::_narrow (other_server.in());
         ACE_ASSERT (!CORBA::is_nil (test.in()));