Thu Nov 26 12:45:41 UTC 2009 Denis Budko <denis.budko@remedy.nl>

        * tests/Bug_1361_Regression/run_test.pl:

          Test is converted to use new test framework and added to fuzz build.

2 files changed, 9 insertions, 6 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6ef82ecc28e..4429aa99a83 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 26 12:45:41 UTC 2009  Denis Budko  <denis.budko@remedy.nl>
+
+        * tests/Bug_1361_Regression/run_test.pl:
+
+          Test is converted to use new test framework and added to fuzz build.
+
 Thu Nov 26 10:42:27 UTC 2009  Denis Budko  <denis.budko@remedy.nl>
 
         * orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp:
diff --git a/TAO/tests/Bug_1361_Regression/run_test.pl b/TAO/tests/Bug_1361_Regression/run_test.pl
index 19cc27ae58d..2b857c81f56 100755
--- a/TAO/tests/Bug_1361_Regression/run_test.pl
+++ b/TAO/tests/Bug_1361_Regression/run_test.pl
@@ -67,7 +67,6 @@ if ($client->PutFile ($iorbase) == -1) {
 local $start_time = time();
 local $max_running_time = 720;
 local $elapsed = time() - $start_time;
-my $p = $SV->{'PROCESS'};
 
 if ($ARGV[0] eq '-quick')  {
     $elapsed = 0;
@@ -101,21 +100,19 @@ while (($elapsed < $max_running_time) ) {
 
     print STDERR "checking server alive\n";
 
-    my $pid = waitpid ($SV->{PROCESS}, &WNOHANG);
+    my $res = $SV->Wait(1);
 
-    if ($pid != 0 && $? != -1) {
-        $SV->check_return_value ($?);
+    if ($res != -1) {
         $server_died = 1;
         last;
     }
 
     $elapsed = time() - $start_time;
-    sleep (1);
 }
 
 if (!$server_died) {
     my $shutdown_status = $SH->SpawnWaitKill($shutdown->ProcessStartWaitInterval());
-    if ($$shutdown_status != 0) {
+    if ($shutdown_status != 0) {
         print STDERR "ERROR: shutdown returned $$shutdown_status\n";
         $status = 1;
     }