Merge pull request #180 from pmesnier/master

ImplRepo windows test fixes

3 files changed, 10 insertions, 4 deletions

diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
index d945617dc82..eea6c5cc5e1 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -351,8 +351,11 @@ ImR_Activator_i::kill_server (const char* name, CORBA::Long lastpid, CORBA::Shor
 #endif
   if (pid != 0)
     {
-      result = (signum != 9) ? ACE_OS::kill (pid, signum)
-        : ACE::terminate_process (pid);
+      result =
+#if !defined (ACE_WIN32)
+        (signum != 9) ? ACE_OS::kill (pid, signum) :
+#endif
+        ACE::terminate_process (pid);
       if (debug_ > 1)
         ORBSVCS_DEBUG((LM_DEBUG,
                        "ImR Activator: Killing server <%C> "
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl
index 861e4453d24..89b0666acb1 100755
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl
@@ -282,6 +282,9 @@ $C1_status = $C1->SpawnWaitKill ($c1->ProcessStartWaitInterval() + $extra_timeou
 
 if ($C1_status == 2) {
     print STDERR "Warning: This test does not currently run under this operating system.\n";
+    if ($mode eq "-a MANUAL ") {
+        ti_cmd ("shutdown");
+    }
     kill_imr ();
     exit 0;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl
index e162720d876..a148293776e 100755
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl
@@ -7,6 +7,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 ###############################################################################
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::TestTarget;
+use English;
 
 my $status = 0;
 my $imr_debug = 0;
@@ -185,7 +186,7 @@ sub servers_setup ()
 
     my $act_args = "-l -o $act_actiorfile -ORBInitRef ImplRepoService=file://$act_imriorfile  -orbendpoint iiop://localhost:";
     $act_args .= " -d $imr_debug -orbdebuglevel $orb_debug -orbverboselogging 1 -orblogfile act.log" if ($imr_debug > 0);
-    $act_args .= " -delay $act_delay" if ($rm2523 == 1);
+    $act_args .= " -delay $act_delay" if ($rm2523 == 1 && $OSNAME ne "MSWin32");
     $ACT->Arguments ($act_args);
 
     $ACT_status = $ACT->Spawn ();
@@ -361,7 +362,6 @@ sub shutdown_servers(@)
         if ($TI_status != 0 && $TI_status != 5) {
             print STDERR "ERROR: tao_imr kill returned $TI_status\n";
             $status = 1;
-            last;
         }
 	$srv[$i]->DeleteFile ($status_file_name);
     }