diff options
Diffstat (limited to 'TAO/CIAO/examples/Hello/descriptors/run_test.pl')
-rwxr-xr-x | TAO/CIAO/examples/Hello/descriptors/run_test.pl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/TAO/CIAO/examples/Hello/descriptors/run_test.pl b/TAO/CIAO/examples/Hello/descriptors/run_test.pl index cfb0e0e9e49..1e3917dffa9 100755 --- a/TAO/CIAO/examples/Hello/descriptors/run_test.pl +++ b/TAO/CIAO/examples/Hello/descriptors/run_test.pl @@ -38,7 +38,7 @@ sub delete_ior_files { unlink PerlACE::LocalFile ("Receiver.ior"); unlink PerlACE::LocalFile ("Sender.ior"); unlink PerlACE::LocalFile ("DAM.ior"); - unlink PerlACE::LocalFile ("ns.ior"); + unlink PerlACE::LocalFile ("ns.ior"); } sub kill_node_daemons { @@ -56,11 +56,11 @@ sub kill_open_processes { $EM->Kill (); $EM->TimedWait (1); } - + if ($ns_running == 1) { $NS->Kill (); $NS->TimedWait (1); - } + } } @@ -135,7 +135,7 @@ if (PerlACE::waitforfile_timed ("EM.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of execution manager could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } @@ -146,21 +146,21 @@ print "Invoking executor - start the application -\n"; $E = new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher", "-p flattened_deploymentplan.cdp -k file://EM.ior -o DAM.ior"); - + $E->SpawnWaitKill (5000); if (PerlACE::waitforfile_timed ( "Receiver.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of receiver could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } if (PerlACE::waitforfile_timed ("Sender.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of sender could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } |