summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2011-11-01 11:13:42 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2011-11-01 11:13:42 +0000
commit20469946e0dc33c67f4603a4632c8ca786dae739 (patch)
tree933690d33a95071f6ae01be87bb12e34e7db7e14
parent87e545365f04df329013ad3e5c88b80f987e2916 (diff)
downloadATCD-20469946e0dc33c67f4603a4632c8ca786dae739.tar.gz
Fuzz
-rw-r--r--CIAO/tests/Collocation/README2
-rwxr-xr-xCIAO/tests/Collocation/descriptors/run_test.pl44
2 files changed, 23 insertions, 23 deletions
diff --git a/CIAO/tests/Collocation/README b/CIAO/tests/Collocation/README
index 9448e5facfc..56b3f857017 100644
--- a/CIAO/tests/Collocation/README
+++ b/CIAO/tests/Collocation/README
@@ -9,7 +9,7 @@ is build with -Sp (see Base.mpc),so collocation thru_poa is disabled.
The test runs with different CollocationStrategies, defined in the deploymentplans:
- PlanAllOnOneNoTP ( Sender and Receiver same process) with -ORBCollocationStrategy thru_poa:
- because thru_poa is disabled, we expect an internal exception.
+ because thru_poa is disabled, we expect an internal exception.
- PlanAllOnOne ( Sender and Receiver same process) with -ORBCollocationStrategy direct:
we expect collocation and because thru_poa is disabled, this must be direct collocation.
- PlanAllOnOneBest ( Sender and Receiver same process) with -ORBCollocationStrategy best:
diff --git a/CIAO/tests/Collocation/descriptors/run_test.pl b/CIAO/tests/Collocation/descriptors/run_test.pl
index cbace01d475..4d986a2291b 100755
--- a/CIAO/tests/Collocation/descriptors/run_test.pl
+++ b/CIAO/tests/Collocation/descriptors/run_test.pl
@@ -155,53 +155,53 @@ foreach $file (@files) {
print "Starting test for deployment $file\n";
# Invoke naming service
-
+
$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
+
$ns_status = $NS->Spawn ();
-
+
if ($ns_status != 0) {
print STDERR "ERROR: Unable to execute the naming service\n";
kill_open_processes ();
exit 1;
}
-
+
print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
+
if ($tg_naming->WaitForFileTimed ($ior_nsbase,
$tg_naming->ProcessStartWaitInterval ()) == -1) {
print STDERR "ERROR: cannot find naming service IOR file\n";
$NS->Kill (); $NS->TimedWait (1);
exit 1;
}
-
+
$ns_running = 1;
# Set up NamingService environment
$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-
+
# Invoke node daemon.
print "Invoking node daemon\n";
$status = run_node_daemons ();
-
+
if ($status != 0) {
print STDERR "ERROR: Unable to execute the node daemon\n";
kill_open_processes ();
exit 1;
}
-
+
$daemons_running = 1;
-
+
# Invoke execution manager.
print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
"-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
$em_status = $EM->Spawn ();
-
+
if ($em_status != 0) {
print STDERR "ERROR: dance_execution_manager returned $em_status";
exit 1;
}
-
+
if ($tg_exe_man->WaitForFileTimed ($ior_embase,
$tg_exe_man->ProcessStartWaitInterval ()) == -1) {
print STDERR
@@ -209,23 +209,23 @@ foreach $file (@files) {
kill_open_processes ();
exit 1;
}
-
+
$em_running = 1;
-
+
# Invoke executor - start the application -.
print "Invoking executor - launch the application -\n";
-
+
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 -l");
$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-
+
if ($pl_status != 0) {
print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
kill_open_processes ();
exit 1;
}
-
+
for ($i = 0; $i < $nr_daemon; ++$i) {
if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
$tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
@@ -234,23 +234,23 @@ foreach $file (@files) {
exit 1;
}
}
-
+
sleep (15);
-
+
# Invoke executor - stop the application -.
print "Invoking executor - shutting down -\n";
print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $file\n";
-
+
$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
"-k file://$ior_emfile -x $file -s");
$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
+
if ($pl_status != 0) {
print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
kill_open_processes ();
exit 1;
}
-
+
delete_ior_files ();
kill_open_processes ();
# Sleep for a couple seconds to make sure everything has a chance to shut down.