Wed Dec 9 15:53:16 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * examples/BasicSP/descriptors/run_test.pl:
        * examples/Null_Component/descriptors/run_test.pl:
          Resolved fuzz errors/warnings.

3 files changed, 106 insertions, 56 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 1f9f8c3dd87..5f7fc20ea06 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec  9 15:53:16 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/BasicSP/descriptors/run_test.pl:
+        * examples/Null_Component/descriptors/run_test.pl:
+          Resolved fuzz errors/warnings.
+
 Wed Dec  9 15:01:48 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
diff --git a/CIAO/examples/BasicSP/descriptors/run_test.pl b/CIAO/examples/BasicSP/descriptors/run_test.pl
index 4b1d63dfb16..7abeb3551c3 100755
--- a/CIAO/examples/BasicSP/descriptors/run_test.pl
+++ b/CIAO/examples/BasicSP/descriptors/run_test.pl
@@ -78,13 +78,13 @@ sub init_ior_files {
 sub delete_ior_files {
     for ($i = 0; $i < $daemons; ++$i) {
         $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
+        $tg_daemons[$i]->DeleteFile ("rategen.ior");
     }
     $tg_naming->DeleteFile ($ior_nsbase);
     $tg_exe_man->DeleteFile ($ior_embase);
     for ($i = 0; $i < $daemons; ++$i) {
         $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
     }
-    unlink PerlACE::LocalFile ("rategen.ior");
 }
 
 sub kill_node_daemons {
diff --git a/CIAO/examples/Null_Component/descriptors/run_test.pl b/CIAO/examples/Null_Component/descriptors/run_test.pl
index 5d9e800f2e5..9ed9e0bd6ce 100755
--- a/CIAO/examples/Null_Component/descriptors/run_test.pl
+++ b/CIAO/examples/Null_Component/descriptors/run_test.pl
@@ -6,81 +6,128 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::Run_Test;
+use PerlACE::TestTarget;
 
 $CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
 $TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$DAnCE = "$ENV{'DANCE_ROOT'}";
+$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
+
 $daemons_running = 0;
 $em_running = 0;
 $ns_running = 0;
-$daemons = 1;
+
+$nr_daemon = 1;
 @ports = ( 60001 );
-@iorfiles = ( "NodeApp1.ior" );
+@iorbases = ( "NodeApp1.ior" );
+@iorfiles = 0;
 @nodenames = ( "NodeOne" );
+
+# ior files other than daemon
+$ior_nsbase = "ns.ior";
+$ior_nsfile = 0;
+$ior_embase = "EM.ior";
+$ior_emfile = 0;
+
+#  Processes
+$E = 0;
+$EM = 0;
+$NS = 0;
+@DEAMONS = 0;
+
+# targets
+@tg_daemons = 0;
+$tg_naming = 0;
+$tg_exe_man = 0;
+$tg_executor = 0;
+
 $status = 0;
+$cdp_file = "";
 $dat_file = "NodeMap.dat";
 
 PerlACE::add_lib_path ('..');
+$ENV{"DANCE_TRACE_ENABLE"} = 0;
+$ENV{"CIAO_TRACE_ENABLE"} = 0;
 
-$nsior = PerlACE::LocalFile ("ns.ior");
 
-$E = 0;
-$EM = 0;
-$retval = 0;
+sub create_targets {
+    #   naming service
+    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
+
+    #   daemon
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $i failed\n";
+    }
+    #   execution manager
+    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
+    #   executor (plan_launcher)
+    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
+}
+
+sub init_ior_files {
+    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
+    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
+    }
+    delete_ior_files ();
+}
 
 # Delete if there are any .ior files.
 sub delete_ior_files {
-    for ($i = 0; $i < $daemons; ++$i) {
-        unlink $iorfiles[$i];
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
+    }
+    $tg_naming->DeleteFile ($ior_nsbase);
+    $tg_exe_man->DeleteFile ($ior_embase);
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
     }
-    unlink PerlACE::LocalFile ("EM.ior");
-    unlink PerlACE::LocalFile ("DAM.ior");
-    unlink PerlACE::LocalFile ("ns.ior");
 }
 
