Thu Nov 12 08:24:00 UTC 2009 Denis Budko <denis.budko@remedy.nl>

* tests/IORManipulation/filter/run_test.pl * tests/Connection_Failure/run_test.pl * orbsvcs/DevGuideExamples/NamingService/Naming_Server/run_test.pl * orbsvcs/tests/unit/Notify/MC/Statistic/run_test.pl * orbsvcs/tests/unit/Notify/MC/Statistic_Registry/run_test.pl * orbsvcs/tests/unit/Notify/MC/MonitorControlExt/run_test.pl * orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/run_test.pl * orbsvcs/tests/unit/Notify/MC/Control/run_test.pl * orbsvcs/tests/unit/Trading/Interpreter/run_test.pl * orbsvcs/tests/Bug_2074_Regression/run_test.pl * tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl * performance-tests/Latency/Collocation/run_test.pl * performance-tests/POA/Object_Creation_And_Registration/run_test.pl * orbsvcs/tests/Bug_2377_Regression/run_test.pl * orbsvcs/tests/Bug_2377_Regression/run_test_ipv6.pl * orbsvcs/tests/unit/Notify/MC/MonitorManager/run_test.pl Fixed fuzz errors and some time interval functions usage.
author: dbudko <dbudko@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2009-11-12 08:30:40 +0000
committer: dbudko <dbudko@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2009-11-12 08:30:40 +0000
commit: 55980227383e65503396d49aeea530e0719ebd02 (patch)
tree: 03752ccfab6594403ceee00c0c658d2782ec5b2a
parent: 1cd72c4b94c1f0f688a3c28b386a161b87a4466a (diff)
download: ATCD-55980227383e65503396d49aeea530e0719ebd02.tar.gz
17 files changed, 77 insertions, 63 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 167f66d4681..eb276733e2e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Thu Nov 12 08:24:00 UTC 2009  Denis Budko <denis.budko@remedy.nl>
+
+        * tests/IORManipulation/filter/run_test.pl
+        * tests/Connection_Failure/run_test.pl
+        * orbsvcs/DevGuideExamples/NamingService/Naming_Server/run_test.pl
+        * orbsvcs/tests/unit/Notify/MC/Statistic/run_test.pl
+        * orbsvcs/tests/unit/Notify/MC/Statistic_Registry/run_test.pl
+        * orbsvcs/tests/unit/Notify/MC/MonitorControlExt/run_test.pl
+        * orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/run_test.pl
+        * orbsvcs/tests/unit/Notify/MC/Control/run_test.pl
+        * orbsvcs/tests/unit/Trading/Interpreter/run_test.pl
+        * orbsvcs/tests/Bug_2074_Regression/run_test.pl
+        * tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl
+        * performance-tests/Latency/Collocation/run_test.pl
+        * performance-tests/POA/Object_Creation_And_Registration/run_test.pl
+        * orbsvcs/tests/Bug_2377_Regression/run_test.pl
+        * orbsvcs/tests/Bug_2377_Regression/run_test_ipv6.pl
+        * orbsvcs/tests/unit/Notify/MC/MonitorManager/run_test.pl
+        Fixed fuzz errors and some time interval functions usage.
+
 Thu Nov 12 07:13:51 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/PortableInterceptors/AdvSlot/run_test.pl
diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/run_test.pl
index 7f6165b2137..80ebfd6d0e2 100755
--- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/run_test.pl
+++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/run_test.pl
@@ -20,8 +20,8 @@ my $service = PerlACE::TestTarget::create_target (1) || die "Create target 1 fai
 
 $CS = $service->CreateProcess ("NamingMessenger", "-ORBdebuglevel $debug_level");
 
