diff options
14 files changed, 78 insertions, 26 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl index 2495144eff1..90322ac6860 100755 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl @@ -33,7 +33,9 @@ print STDERR "\nReceiver 1 --> Receiver 2 --> Distributer --> Sender\n\n"; print STDERR "Starting Naming Service\n"; -$NS->Spawn (); +if ($NS->Spawn () == -1) { + exit 1; +} if (PerlACE::waitforfile_timed ($nsior, 10) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl index 529d858e1b0..ddd33ac5d58 100755 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl @@ -32,7 +32,9 @@ $CL = new PerlACE::Process ("ftp", "-ORBSvcConf components_svc$PerlACE::svcconf print STDERR "Starting Naming Service\n"; -$NS->Spawn (); +if ($NS->Spawn () == -1) { + exit 1; +} if (PerlACE::waitforfile_timed ($nsior, 15) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl index bbc47d41b8a..73fcc6e8f30 100755 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl @@ -30,7 +30,9 @@ $CL = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -f $i print STDERR "Starting Naming Service\n"; -$NS->Spawn (); +if ($NS->Spawn () == -1) { + exit 1; +} if (PerlACE::waitforfile_timed ($nsior, 5) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl index d8bde72c0f5..bb24ced8125 100755 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl @@ -61,7 +61,9 @@ $NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior print STDERR "Starting Naming Service\n"; -$NS->Spawn (); +if ($NS->Spawn () == -1) { + exit 1; +} if (PerlACE::waitforfile_timed ($nsior, 100) == -1) { diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl index a0f5568f540..79a85b158eb 100755 --- a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl @@ -78,7 +78,9 @@ $Naming = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $namingior"); unlink $namingior; -$Naming->Spawn (); +if ($Naming->Spawn () == -1) { + exit 1; +} if (PerlACE::waitforfile_timed ($namingior, $startup_timeout) == -1) { print STDERR "ERROR: waiting for the naming service to start\n"; @@ -96,20 +98,20 @@ for $config (@test_configs) "-ORBSvcConf $config"); unlink $notifyior; $Notification->Spawn (); - + if (PerlACE::waitforfile_timed ($notifyior, $startup_timeout) == -1) { print STDERR "ERROR: waiting for the notify service to start\n"; $Notification->Kill (); $Naming->Kill (); exit 1; } - + for $name (@tests) { ## The MaxQueueLength and MaxEventsPerConsumer are not supported in the Reactive ## configuration, so we skip this test for now. ## The Notification should actually throw an exception for the property not supported. - if ($name->{name} eq "AdminProperties" + if ($name->{name} eq "AdminProperties" && ($config eq "notify.reactive.conf" || $config eq "notify.rt.conf")) { next; @@ -123,13 +125,13 @@ for $config (@test_configs) $status = $test->WaitKill ($experiment_timeout); - if ($status != 0) + if ($status != 0) { print STDERR "ERROR: $name returned $status\n"; break; } } - + $Notification->Kill (); } diff --git a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl index d2c6c3d90cc..aa518f5ef55 100755 --- a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl @@ -30,8 +30,14 @@ $STC = new PerlACE::Process ("Structured_Consumer"); $client_args = "-ORBInitRef NameService=iioploc://localhost:" . "$port/NameService"; -$NS->Spawn (); -$TS->Spawn (); +if ($NS->Spawn () == -1) { + exit 1; +} + +if ($TS->Spawn () == -1) { + $NS->Kill (); + exit 1; +} if (PerlACE::waitforfile_timed ($notifyior, 20) == -1) { print STDERR "ERROR: waiting for the notify service to start\n"; diff --git a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl index c3f97a44a0e..14bb76f5564 100755 --- a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl @@ -47,8 +47,14 @@ $SEC = new PerlACE::Process ("Sequence_Consumer"); $client_args = "-ORBInitRef NameService=iioploc://localhost:" . "$port/NameService"; -$NS->Spawn (); -$TS->Spawn (); +if ($NS->Spawn () == -1) { + exit 1; +} + +if ($TS->Spawn () == -1) { + $NS->Kill (); + exit 1; +} if (PerlACE::waitforfile_timed ($notifyior, 20) == -1) { print STDERR "ERROR: waiting for the notify service to start\n"; diff --git a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl index 7d47e3d10ad..f484f45ddbe 100755 --- a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl @@ -37,7 +37,9 @@ $Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$s #$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf -ORBDebugLevel 1"; unlink $naming_ior; -$Naming->Spawn (); +if ($Naming->Spawn () == -1) { + exit 1; +} if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) { print STDERR "ERROR: waiting for the naming service to start\n"; diff --git a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl index 9c98034a9d0..14d607abc42 100755 --- a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl @@ -47,8 +47,14 @@ $SEC = new PerlACE::Process ("Sequence_Consumer"); $client_args = "-ORBInitRef NameService=iioploc://localhost:" . "$port/NameService"; -$NS->Spawn (); -$TS->Spawn (); +if ($NS->Spawn () == -1) { + exit 1; +} + +if ($TS->Spawn () == -1) { + $NS->Kill (); + exit 1; +} if (PerlACE::waitforfile_timed ($notifyior, 20) == -1) { print STDERR "ERROR: waiting for the notify service to start\n"; @@ -92,7 +98,7 @@ for($i = 0; $i <= $#policies; $i++) { } ## // pradeep: commented out priority policies temporarily till the sequences implementation is fixed. -@policies_seq = ("fifo"); +@policies_seq = ("fifo"); if ($status == 0) { for($i = 0; $i <= $#policies_seq; $i++) { diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl b/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl index 8d964e69644..58a5e109748 100755 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl @@ -77,7 +77,9 @@ if ($verbose eq "-v") {print "TEST SCRIPT: Starting Notify Service on port $noti $NS->Arguments($ns_args); if ($verbose eq "-v") {print "TEST SCRIPT: " . $NS->CommandLine . "\n";} print $NS->CommandLine (); -$NS->Spawn(); +if ($NS->Spawn() == -1) { + exit 1; +} # the ior file is only used to wait for the service to start if (PerlACE::waitforfile_timed ($notify_ior, 10) == -1) { diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl index 7e18cde92f8..5f25db11995 100755 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl @@ -30,8 +30,14 @@ $SEC = new PerlACE::Process ("Sequence_Consumer"); $client_args = "-ORBInitRef NameService=iioploc://localhost:" . "$port/NameService"; -$NS->Spawn (); -$TS->Spawn (); +if ($NS->Spawn () == -1) { + exit 1; +} + +if ($TS->Spawn () == -1) { + $NS->Kill (); + exit 1; +} if (PerlACE::waitforfile_timed ($notifyior, 20) == -1) { print STDERR "ERROR: waiting for the notify service to start\n"; diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl index 095235dd559..2079ccd1d2f 100755 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl @@ -30,8 +30,14 @@ $SEC = new PerlACE::Process ("Sequence_Consumer"); $client_args = "-ORBInitRef NameService=iioploc://localhost:" . "$port/NameService"; -$NS->Spawn (); -$TS->Spawn (); +if ($NS->Spawn () == -1) { + exit 1; +} + +if ($TS->Spawn () == -1) { + $NS->Kill (); + exit 1; +} if (PerlACE::waitforfile_timed ($notifyior, 20) == -1) { print STDERR "ERROR: waiting for the notify service to start\n"; diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl index 739b6e0326a..88a1689e86c 100755 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl @@ -32,8 +32,14 @@ $cargs = "-f -n100 -c2 "; print "*************** Running Structured Client Filter Test ****************\n"; # Start Naming Service -$NS->Spawn (); -$TS->Spawn (); +if ($NS->Spawn () == -1) { + exit 1; +} + +if ($TS->Spawn () == -1) { + $NS->Kill (); + exit 1; +} sleep 2; diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl index d5c758f77b3..9314ad0aacd 100755 --- a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl @@ -35,7 +35,9 @@ $Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$s #$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf -ORBDebugLevel 1"; unlink $naming_ior; -$Naming->Spawn (); +if ($Naming->Spawn () == -1) { + exit 1; +} if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) { print STDERR "ERROR: waiting for the naming service to start\n"; |