-sub kill_node_daemons {
-    for ($i = 0; $i < $daemons; ++$i) {
-        $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1);
+sub kill_node_daemon {
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
     }
 }
 
 sub kill_open_processes {
     if ($daemons_running == 1) {
-        kill_node_daemons ();
+        kill_node_daemon ();
     }
 
     if ($em_running == 1) {
-        $EM->Kill ();
-        $EM->TimedWait (1);
+        $EM->Kill (); $EM->TimedWait (1);
     }
 
     if ($ns_running == 1) {
-        $NS->Kill ();
-        $NS->TimedWait (1);
+        $NS->Kill (); $NS->TimedWait (1);
     }
 }
 
+
 sub run_node_daemons {
-    for ($i = 0; $i < $daemons; ++$i) {
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $iorbase = $iorbases[$i];
         $iorfile = $iorfiles[$i];
         $port = $ports[$i];
         $nodename = $nodenames[$i];
         $iiop = "iiop://localhost:$port";
         $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
 
-        $d_cmd = "$DAnCE/bin/dance_node_manager";
+        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
         $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService --instance-nc corbaloc:rir:/NameService";
 
-        $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
-        $Daemons[$i]->Spawn ();
+        print "Run dance_node_manager with $d_param\n";
+
+        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
+        $DEAMONS[$i]->Spawn ();
 
-        if (PerlACE::waitforfile_timed ($iorfile,
-                                        30) == -1) {
+        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
+                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
             print STDERR
-                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
+              "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
             for (; $i >= 0; --$i) {
-                $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1);
+                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
             }
             return -1;
         }
@@ -97,28 +144,30 @@ else {
     @files = @ARGV;
 }
 
+create_targets ();
+init_ior_files ();
+
 foreach $file (@files) {
     print "Starting test for deployment $file\n";
-    delete_ior_files ();
 
     print STDERR "Starting Naming Service\n";
 
-    $NS = new PerlACE::Process ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 0 -ORBEndpoint iiop://localhost:60003 -o ns.ior");
+    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 0 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
     $NS->Spawn ();
 
-    if (PerlACE::waitforfile_timed ($nsior, $PerlACE::wait_interval_for_process_creation) == -1) {
+    if ($tg_naming->WaitForFileTimed ($ior_nsbase,
+                                      $tg_naming->ProcessStartWaitInterval ()) == -1) {
         print STDERR "ERROR: cannot find naming service IOR file\n";
-        $NS->Kill ();
+        $NS->Kill (); $NS->TimedWait (1);
         exit 1;
     }
-    $ns_running = 1;
 
+    $ns_running = 1;
     # Set up NamingService environment
     $ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
 
-
-    # Invoke node daemons.
-    print "Invoking node daemons\n";
+    # Invoke node daemon.
+    print "Invoking node daemon\n";
     $status = run_node_daemons ();
 
     if ($status != 0) {
@@ -131,14 +180,14 @@ foreach $file (@files) {
 
     # Invoke execution manager.
     print "Invoking execution manager\n";
-    $EM = new PerlACE::Process ("$DAnCE/bin/dance_execution_manager",
-                                "-eEM.ior --domain-nc corbaloc:rir:/NameService");
+    $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
+                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
     $EM->Spawn ();
 
-    if (PerlACE::waitforfile_timed ("EM.ior",
-                                    $PerlACE::wait_interval_for_process_creation) == -1) {
+    if ($tg_exe_man->WaitForFileTimed ($ior_embase,
+                                    $tg_exe_man->ProcessStartWaitInterval ()) == -1) {
         print STDERR
-            "ERROR: The ior file of execution manager could not be found\n";
+          "ERROR: The ior file of execution manager could not be found\n";
         kill_open_processes ();
         exit 1;
     }
@@ -146,23 +195,18 @@ foreach $file (@files) {
     $em_running = 1;
 
     # Invoke executor - start the application -.
-    print "Invoking executor - start the application -\n";
-    $E = new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher",
-                                "-x $file -k file://EM.ior");
-
-    $E->SpawnWaitKill (60);
+    print "Invoking executor - launch the application -\n";
 
-    if ($status != 0)
-    {
-        print "ERROR: dance_plan_launcher returned an error code while deploying $file\n";
-        $retval = -1;
-    }
+    print "Start dance_plan_launcher.exe with -x $file -k file://$ior_emfile\n";
+    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
+                            "-x $file -k file://$ior_emfile");
+    $E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ());
 
     # Invoke executor - stop the application -.
     print "Invoking executor - stop the application -\n";
-    $E = new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher",
-                                "-k file://EM.ior -x $file -q");
-    $E->SpawnWaitKill (60);
+    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
+                            "-k file://$ior_emfile -x $file -q");
+    $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
 
     print "Executor returned.\n";