diff options
41 files changed, 195 insertions, 142 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6c865de84c1..840c12223e7 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,48 @@ +Wed Apr 18 19:15:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/AMI/run_test.pl: + * tests/AMI_Buffering/run_buffer_size.pl: + * tests/AMI_Buffering/run_message_count.pl: + * tests/AMI_Buffering/run_test.pl: + * tests/AMI_Buffering/run_timeout.pl: + * tests/AMI_Buffering/run_timeout_reactive.pl: + * tests/BiDirectional/run_test_ipv6.pl: + * tests/Big_Request_Muxing/run_test.pl: + * tests/Blocking_Sync_None/run_test.pl: + * tests/Bug_1476_Test/run_test.pl: + * tests/Bug_1535_Regression/run_test.pl: + * tests/Bug_2183_Regression/run_test.pl: + * tests/Bug_2429_Regression/run_test.pl: + * tests/Bug_2678_Regression/run_test.pl: + * tests/Client_Leaks/run_test.pl: + * tests/DLL_ORB/run_test.pl: + * tests/DSI_AMI_Gateway/run_exception_test.pl: + * tests/DSI_Gateway/run_exception_test.pl: + * tests/Exposed_Policies/run_test.pl: + * tests/Faults/run_test.pl: + * tests/GIOP_Fragments/Java_Big_Reply/run_test.pl: + * tests/GIOP_Fragments/Java_Big_Request/run_test.pl: + * tests/InterOp-Naming/run_test.pl: + * tests/MT_BiDir/run_test.pl: + * tests/MT_Timeout/run_test.pl: + * tests/Muxed_GIOP_Versions/run_test.pl: + * tests/NestedUpcall/Triangle_Test/run_test.pl: + * tests/Oneway_Buffering/run_buffer_size.pl: + * tests/Oneway_Buffering/run_message_count.pl: + * tests/Oneway_Buffering/run_test.pl: + * tests/Oneway_Buffering/run_timeout.pl: + * tests/Oneway_Buffering/run_timeout_reactive.pl: + * tests/Oneway_Timeouts/run_test.pl: + * tests/Oneways_Invoking_Twoways/run_test.pl: + * tests/Parallel_Connect_Strategy/run_test.pl: + * tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl: + * tests/RTCORBA/Linear_Priority/run_test.pl: + * tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: + * tests/RTCORBA/Private_Connection/run_test.pl: + * tests/Typedef_String_Array/run_test.pl: + Improvements for vxworks cross platform testing and for + slower test systems like OpenVMS + Wed Apr 18 15:37:09 UTC 2007 Chad Elliott <elliott_c@ociweb.com> * orbsvcs/ImplRepo_Service/Activator_Options.cpp: diff --git a/TAO/tests/AMI/run_test.pl b/TAO/tests/AMI/run_test.pl index a1161d018d7..482acf3d846 100755 --- a/TAO/tests/AMI/run_test.pl +++ b/TAO/tests/AMI/run_test.pl @@ -38,7 +38,7 @@ else { $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; diff --git a/TAO/tests/AMI_Buffering/run_buffer_size.pl b/TAO/tests/AMI_Buffering/run_buffer_size.pl index d8d013e7528..b557462d586 100755 --- a/TAO/tests/AMI_Buffering/run_buffer_size.pl +++ b/TAO/tests/AMI_Buffering/run_buffer_size.pl @@ -29,7 +29,7 @@ my $CL = new PerlACE::Process ("client", $AD->Spawn (); -if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($admin_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$admin_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); exit 1; @@ -37,7 +37,7 @@ if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { $SV->Spawn (); -if (PerlACE::waitforfile_timed ($server_iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($server_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$server_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); $SV->Kill (); $SV->TimedWait (1); diff --git a/TAO/tests/AMI_Buffering/run_message_count.pl b/TAO/tests/AMI_Buffering/run_message_count.pl index dcb2c43bea8..c1401700576 100755 --- a/TAO/tests/AMI_Buffering/run_message_count.pl +++ b/TAO/tests/AMI_Buffering/run_message_count.pl @@ -29,7 +29,7 @@ my $CL = new PerlACE::Process ("client", $AD->Spawn (); -if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($admin_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$admin_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); exit 1; @@ -37,7 +37,7 @@ if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { $SV->Spawn (); -if (PerlACE::waitforfile_timed ($server_iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($server_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$server_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); $SV->Kill (); $SV->TimedWait (1); diff --git a/TAO/tests/AMI_Buffering/run_test.pl b/TAO/tests/AMI_Buffering/run_test.pl index 4e682196753..b21fcb8b3f9 100755 --- a/TAO/tests/AMI_Buffering/run_test.pl +++ b/TAO/tests/AMI_Buffering/run_test.pl @@ -25,7 +25,7 @@ foreach $test_type ("-c", "-t", "-b") { $AD->Spawn (); - if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { + if (PerlACE::waitforfile_timed ($admin_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$admin_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); exit 1; @@ -33,7 +33,7 @@ foreach $test_type ("-c", "-t", "-b") { $SV->Spawn (); - if (PerlACE::waitforfile_timed ($server_iorfile, 10) == -1) { + if (PerlACE::waitforfile_timed ($server_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$server_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); $SV->Kill (); $SV->TimedWait (1); diff --git a/TAO/tests/AMI_Buffering/run_timeout.pl b/TAO/tests/AMI_Buffering/run_timeout.pl index eb3580c12c5..69b99743353 100755 --- a/TAO/tests/AMI_Buffering/run_timeout.pl +++ b/TAO/tests/AMI_Buffering/run_timeout.pl @@ -29,7 +29,7 @@ my $CL = new PerlACE::Process ("client", $AD->Spawn (); -if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($admin_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$admin_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); exit 1; @@ -37,7 +37,7 @@ if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { $SV->Spawn (); -if (PerlACE::waitforfile_timed ($server_iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($server_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$server_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); $SV->Kill (); $SV->TimedWait (1); diff --git a/TAO/tests/AMI_Buffering/run_timeout_reactive.pl b/TAO/tests/AMI_Buffering/run_timeout_reactive.pl index 061a524f4a6..bc45e7b3a45 100755 --- a/TAO/tests/AMI_Buffering/run_timeout_reactive.pl +++ b/TAO/tests/AMI_Buffering/run_timeout_reactive.pl @@ -29,7 +29,7 @@ my $CL = new PerlACE::Process ("client", $AD->Spawn (); -if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($admin_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$admin_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); exit 1; @@ -37,7 +37,7 @@ if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { $SV->Spawn (); -if (PerlACE::waitforfile_timed ($server_iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($server_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$server_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); $SV->Kill (); $SV->TimedWait (1); diff --git a/TAO/tests/BiDirectional/run_test_ipv6.pl b/TAO/tests/BiDirectional/run_test_ipv6.pl index 9156d8a5521..f2f84d7d379 100755 --- a/TAO/tests/BiDirectional/run_test_ipv6.pl +++ b/TAO/tests/BiDirectional/run_test_ipv6.pl @@ -23,7 +23,7 @@ $CL = new PerlACE::Process ("client", "-k file://$iorfile -ORBConnectIPV6Only 1" $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); exit 1; diff --git a/TAO/tests/Big_Request_Muxing/run_test.pl b/TAO/tests/Big_Request_Muxing/run_test.pl index 8c31787c53b..67b31276979 100755 --- a/TAO/tests/Big_Request_Muxing/run_test.pl +++ b/TAO/tests/Big_Request_Muxing/run_test.pl @@ -24,7 +24,7 @@ for ($n = 0; $n < 10; ++$n) { unlink $iorfile; $SV->Spawn (); - if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { + if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); exit 1; diff --git a/TAO/tests/Blocking_Sync_None/run_test.pl b/TAO/tests/Blocking_Sync_None/run_test.pl index 920cd2391ff..888b24f244e 100755 --- a/TAO/tests/Blocking_Sync_None/run_test.pl +++ b/TAO/tests/Blocking_Sync_None/run_test.pl @@ -23,11 +23,11 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile"); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; -} +} $client = $CL->SpawnWaitKill (300); diff --git a/TAO/tests/Bug_1476_Test/run_test.pl b/TAO/tests/Bug_1476_Test/run_test.pl index 2dd6f6ede12..1494c113865 100755 --- a/TAO/tests/Bug_1476_Test/run_test.pl +++ b/TAO/tests/Bug_1476_Test/run_test.pl @@ -16,16 +16,12 @@ foreach $i (@ARGV) { $debug_level = '10'; } } - -$iorfile = PerlACE::LocalFile ("test.ior"); - -#The below hack is required for proper PerlACE initialization -$dum = new PerlACE::Process ("client"); - -if (PerlACE::waitforfile_timed ($iorfile, - $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR "ERROR: cannot find file <$iorfile>\n"; - exit 1; +$iorbase = "test.ior"; +if (PerlACE::is_vxworks_test()) { + $iorfile = $iorbase; +} +else { + $iorfile = PerlACE::LocalFile ("test.ior"); } @synchs = ("none","delayed"); @@ -39,7 +35,12 @@ for ($s = 0; $s < @synchs; $s++) { $level = $levels[$l]; - $CL = new PerlACE::Process ("client", "-ORBDebuglevel $debug_level -k file://$iorfile -s$synch -l$level"); + if (PerlACE::is_vxworks_test()) { + $CL = new PerlACE::ProcessVX ("client", "-ORBDebuglevel $debug_level -k file://$iorfile -s$synch -l$level"); + } + else { + $CL = new PerlACE::Process ("client", "-ORBDebuglevel $debug_level -k file://$iorfile -s$synch -l$level"); + } $client = $CL->SpawnWaitKill (300); diff --git a/TAO/tests/Bug_1535_Regression/run_test.pl b/TAO/tests/Bug_1535_Regression/run_test.pl index 0aaeba388ef..4980beb4bbf 100755 --- a/TAO/tests/Bug_1535_Regression/run_test.pl +++ b/TAO/tests/Bug_1535_Regression/run_test.pl @@ -14,12 +14,12 @@ if (PerlACE::is_vxworks_test()) { $SV = new PerlACE::ProcessVX ("bug_1535_regression"); } else { - $SV = new PerlACE::Process ("bug_1535_regression"); + $SV = new PerlACE::Process ("bug_1535_regression"); } $SV->Spawn (); -$server = $SV->WaitKill (10); +$server = $SV->WaitKill ($PerlACE::wait_interval_for_process_creation); if ($server != 0) { print STDERR "ERROR: server returned $server\n"; diff --git a/TAO/tests/Bug_2183_Regression/run_test.pl b/TAO/tests/Bug_2183_Regression/run_test.pl index d07f5841304..c8bd9248b1b 100755 --- a/TAO/tests/Bug_2183_Regression/run_test.pl +++ b/TAO/tests/Bug_2183_Regression/run_test.pl @@ -45,7 +45,7 @@ if ($sv != 0) { } # We can wait on the IOR file -if (PerlACE::waitforfile_timed ($server_ior_file, 10) == -1) +if (PerlACE::waitforfile_timed ($server_ior_file, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find $server_ior_file\n"; $SERVER->Kill(); diff --git a/TAO/tests/Bug_2429_Regression/run_test.pl b/TAO/tests/Bug_2429_Regression/run_test.pl index 2cb6ef59994..610946f71d2 100755 --- a/TAO/tests/Bug_2429_Regression/run_test.pl +++ b/TAO/tests/Bug_2429_Regression/run_test.pl @@ -33,7 +33,7 @@ if ($server != 0) { } # We can wait on the IOR file -if (PerlACE::waitforfile_timed ($server_ior_file, 10) == -1) +if (PerlACE::waitforfile_timed ($server_ior_file, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find $server_ior_file\n"; $SERVER->Kill(); diff --git a/TAO/tests/Bug_2678_Regression/run_test.pl b/TAO/tests/Bug_2678_Regression/run_test.pl index 1e3ffd83ad8..d27486d8673 100755 --- a/TAO/tests/Bug_2678_Regression/run_test.pl +++ b/TAO/tests/Bug_2678_Regression/run_test.pl @@ -32,7 +32,7 @@ else { } $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; diff --git a/TAO/tests/Client_Leaks/run_test.pl b/TAO/tests/Client_Leaks/run_test.pl index 12a70dfd064..cb8ea3bf51e 100755 --- a/TAO/tests/Client_Leaks/run_test.pl +++ b/TAO/tests/Client_Leaks/run_test.pl @@ -17,11 +17,11 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile"); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; -} +} $client = $CL->SpawnWaitKill (600); diff --git a/TAO/tests/DLL_ORB/run_test.pl b/TAO/tests/DLL_ORB/run_test.pl index 6509c641b43..c939c59193f 100755 --- a/TAO/tests/DLL_ORB/run_test.pl +++ b/TAO/tests/DLL_ORB/run_test.pl @@ -21,7 +21,7 @@ print STDERR "\n\n==== Running DLL ORB test\n"; $SV->Spawn (); -if (PerlACE::waitforfile_timed ($file, 15) == -1) { +if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$file>\n"; $SV->Kill (); exit 1; diff --git a/TAO/tests/DSI_AMI_Gateway/run_exception_test.pl b/TAO/tests/DSI_AMI_Gateway/run_exception_test.pl index d8ab49c6440..464925e2e43 100755 --- a/TAO/tests/DSI_AMI_Gateway/run_exception_test.pl +++ b/TAO/tests/DSI_AMI_Gateway/run_exception_test.pl @@ -22,7 +22,7 @@ $CL = new PerlACE::Process ("client", "-k file://$gwfile -u"); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($svfile, 5) == -1) { +if (PerlACE::waitforfile_timed ($svfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$svfile>\n"; $SV->Kill (); exit 1; @@ -30,7 +30,7 @@ if (PerlACE::waitforfile_timed ($svfile, 5) == -1) { $GW->Spawn (); -if (PerlACE::waitforfile_timed ($gwfile, 5) == -1) { +if (PerlACE::waitforfile_timed ($gwfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$gwfile>\n"; $SV->Kill (); $GW->Kill (); diff --git a/TAO/tests/DSI_Gateway/run_exception_test.pl b/TAO/tests/DSI_Gateway/run_exception_test.pl index d8ab49c6440..436e69b1710 100755 --- a/TAO/tests/DSI_Gateway/run_exception_test.pl +++ b/TAO/tests/DSI_Gateway/run_exception_test.pl @@ -22,7 +22,7 @@ $CL = new PerlACE::Process ("client", "-k file://$gwfile -u"); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($svfile, 5) == -1) { +if (PerlACE::waitforfile_timed ($svfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$svfile>\n"; $SV->Kill (); exit 1; @@ -30,10 +30,10 @@ if (PerlACE::waitforfile_timed ($svfile, 5) == -1) { $GW->Spawn (); -if (PerlACE::waitforfile_timed ($gwfile, 5) == -1) { +if (PerlACE::waitforfile_timed ($gwfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$gwfile>\n"; $SV->Kill (); - $GW->Kill (); + $GW->Kill (); exit 1; } diff --git a/TAO/tests/Exposed_Policies/run_test.pl b/TAO/tests/Exposed_Policies/run_test.pl index b5102943f5e..ef9a4658cf6 100755 --- a/TAO/tests/Exposed_Policies/run_test.pl +++ b/TAO/tests/Exposed_Policies/run_test.pl @@ -12,9 +12,9 @@ $base_ior_file = PerlACE::LocalFile ("default.ior"); $overridden_ior_file = PerlACE::LocalFile ("overridden.ior"); if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server", + $SV = new PerlACE::ProcessVX ("server", " -POAConfigFile POA.cfg" . - " -ObjectConfigFile Object.cfg" . + " -ObjectConfigFile Object.cfg" . " -BaseObjectIOR default.ior" . " -OverriddenIOR overridden.ior"); } @@ -27,9 +27,9 @@ else { $poa_file = PerlACE::LocalFile ("POA.cfg"); $obj_file = PerlACE::LocalFile ("Object.cfg"); } - $SV = new PerlACE::Process ("server", + $SV = new PerlACE::Process ("server", " -POAConfigFile $poa_file" . - " -ObjectConfigFile $obj_file" . + " -ObjectConfigFile $obj_file" . " -BaseObjectIOR $base_ior_file" . " -OverriddenIOR $overridden_ior_file"); } @@ -45,7 +45,7 @@ unlink($base_ior_file); unlink($overridden_ior_file); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($base_ior_file, 15) == -1) { +if (PerlACE::waitforfile_timed ($base_ior_file, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$base_ior_file>\n"; $SV->Kill (); exit 1; diff --git a/TAO/tests/Faults/run_test.pl b/TAO/tests/Faults/run_test.pl index ccb548e4312..ae03c70c0ea 100755 --- a/TAO/tests/Faults/run_test.pl +++ b/TAO/tests/Faults/run_test.pl @@ -27,7 +27,7 @@ print STDERR "===== Base test, no crashes\n"; unlink $iorfile; $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); exit 1; @@ -91,9 +91,9 @@ print STDERR "===== Server crash during upcall\n"; unlink $iorfile; $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); + $SV->Kill (); exit 1; } @@ -119,18 +119,18 @@ print STDERR "===== Three-way test, client crashes and server detects\n"; unlink $iorfile; $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV->Kill (); + $SV->Kill (); exit 1; } unlink $middlefile; $MD->Spawn (); -if (PerlACE::waitforfile_timed ($middlefile, 15) == -1) { +if (PerlACE::waitforfile_timed ($middlefile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$middlefile>\n"; - $MD->Kill (); + $MD->Kill (); exit 1; } @@ -172,7 +172,7 @@ print STDERR "===== Ping-pong test, server crashes but client continues\n"; unlink $iorfile; $PI->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); exit 1; @@ -195,7 +195,7 @@ print STDERR "===== Base test, no crashes\n"; unlink $iorfile; $SV1->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); exit 1; @@ -259,9 +259,9 @@ print STDERR "===== Server crash during upcall\n"; unlink $iorfile; $SV1->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV1->Kill (); + $SV1->Kill (); exit 1; } @@ -287,18 +287,18 @@ print STDERR "===== Three-way test, client crashes and server detects\n"; unlink $iorfile; $SV1->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; - $SV1->Kill (); + $SV1->Kill (); exit 1; } unlink $middlefile; $MD->Spawn (); -if (PerlACE::waitforfile_timed ($middlefile, 15) == -1) { +if (PerlACE::waitforfile_timed ($middlefile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$middlefile>\n"; - $MD->Kill (); + $MD->Kill (); exit 1; } @@ -340,7 +340,7 @@ print STDERR "===== Ping-pong test, server crashes but client continues\n"; unlink $iorfile; $PI->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV1->Kill (); exit 1; diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/run_test.pl b/TAO/tests/GIOP_Fragments/Java_Big_Reply/run_test.pl index 32ca0242feb..6e4af6f5145 100755 --- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/run_test.pl +++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/run_test.pl @@ -34,7 +34,7 @@ $CL = new PerlACE::Process ('client'); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/run_test.pl b/TAO/tests/GIOP_Fragments/Java_Big_Request/run_test.pl index 97cf96123e7..c23c7b4c2f5 100755 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/run_test.pl +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/run_test.pl @@ -24,7 +24,7 @@ foreach my $giop ('1.2') { "iiop://$giop\@$TARGETHOSTNAME" . ":$port"); $SV->Spawn (); - if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { + if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; diff --git a/TAO/tests/InterOp-Naming/run_test.pl b/TAO/tests/InterOp-Naming/run_test.pl index 178316c7c2b..689c6fe448a 100755 --- a/TAO/tests/InterOp-Naming/run_test.pl +++ b/TAO/tests/InterOp-Naming/run_test.pl @@ -32,7 +32,7 @@ else { $SV->Spawn (); -if (PerlACE::waitforfile_timed ($file, 10) == -1) { +if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$file>\n"; $SV->Kill (); exit 1; diff --git a/TAO/tests/MT_BiDir/run_test.pl b/TAO/tests/MT_BiDir/run_test.pl index 968afc2cbdc..2684b1c47f8 100755 --- a/TAO/tests/MT_BiDir/run_test.pl +++ b/TAO/tests/MT_BiDir/run_test.pl @@ -25,7 +25,7 @@ $CL3 = new PerlACE::Process ("client", "-k file://$iorfile"); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); exit 1; diff --git a/TAO/tests/MT_Timeout/run_test.pl b/TAO/tests/MT_Timeout/run_test.pl index 091ab203d96..9bde7ae111e 100755 --- a/TAO/tests/MT_Timeout/run_test.pl +++ b/TAO/tests/MT_Timeout/run_test.pl @@ -22,7 +22,7 @@ $CL = new PerlACE::Process ("client", " -k file://$iorfile"); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; diff --git a/TAO/tests/Muxed_GIOP_Versions/run_test.pl b/TAO/tests/Muxed_GIOP_Versions/run_test.pl index 6a85e18728d..7e5114ed218 100755 --- a/TAO/tests/Muxed_GIOP_Versions/run_test.pl +++ b/TAO/tests/Muxed_GIOP_Versions/run_test.pl @@ -55,7 +55,7 @@ print STDERR "***** Start the server*** \n" if $verbose; $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 50) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); exit 1; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl index bce3901f457..7795d86f341 100755 --- a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl +++ b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl @@ -29,9 +29,9 @@ $CL = new PerlACE::Process ("initiator", "-f $ior1file -g $ior2file"); $SV1->Spawn (); $SV2->Spawn (); -if (PerlACE::waitforfile_timed ($ior1file, 15) == -1) { +if (PerlACE::waitforfile_timed ($ior1file, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$ior1file>\n"; - $SV1->Kill (); + $SV1->Kill (); $SV2->Kill (); exit 1; } @@ -39,8 +39,8 @@ if (PerlACE::waitforfile_timed ($ior1file, 15) == -1) { if (PerlACE::waitforfile_timed ($ior2file, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$ior2file>\n"; - $SV2->Kill (); - $SV1->Kill (); + $SV2->Kill (); + $SV1->Kill (); exit 1; } diff --git a/TAO/tests/Oneway_Buffering/run_buffer_size.pl b/TAO/tests/Oneway_Buffering/run_buffer_size.pl index 4f3bd5c5037..4d0e92d3b51 100755 --- a/TAO/tests/Oneway_Buffering/run_buffer_size.pl +++ b/TAO/tests/Oneway_Buffering/run_buffer_size.pl @@ -30,7 +30,7 @@ my $CL = new PerlACE::Process ("client", $AD->Spawn (); -if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($admin_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$admin_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); exit 1; @@ -38,7 +38,7 @@ if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { $SV->Spawn (); -if (PerlACE::waitforfile_timed ($server_iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($server_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$server_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); $SV->Kill (); $SV->TimedWait (1); diff --git a/TAO/tests/Oneway_Buffering/run_message_count.pl b/TAO/tests/Oneway_Buffering/run_message_count.pl index 35e68a43b1a..9a986bd859a 100755 --- a/TAO/tests/Oneway_Buffering/run_message_count.pl +++ b/TAO/tests/Oneway_Buffering/run_message_count.pl @@ -30,7 +30,7 @@ my $CL = new PerlACE::Process ("client", $AD->Spawn (); -if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($admin_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$admin_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); exit 1; @@ -38,7 +38,7 @@ if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { $SV->Spawn (); -if (PerlACE::waitforfile_timed ($server_iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($server_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$server_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); $SV->Kill (); $SV->TimedWait (1); diff --git a/TAO/tests/Oneway_Buffering/run_test.pl b/TAO/tests/Oneway_Buffering/run_test.pl index 39c47eb20e3..7b4199b589b 100755 --- a/TAO/tests/Oneway_Buffering/run_test.pl +++ b/TAO/tests/Oneway_Buffering/run_test.pl @@ -26,7 +26,7 @@ foreach $test_type ("-c", "-t", "-b", "-r") { $AD->Spawn (); - if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { + if (PerlACE::waitforfile_timed ($admin_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$admin_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); exit 1; @@ -34,7 +34,7 @@ foreach $test_type ("-c", "-t", "-b", "-r") { $SV->Spawn (); - if (PerlACE::waitforfile_timed ($server_iorfile, 10) == -1) { + if (PerlACE::waitforfile_timed ($server_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$server_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); $SV->Kill (); $SV->TimedWait (1); diff --git a/TAO/tests/Oneway_Buffering/run_timeout.pl b/TAO/tests/Oneway_Buffering/run_timeout.pl index 6518696565e..e1431f4b20f 100755 --- a/TAO/tests/Oneway_Buffering/run_timeout.pl +++ b/TAO/tests/Oneway_Buffering/run_timeout.pl @@ -30,7 +30,7 @@ my $CL = new PerlACE::Process ("client", $AD->Spawn (); -if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($admin_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$admin_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); exit 1; @@ -38,7 +38,7 @@ if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { $SV->Spawn (); -if (PerlACE::waitforfile_timed ($server_iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($server_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$server_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); $SV->Kill (); $SV->TimedWait (1); diff --git a/TAO/tests/Oneway_Buffering/run_timeout_reactive.pl b/TAO/tests/Oneway_Buffering/run_timeout_reactive.pl index 061a524f4a6..bc45e7b3a45 100755 --- a/TAO/tests/Oneway_Buffering/run_timeout_reactive.pl +++ b/TAO/tests/Oneway_Buffering/run_timeout_reactive.pl @@ -29,7 +29,7 @@ my $CL = new PerlACE::Process ("client", $AD->Spawn (); -if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($admin_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$admin_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); exit 1; @@ -37,7 +37,7 @@ if (PerlACE::waitforfile_timed ($admin_iorfile, 10) == -1) { $SV->Spawn (); -if (PerlACE::waitforfile_timed ($server_iorfile, 10) == -1) { +if (PerlACE::waitforfile_timed ($server_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$server_iorfile>\n"; $AD->Kill (); $AD->TimedWait (1); $SV->Kill (); $SV->TimedWait (1); diff --git a/TAO/tests/Oneway_Timeouts/run_test.pl b/TAO/tests/Oneway_Timeouts/run_test.pl index 96eb971ccb5..b664ceed956 100755 --- a/TAO/tests/Oneway_Timeouts/run_test.pl +++ b/TAO/tests/Oneway_Timeouts/run_test.pl @@ -90,7 +90,7 @@ sub test_buffering if ($SRV->Spawn() != 0) { return 1; } - if (PerlACE::waitforfile_timed ($srv_ior, 15) != 0) { + if (PerlACE::waitforfile_timed ($srv_ior, $PerlACE::wait_interval_for_process_creation) != 0) { print STDERR "Error: IOR not found.\n"; return 1; } @@ -110,7 +110,7 @@ sub test_buffering if ($SRV->Spawn() != 0) { return 1; } - if (PerlACE::waitforfile_timed ($srv_ior, 15) != 0) { + if (PerlACE::waitforfile_timed ($srv_ior, $PerlACE::wait_interval_for_process_creation) != 0) { print STDERR "Error: IOR not found.\n"; return 1; } @@ -132,7 +132,7 @@ sub test_buffering if ($SRV->Spawn() != 0) { return 1; } - if (PerlACE::waitforfile_timed ($srv_ior, 15) != 0) { + if (PerlACE::waitforfile_timed ($srv_ior, $PerlACE::wait_interval_for_process_creation) != 0) { print STDERR "Error: IOR not found.\n"; return 1; } @@ -154,7 +154,7 @@ sub test_buffering if ($SRV->Spawn() != 0) { return 1; } - if (PerlACE::waitforfile_timed ($srv_ior, 15) != 0) { + if (PerlACE::waitforfile_timed ($srv_ior, $PerlACE::wait_interval_for_process_creation) != 0) { print STDERR "Error: IOR not found.\n"; return 1; } @@ -176,7 +176,7 @@ sub test_buffering if ($SRV->Spawn() != 0) { return 1; } - if (PerlACE::waitforfile_timed ($srv_ior, 15) != 0) { + if (PerlACE::waitforfile_timed ($srv_ior, $PerlACE::wait_interval_for_process_creation) != 0) { print STDERR "Error: IOR not found.\n"; return 1; } @@ -197,7 +197,7 @@ sub test_buffering if ($SRV->Spawn() != 0) { return 1; } - if (PerlACE::waitforfile_timed ($srv_ior, 15) != 0) { + if (PerlACE::waitforfile_timed ($srv_ior, $PerlACE::wait_interval_for_process_creation) != 0) { print STDERR "Error: IOR not found.\n"; return 1; } @@ -224,7 +224,7 @@ sub test_buffer_count_timeout if ($SRV->Spawn() != 0) { return 1; } - if (PerlACE::waitforfile_timed ($srv_ior, 15) != 0) { + if (PerlACE::waitforfile_timed ($srv_ior, $PerlACE::wait_interval_for_process_creation) != 0) { print STDERR "Error: IOR not found.\n"; return 1; } @@ -249,7 +249,7 @@ sub test_buffer_bytes_timeout if ($SRV->Spawn() != 0) { return 1; } - if (PerlACE::waitforfile_timed ($srv_ior, 15) != 0) { + if (PerlACE::waitforfile_timed ($srv_ior, $PerlACE::wait_interval_for_process_creation) != 0) { print STDERR "Error: IOR not found.\n"; return 1; } @@ -274,7 +274,7 @@ sub test_buffer_timeout if ($SRV->Spawn() != 0) { return 1; } - if (PerlACE::waitforfile_timed ($srv_ior, 15) != 0) { + if (PerlACE::waitforfile_timed ($srv_ior, $PerlACE::wait_interval_for_process_creation) != 0) { print STDERR "Error: IOR not found.\n"; return 1; } @@ -298,7 +298,7 @@ sub test_buffer_timeout if ($SRV->Spawn() != 0) { return 1; } - if (PerlACE::waitforfile_timed ($srv_ior, 15) != 0) { + if (PerlACE::waitforfile_timed ($srv_ior, $PerlACE::wait_interval_for_process_creation) != 0) { print STDERR "Error: IOR not found.\n"; return 1; } @@ -321,7 +321,7 @@ sub test_buffer_timeout if ($SRV->Spawn() != 0) { return 1; } - if (PerlACE::waitforfile_timed ($srv_ior, 15) != 0) { + if (PerlACE::waitforfile_timed ($srv_ior, $PerlACE::wait_interval_for_process_creation) != 0) { print STDERR "Error: IOR not found.\n"; return 1; } @@ -349,7 +349,7 @@ sub test_one_request if ($SRV->Spawn() != 0) { return 1; } - if (PerlACE::waitforfile_timed ($srv_ior, 15) != 0) { + if (PerlACE::waitforfile_timed ($srv_ior, $PerlACE::wait_interval_for_process_creation) != 0) { print STDERR "Error: IOR not found.\n"; return 1; } diff --git a/TAO/tests/Oneways_Invoking_Twoways/run_test.pl b/TAO/tests/Oneways_Invoking_Twoways/run_test.pl index 789c7cc2f50..44df936d9bf 100755 --- a/TAO/tests/Oneways_Invoking_Twoways/run_test.pl +++ b/TAO/tests/Oneways_Invoking_Twoways/run_test.pl @@ -38,7 +38,7 @@ if ($client1 != 0) { $status = 1; } -$server = $SV->TerminateWaitKill (5); +$server = $SV->TerminateWaitKill (15); if ($server != 0) { print STDERR "ERROR: server returned $server\n"; diff --git a/TAO/tests/Parallel_Connect_Strategy/run_test.pl b/TAO/tests/Parallel_Connect_Strategy/run_test.pl index 5624cc811c7..6bd0a69020c 100755 --- a/TAO/tests/Parallel_Connect_Strategy/run_test.pl +++ b/TAO/tests/Parallel_Connect_Strategy/run_test.pl @@ -8,8 +8,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; -$iorfile = PerlACE::LocalFile ("altiiop.ior"); -unlink $iorfile; +$iorbase = "altiiop.ior"; $status = 0; @bogus_eps = ("-orbendpoint iiop://localhost:10200/hostname_in_ior=126.0.0.123", "-orbendpoint iiop://localhost:10202/hostname_in_ior=126.0.0.124"); @@ -17,7 +16,15 @@ $valid_ep = "-orbendpoint iiop://localhost:10201"; $corbaloc = "corbaloc::126.0.0.123:10200,:localhost:10201,:126.0.0.124:10202/pcs_test"; -$SV_ALT_IIOP = new PerlACE::Process ("server", "-ORBUseSharedProfile 1 -o $iorfile $bogus_eps[0] $valid_ep $bogus_eps[1]"); +if (PerlACE::is_vxworks_test()) { + $iorfile = $iorbase; + $SV_ALT_IIOP = new PerlACE::ProcessVX ("server", "-ORBUseSharedProfile 1 -o $iorfile $bogus_eps[0] $valid_ep $bogus_eps[1]"); +} +else { + $iorfile = PerlACE::LocalFile ($iorbase); + $SV_ALT_IIOP = new PerlACE::Process ("server", "-ORBUseSharedProfile 1 -o $iorfile $bogus_eps[0] $valid_ep $bogus_eps[1]"); +} +unlink $iorfile; $CL_LF = new PerlACE::Process ("client", "-ORBuseParallelConnects 1 -k file://$iorfile"); $CL_CORBALOC = new PerlACE::Process ("client", "-ORBUseSharedProfile 1 -ORBuseParallelConnects 1 -k $corbaloc"); diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl index 8c30a9b74e1..2032857125b 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl @@ -12,10 +12,10 @@ $number_of_clients = 1; $status = 0; $continuous = ($^O eq 'hpux'); -@configurations = +@configurations = ( { - file => "ior_3", + file => "ior_3", description => "Invoking methods on servant in second RT thread pool (with lanes)", }, ); @@ -38,9 +38,9 @@ sub run_clients } for ($i = 0; $i < $clients; $i++) - { + { $client = $CL[$i]->WaitKill (120); - if ($client != 0) + if ($client != 0) { print STDERR "ERROR: client returned $client\n"; $status = 1; @@ -65,16 +65,16 @@ $SV->Spawn (); for $test (@configurations) { - if (PerlACE::waitforfile_timed ($test->{file}, 10) == -1) + if (PerlACE::waitforfile_timed ($test->{file}, $PerlACE::wait_interval_for_process_creation) == -1) { $server = $SV->TimedWait (1); - if ($server == 2) + if ($server == 2) { # Mark as no longer running to avoid errors on exit. $SV->{RUNNING} = 0; exit $status; - } - else + } + else { print STDERR "ERROR: cannot find ior file: $test->{file}\n"; $status = 1; @@ -82,13 +82,13 @@ for $test (@configurations) } } } - + for $test (@configurations) { print STDERR "\n*************************************************************\n"; print STDERR "$test->{description}\n"; print STDERR "*************************************************************\n\n"; - + run_clients ("-k file://".PerlACE::LocalFile($test->{file}), $number_of_clients); } @@ -102,7 +102,7 @@ kill_server: $server = $SV->WaitKill (5); -if ($server != 0) +if ($server != 0) { print STDERR "ERROR: server returned $server\n"; $status = 1; diff --git a/TAO/tests/RTCORBA/Linear_Priority/run_test.pl b/TAO/tests/RTCORBA/Linear_Priority/run_test.pl index e7022f70bde..9258e0539ca 100755 --- a/TAO/tests/RTCORBA/Linear_Priority/run_test.pl +++ b/TAO/tests/RTCORBA/Linear_Priority/run_test.pl @@ -11,50 +11,50 @@ use PerlACE::Run_Test; $status = 0; $iorfile = PerlACE::LocalFile("ior"); -@configurations = +@configurations = ( { - server => "-b empty_file -l empty_file", + server => "-b empty_file -l empty_file", client => "-b empty_file -p empty_file -x", }, { - server => "-b bands -l empty_file", + server => "-b bands -l empty_file", client => "-b empty_file -p empty_file -x", }, { - server => "-b empty_file -l lanes", + server => "-b empty_file -l lanes", client => "-b empty_file -p empty_file -x", }, { - server => "-b bands -l lanes", + server => "-b bands -l lanes", client => "-b empty_file -p empty_file -x", }, { - server => "-b empty_file -l empty_file", + server => "-b empty_file -l empty_file", client => "-b bands -p empty_file -x", }, { - server => "-b empty_file -l lanes", + server => "-b empty_file -l lanes", client => "-b bands -p empty_file -x", }, { - server => "-b empty_file -l empty_file", + server => "-b empty_file -l empty_file", client => "-b empty_file -p invocation_priorities -x", }, { - server => "-b bands -l empty_file", + server => "-b bands -l empty_file", client => "-b empty_file -p invocation_priorities -x", }, { - server => "-b bands -l lanes", + server => "-b bands -l lanes", client => "-b empty_file -p invocation_priorities -x", }, { - server => "-b empty_file -l empty_file", + server => "-b empty_file -l empty_file", client => "-b bands -p invocation_priorities -x", }, { - server => "-b empty_file -l lanes", + server => "-b empty_file -l lanes", client => "-b bands -p invocation_priorities -x", }, ); @@ -65,10 +65,10 @@ sub run_client $CL = new PerlACE::Process ("client", "-k file://$iorfile " . $arg); $CL->Spawn (); - + $client = $CL->WaitKill (120); - if ($client != 0) + if ($client != 0) { print STDERR "ERROR: client returned $client\n"; $status = 1; @@ -76,7 +76,7 @@ sub run_client } } -sub run_server +sub run_server { if (PerlACE::is_vxworks_test()) { $SV = new PerlACE::ProcessVX ("server", @_); @@ -88,7 +88,7 @@ sub run_server exit 1; } - if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) + if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { check_supported_priorities ($SV); print STDERR "ERROR: cannot find ior file: $iorfile\n"; @@ -100,8 +100,8 @@ sub run_server sub zap_server { $server = $SV->WaitKill (5); - - if ($server != 0) + + if ($server != 0) { print STDERR "ERROR: server returned $server\n"; $status = 1; @@ -135,7 +135,7 @@ for $test (@configurations) run_server ($test->{server}); run_client ($test->{client}); - + zap_server (0); } diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl index 6188bdd5a73..1f6905d4d44 100755 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl @@ -81,24 +81,24 @@ $fh = \*OLDERR; # Run server and client. $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { $server = $SV->TimedWait (1); - if ($server == 2) + if ($server == 2) { # Could not change priority levels so exit. - + # redirect STDOUT away from $data_file and set back to normal close (STDERR); close (STDOUT); open (STDOUT, ">&OLDOUT"); open (STDERR, ">&OLDERR"); - + # Mark as no longer running to avoid errors on exit. $SV->{RUNNING} = 0; exit $status; - } - else + } + else { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); @@ -107,8 +107,8 @@ if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) } $client = $CL->SpawnWaitKill (60); - -if ($client != 0) + +if ($client != 0) { print STDERR "ERROR: client returned $client\n"; $status = 1; @@ -116,7 +116,7 @@ if ($client != 0) $server = $SV->WaitKill (60); -if ($server != 0) +if ($server != 0) { print STDERR "ERROR: server returned $server\n"; $status = 1; @@ -134,20 +134,20 @@ print STDERR "\n********** Processing test output\n\n"; $errors = system ("perl process-output.pl $data_file $iterations $priority1 $priority2") >> 8; -if ($errors > 0) +if ($errors > 0) { $status = 1; - + if (!$quiet) { print STDERR "Errors Detected, printing output\n"; - if (open (DATA, "<$data_file")) + if (open (DATA, "<$data_file")) { print STDERR "================================= Begin\n"; print STDERR <DATA>; print STDERR "================================= End\n"; close (DATA); } - else + else { print STDERR "ERROR: Could not open $data_file\n"; } diff --git a/TAO/tests/RTCORBA/Private_Connection/run_test.pl b/TAO/tests/RTCORBA/Private_Connection/run_test.pl index 5ae2d22ba05..f54ae35555f 100755 --- a/TAO/tests/RTCORBA/Private_Connection/run_test.pl +++ b/TAO/tests/RTCORBA/Private_Connection/run_test.pl @@ -28,10 +28,10 @@ $CL = new PerlACE::Process ("client", "-o file://$iorfile1 -p file://$iorfile2 - $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile2, 10) == -1) +if (PerlACE::waitforfile_timed ($iorfile2, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile2>\n"; - $SV->Kill (); + $SV->Kill (); exit 1; } diff --git a/TAO/tests/Typedef_String_Array/run_test.pl b/TAO/tests/Typedef_String_Array/run_test.pl index 2684461a2a0..58c9c098860 100755 --- a/TAO/tests/Typedef_String_Array/run_test.pl +++ b/TAO/tests/Typedef_String_Array/run_test.pl @@ -24,7 +24,7 @@ $CL = new PerlACE::Process ('client', "-k file://$iorfile"); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, 20) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); exit 1; |