-if ($CS->SpawnWaitKill(10) != 0) {
+if ($CS->SpawnWaitKill($service->ProcessStartWaitInterval()) != 0) {
    exit 1;
 }
 
-exit $status;
+exit 0;
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2074_Regression/run_test.pl
index f2ca9255e84..f34afe84489 100755
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2074_Regression/run_test.pl
@@ -23,7 +23,7 @@ my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 fail
 
 $SV = $server->CreateProcess ($prog, "-ORBdebuglevel $debug_level");
 
-$status_server = $SV->SpawnWaitKill (120);
+$status_server = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval() + 110);
 
 if ($status_server != 0) {
     print STDERR "ERROR: $prog returned $status_server\n";
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl
index 48b71e31fca..d7375ec2b88 100755
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl
@@ -20,16 +20,16 @@ foreach $i (@ARGV) {
 my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 
 $T = $test->CreateProcess("uipmc_test",
-    			"-ORBdebuglevel $debug_level ".
-    			"-u corbaloc:miop:1.0\@1.0-cdmwftdomain-1/225.1.1.8:5555 " .
-    			"-c corbaloc:miop:1.0\@1.0-cdmwftdomain-1/225.1.1.7:5555");
+                          "-ORBdebuglevel $debug_level ".
+                          "-u corbaloc:miop:1.0\@1.0-cdmwftdomain-1/225.1.1.8:5555 " .
+                          "-c corbaloc:miop:1.0\@1.0-cdmwftdomain-1/225.1.1.7:5555");
 
 
-$test_status = $T->SpawnWaitKill (20);
+$test_status = $T->SpawnWaitKill ($test->ProcessStartWaitInterval());
 
 if ($test_status != 0) {
-    print STDERR "ERROR: uipmc_test returned $prog\n";
+    print STDERR "ERROR: uipmc_test returned $test_status\n";
     $status = 1;
 }
 
-exit $status;
-\ No newline at end of file
+exit $status;
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/run_test_ipv6.pl b/TAO/orbsvcs/tests/Bug_2377_Regression/run_test_ipv6.pl
index d5e2f2a0d7f..0e50c0d55e2 100755
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/run_test_ipv6.pl
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/run_test_ipv6.pl
@@ -20,16 +20,16 @@ foreach $i (@ARGV) {
 my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 
 $T = $test->CreateProcess("uipmc_test",
-    			"-ORBdebuglevel $debug_level ".
-    			"-u corbaloc:miop:1.0\@1.0-cdmwftdomain-1/[FF01:0:0:0:0:0:25:335]:3977 " .
-    			"-c corbaloc:miop:1.0\@1.0-cdmwftdomain-1/[FF01:0:0:0:0:0:25:334]:3977");
+                          "-ORBdebuglevel $debug_level ".
+                          "-u corbaloc:miop:1.0\@1.0-cdmwftdomain-1/[FF01:0:0:0:0:0:25:335]:3977 " .
+                          "-c corbaloc:miop:1.0\@1.0-cdmwftdomain-1/[FF01:0:0:0:0:0:25:334]:3977");
 
 
-$test_status = $T->SpawnWaitKill (20);
+$test_status = $T->SpawnWaitKill ($test->ProcessStartWaitInterval());
 
 if ($test_status != 0) {
-    print STDERR "ERROR: uipmc_test returned $prog\n";
+    print STDERR "ERROR: uipmc_test returned $test_status\n";
     $status = 1;
 }
 
-exit $status;
-\ No newline at end of file
+exit $status;
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Control/run_test.pl b/TAO/orbsvcs/tests/unit/Notify/MC/Control/run_test.pl
index 10b2d32c8ce..3c9b3dd64e4 100755
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Control/run_test.pl
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Control/run_test.pl
@@ -23,7 +23,7 @@ my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 fail
 
 $SV = $server->CreateProcess ($prog, "-ORBdebuglevel $debug_level");
 
-$status_server = $SV->SpawnWaitKill (10);
+$status_server = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
 
 if ($status_server != 0) {
     print STDERR "ERROR: $prog returned $status_server\n";
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/run_test.pl b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/run_test.pl
index 7ff35eede72..540a416a985 100755
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/run_test.pl
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/run_test.pl
@@ -23,7 +23,7 @@ my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 fail
 
 $SV = $server->CreateProcess ($prog, "-ORBdebuglevel $debug_level");
 
-$status_server = $SV->SpawnWaitKill (10);
+$status_server = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
 
 if ($status_server != 0) {
     print STDERR "ERROR: $prog returned $status_server\n";
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/run_test.pl b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/run_test.pl
index 9eec378d168..177395a75d8 100755
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/run_test.pl
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/run_test.pl
@@ -1,14 +1,14 @@
-eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
-     & eval 'exec perl -w -S $0 $argv:q'
-     if 0;
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
 
 # $Id$
 # -*- perl -*-
 
-use strict;
 use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::Run_Test;
+use PerlACE::TestTarget;
 
+$status = 0;
 $debug_level = '0';
 
 foreach $i (@ARGV) {
@@ -17,34 +17,32 @@ foreach $i (@ARGV) {
     }
 }
 
-my($prog) = 'MonitorManager';
+my($prog_server) = 'MonitorManager';
+my($prog_client) = 'MonitorClient';
 
-## Avoid code duplication by determining the process type and
-## storing it as a string for use later.
-my $class = (PerlACE::is_vxworks_test() ? 'PerlACE::ProcessVX' :
-                                          'PerlACE::Process');
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
 
-my $SV = $class->new($prog, "-ORBdebuglevel $debug_level");
-my $server = $SV->Spawn();
+$SV = $server->CreateProcess ($prog_server, "-ORBdebuglevel $debug_level");
+$CL = $client->CreateProcess ($prog_client);
+
+$status_server = $SV->Spawn();
 
-if ($server != 0) {
-  print STDERR "ERROR: $prog returned $server\n";
-  exit(1);
-}
 
-sleep($PerlACE::wait_interval_for_process_creation / 3);
+sleep($server->ProcessStartWaitInterval()/3);
 
-$prog = 'MonitorClient';
-my $CL = new PerlACE::Process($prog);
-my $client = $CL->SpawnWaitKill(20);
+$status_client = $CL->SpawnWaitKill ($server->ProcessStartWaitInterval() + 10);
 
-my $status = 0;
-if ($client != 0) {
-  print STDERR "ERROR: $prog returned $client\n";
-  $SV->Kill();
-  $status = 1;
+if ($status_client != 0) {
+    print STDERR "ERROR: $prog_server returned $status_server\n";
+    $status = 1;
 }
 
-$SV->WaitKill(10);
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    $status = 1;
+}
 
-exit($status);
+exit $status;
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/run_test.pl b/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/run_test.pl
index 51c674f72a1..1151f336b44 100755
--- a/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/run_test.pl
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/run_test.pl
@@ -23,7 +23,7 @@ my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 fail
 
 $SV = $server->CreateProcess ($prog, "-ORBdebuglevel $debug_level");
 
-$status_server = $SV->SpawnWaitKill (10);
+$status_server = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
 
 if ($status_server != 0) {
     print STDERR "ERROR: $prog returned $status_server\n";
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/run_test.pl b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/run_test.pl
index 966f8decbc5..0704812ce96 100755
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/run_test.pl
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/run_test.pl
@@ -16,7 +16,7 @@ my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 fail
 
 $SV = $server->CreateProcess ($prog);
 
-$status_server = $SV->SpawnWaitKill (10);
+$status_server = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
 
 if ($status_server != 0) {
     print STDERR "ERROR: $prog returned $status_server\n";
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/run_test.pl b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/run_test.pl
index 11f2a678a94..f775c421ccf 100755
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/run_test.pl
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/run_test.pl
@@ -23,7 +23,7 @@ my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 fail
 
 $SV = $server->CreateProcess ($prog, "-ORBdebuglevel $debug_level");
 
-$status_server = $SV->SpawnWaitKill (10);
+$status_server = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
 
 if ($status_server != 0) {
     print STDERR "ERROR: $prog returned $status_server\n";
diff --git a/TAO/orbsvcs/tests/unit/Trading/Interpreter/run_test.pl b/TAO/orbsvcs/tests/unit/Trading/Interpreter/run_test.pl
index 294243bbdb3..3ec54109515 100755
--- a/TAO/orbsvcs/tests/unit/Trading/Interpreter/run_test.pl
+++ b/TAO/orbsvcs/tests/unit/Trading/Interpreter/run_test.pl
@@ -23,7 +23,7 @@ my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 fail
 
 $SV = $server->CreateProcess ($prog, "-ORBdebuglevel $debug_level");
 
-$status_server = $SV->SpawnWaitKill (10);
+$status_server = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
 
 if ($status_server != 0) {
     print STDERR "ERROR: $prog returned $status_server\n";
diff --git a/TAO/performance-tests/Latency/Collocation/run_test.pl b/TAO/performance-tests/Latency/Collocation/run_test.pl
index 2a6df137203..ced6a4d44ad 100755
--- a/TAO/performance-tests/Latency/Collocation/run_test.pl
+++ b/TAO/performance-tests/Latency/Collocation/run_test.pl
@@ -19,7 +19,7 @@ foreach $i (@ARGV) {
 
 my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 $T = $test->CreateProcess ("Collocated_Test", "-ORBdebuglevel $debug_level");
-$test_status = $T->SpawnWaitKill (60);
+$test_status = $T->SpawnWaitKill ($test->ProcessStartWaitInterval() + 45);
 
 if ($test_status != 0) {
     print STDERR "ERROR: Collocated_Test returned $test_status\n";
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl b/TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl
index 07bac3de68a..122458ff04a 100755
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl
@@ -19,7 +19,7 @@ foreach $i (@ARGV) {
 
 my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 $T = $test->CreateProcess ("registration", "-ORBdebuglevel $debug_level");
-$test_status = $T->SpawnWaitKill (60);
+$test_status = $T->SpawnWaitKill ($test->ProcessStartWaitInterval() + 45);
 
 if ($test_status != 0) {
     print STDERR "ERROR: test returned $test_status\n";
diff --git a/TAO/tests/Connection_Failure/run_test.pl b/TAO/tests/Connection_Failure/run_test.pl
index 6211cc22844..5d1c3ed3a33 100755
--- a/TAO/tests/Connection_Failure/run_test.pl
+++ b/TAO/tests/Connection_Failure/run_test.pl
@@ -21,7 +21,7 @@ my $client = PerlACE::TestTarget::create_target (1) || die "Create target 1 fail
 
 $CL = $client->CreateProcess ("client", "-ORBdebuglevel $debug_level");
 
-$client_status = $CL->SpawnWaitKill (60);
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 50);
 
 if ($client_status != 0) {
     print STDERR "ERROR: client returned $client_status\n";
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl
index aac03e15218..3d3a9fb89d8 100755
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl
@@ -10,7 +10,6 @@ use PerlACE::TestTarget;
 
 $status = 0;
 $debug_level = '0';
-$TARGETHOSTNAME = '127.0.0.1';
 $port = PerlACE::uniqueid () + 12000;
 $endien = (pack('L', 0x41424344) eq 'ABCD' ? '_be' : '');
 
@@ -21,16 +20,15 @@ foreach $i (@ARGV) {
 }
 
 my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
-
+my $hostname = $server->HostName();
 my $iorbase = "server.ior";
 my $server_iorfile = $server->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 
-$SV = $server->CreateProcess (	"server",
-	                        "-ORBEndpoint " .
-                             	"iiop://$TARGETHOSTNAME" . ":$port " .
-                             	"-ORBDebugLevel $debug_level");
-			
+$SV = $server->CreateProcess ("server",
+                              "-ORBEndpoint iiop://$hostname:$port " .
+                              "-ORBDebugLevel $debug_level");
+
 $server_status = $SV->Spawn ();
 
 if ($server_status != 0) {
@@ -47,7 +45,7 @@ if ($server->WaitForFileTimed ($iorbase,
     exit 1;
 }
 
-my($CL) = system("$^X dribble.pl --host=$TARGETHOSTNAME --port=$port " .
+my($CL) = system("$^X dribble.pl --host=$hostname --port=$port " .
                  "--stream=giop1.2_fragments$endien.dat " .
                  "--layout=giop1.2_fragments$endien.layout");
 if ($CL != 0) {
diff --git a/TAO/tests/IORManipulation/filter/run_test.pl b/TAO/tests/IORManipulation/filter/run_test.pl
index fa4395089d2..6063a25b8e1 100755
--- a/TAO/tests/IORManipulation/filter/run_test.pl
+++ b/TAO/tests/IORManipulation/filter/run_test.pl
@@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::TestTarget;
-use Sys::Hostname;
 
 my $status = 0;
 $debug_level = '0';
@@ -18,16 +17,15 @@ foreach $i (@ARGV) {
     }
 }
 
-my $host = hostname();
-
 my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 
+my $hostname = $server->HostName();
 
 $SV = $server->CreateProcess ("server",
                               "-ORBdebuglevel $debug_level " .
                               "-ORBUseSharedProfiles 0 " .
                               "-ORBEndpoint iiop://localhost " .
-                              "-ORBEndpoint iiop://${host}");
+                              "-ORBEndpoint iiop://$hostname");
     
 $server_status = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
author	dbudko <dbudko@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2009-11-12 08:30:40 +0000
committer	dbudko <dbudko@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2009-11-12 08:30:40 +0000
commit	55980227383e65503396d49aeea530e0719ebd02 (patch)
tree	03752ccfab6594403ceee00c0c658d2782ec5b2a
parent	1cd72c4b94c1f0f688a3c28b386a161b87a4466a (diff)
download	ATCD-55980227383e65503396d49aeea530e0719ebd02.tar.gz