Tue May 14 15:17:51 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>

3 files changed, 11 insertions, 1 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 8c1deaf009f..82c1ff3d3b8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Tue May 14 15:17:51 UTC 2013  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl:
+        * orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp:
+
+          Make sure the multistart test first clears the status before the
+          test case, and also that the server appends to the status file
+          so multiple starts can actually be counted.
+
 Tue May 14 14:53:28 UTC 2013  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * bin/tao_other_tests.lst:
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 ccd1f3d2d1b..a298fbb8417 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
@@ -425,6 +425,7 @@ sub run_multistart_test
 {
     init_test ();
     print_msg ("Running multistart test");
+    $srv[1]->DeleteFile ($srvstatusfile[1]);
 
     my @TICMD;
     print "First async start request\n";
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 5f6906facac..5bf2df4f6fb 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
@@ -186,7 +186,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     {
       ACE_CString status_file = poa_name + ACE_CString(".status");
-      ofstream out(status_file.c_str ());
+      ofstream out(status_file.c_str (), ios_base::app);
       out << "started" << endl;
     }