diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-04-09 09:45:54 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-04-09 09:45:54 +0000 |
commit | 4226a8dc457de446a795eb39836291ab43f2ed75 (patch) | |
tree | 6159f4c3382ee697c5c1742e405316e534df2146 | |
parent | eee9159cc707d971c4374236edd8492aab35de5e (diff) | |
download | ATCD-4226a8dc457de446a795eb39836291ab43f2ed75.tar.gz |
Fri Apr 9 09:46:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl
* DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl
* DAnCE/tests/CIAO/EM-Redeployment/run_test.pl
* DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl
* DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl
* DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl
* DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl
* DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl
* examples/BasicSP/descriptors/run_test.pl
* examples/Hello/descriptors/run_test.pl
* examples/Hello/descriptors/run_test_alias.pl
* examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl
* examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl
* examples/Hello/descriptors/run_test_without_ns.pl
* examples/Null_Component/descriptors/run_test.pl
* examples/Null_Component/descriptors/run_test_without_ns.pl
* examples/Null_Component_Glfa/descriptors/run_test.pl
* tests/Bug_2130_Regression/descriptors/run_test.pl
* tests/Bug_3769_Regression/descriptors/run_test.pl
* tests/Bug_3834_Regression/descriptors/run_test.pl
* tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl
* tests/CIAO_ComponentServer/Local_Facet/run_test.pl
* tests/CIAO_ComponentServer/SimpleComponent/run_test.pl
Don't change tracing flags
24 files changed, 32 insertions, 82 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 34b4d66c957..009af748bbc 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,30 @@ +Fri Apr 9 09:46:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl + * DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl + * DAnCE/tests/CIAO/EM-Redeployment/run_test.pl + * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl + * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl + * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl + * DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl + * DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl + * examples/BasicSP/descriptors/run_test.pl + * examples/Hello/descriptors/run_test.pl + * examples/Hello/descriptors/run_test_alias.pl + * examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl + * examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl + * examples/Hello/descriptors/run_test_without_ns.pl + * examples/Null_Component/descriptors/run_test.pl + * examples/Null_Component/descriptors/run_test_without_ns.pl + * examples/Null_Component_Glfa/descriptors/run_test.pl + * tests/Bug_2130_Regression/descriptors/run_test.pl + * tests/Bug_3769_Regression/descriptors/run_test.pl + * tests/Bug_3834_Regression/descriptors/run_test.pl + * tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl + * tests/CIAO_ComponentServer/Local_Facet/run_test.pl + * tests/CIAO_ComponentServer/SimpleComponent/run_test.pl + Don't change tracing flags + Fri Apr 9 08:48:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * ciao/Servants/Connector_Servant_Impl_Base.cpp: diff --git a/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl b/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl index 280d1b0bfdd..94c3db98878 100755 --- a/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl +++ b/CIAO/DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl @@ -45,9 +45,6 @@ $nofail_plan = 'SimpleNoFailure.cdp'; $status = 0; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # naming service $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; diff --git a/CIAO/DAnCE/tests/CIAO/EM-Redeployment/run_test.pl b/CIAO/DAnCE/tests/CIAO/EM-Redeployment/run_test.pl index 75cac79f4ce..99e496d43e4 100755 --- a/CIAO/DAnCE/tests/CIAO/EM-Redeployment/run_test.pl +++ b/CIAO/DAnCE/tests/CIAO/EM-Redeployment/run_test.pl @@ -44,9 +44,6 @@ $tg_executor = 0; $status = 0; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # naming service $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; diff --git a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl index 818f6447887..94f6f0012a0 100755 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl +++ b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl @@ -42,9 +42,6 @@ $tg_executor = 0; $status = 0; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # naming service $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; diff --git a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl index 66db78dc487..7b06055dcf4 100755 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl +++ b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl @@ -43,9 +43,6 @@ $tg_convert_plan = 0; $status = 0; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # naming service $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl index f7c32cc1cbd..71c656d841b 100755 --- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl +++ b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl @@ -46,9 +46,6 @@ $tg_executor = 0; $status = 0; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # naming service $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; @@ -87,7 +84,7 @@ sub delete_ior_files { for ($i = 0; $i < $nr_daemon; ++$i) { $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); } - + $tg_executor->DeleteFile ($ior_applicationbase); $tg_executor->DeleteFile ($ior_ambase); } diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl index c3fcfd77a92..8c09290d6dc 100755 --- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl +++ b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl @@ -47,9 +47,6 @@ $tg_convert_plan = 0; $status = 0; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # naming service $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; @@ -65,7 +62,7 @@ sub create_targets { # executor (plan_launcher) $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; #$tg_executor->AddLibPath ('..'); - + $tg_convert_plan = PerlACE::TestTarget::create_target (1) || die "Could not create target for convert plan\n"; } @@ -77,7 +74,7 @@ sub init_ior_files { } $ior_application = $tg_executor->LocalFile ($ior_applicationbase); $ior_am = $tg_executor->LocalFile ($ior_ambase); - + delete_ior_files (); } @@ -188,7 +185,7 @@ foreach $file (@files) { } $daemons_running = 1; - + print "Converting plan to CDR representation\n"; $cdr_planbase = "$file" . ".cdr"; $cdr_plan = $tg_convert_plan->LocalFile ($cdr_planbase); @@ -196,7 +193,7 @@ foreach $file (@files) { "-x $file -o $cdr_plan"); $convert->Spawn (); - + if ($tg_convert_plan->WaitForFileTimed ($cdr_planbase, 30) == -1) { print STDERR "ERROR: Convert Plan failed to output $cdr_plan.\n"; diff --git a/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl b/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl index add2c820d83..c06d1ad5bcf 100755 --- a/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl +++ b/CIAO/DAnCE/tests/CIAO/Progressive_Deployments/run_test.pl @@ -44,9 +44,6 @@ $tg_naming = 0; $tg_exe_man = 0; $tg_executor = 0; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # naming service $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl index 74891441e79..63828079c7c 100755 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/descriptors/run_test.pl @@ -46,9 +46,6 @@ $tg_naming = 0; $tg_exe_man = 0; $tg_executor = 0; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # naming service $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; diff --git a/CIAO/examples/BasicSP/descriptors/run_test.pl b/CIAO/examples/BasicSP/descriptors/run_test.pl index 039d8a2cefd..9c8519a60af 100755 --- a/CIAO/examples/BasicSP/descriptors/run_test.pl +++ b/CIAO/examples/BasicSP/descriptors/run_test.pl @@ -46,9 +46,6 @@ $tg_naming = 0; $tg_exe_man = 0; $tg_executor = 0; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # naming service $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; diff --git a/CIAO/examples/Hello/descriptors/run_test.pl b/CIAO/examples/Hello/descriptors/run_test.pl index f04b61977fe..d54efbaa8ff 100755 --- a/CIAO/examples/Hello/descriptors/run_test.pl +++ b/CIAO/examples/Hello/descriptors/run_test.pl @@ -46,9 +46,6 @@ $tg_naming = 0; $tg_exe_man = 0; $tg_executor = 0; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # naming service $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; diff --git a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl index 9bab32d7c69..b111f22402b 100755 --- a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl +++ b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl @@ -40,9 +40,6 @@ $EM = 0; $tg_exe_man = 0; $tg_executor = 0; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # daemon for ($i = 0; $i < $daemons; ++$i) { diff --git a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl index e23c532affa..4f095cab002 100755 --- a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl +++ b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl @@ -40,9 +40,6 @@ $EM = 0; $tg_exe_man = 0; $tg_executor = 0; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # daemon for ($i = 0; $i < $daemons; ++$i) { diff --git a/CIAO/examples/Hello/descriptors/run_test_alias.pl b/CIAO/examples/Hello/descriptors/run_test_alias.pl index 4c94292d889..49b76becb98 100755 --- a/CIAO/examples/Hello/descriptors/run_test_alias.pl +++ b/CIAO/examples/Hello/descriptors/run_test_alias.pl @@ -46,9 +46,6 @@ $tg_naming = 0; $tg_exe_man = 0; $tg_executor = 0; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # naming service $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; diff --git a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl index d05a213cacd..8208f174e41 100755 --- a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl +++ b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl @@ -40,9 +40,6 @@ $EM = 0; $tg_exe_man = 0; $tg_executor = 0; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # daemon for ($i = 0; $i < $daemons; ++$i) { diff --git a/CIAO/examples/Null_Component/descriptors/run_test.pl b/CIAO/examples/Null_Component/descriptors/run_test.pl index cc7cc6a72c9..1c854d88e2b 100755 --- a/CIAO/examples/Null_Component/descriptors/run_test.pl +++ b/CIAO/examples/Null_Component/descriptors/run_test.pl @@ -42,9 +42,6 @@ $tg_executor = 0; $status = 0; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # naming service $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; diff --git a/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl b/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl index 109961d44fb..f56f270b47d 100755 --- a/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl +++ b/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl @@ -41,9 +41,6 @@ $tg_executor = 0; $status = 0; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # daemon for ($i = 0; $i < $nr_daemon; ++$i) { diff --git a/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl b/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl index cc7cc6a72c9..1c854d88e2b 100755 --- a/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl +++ b/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl @@ -42,9 +42,6 @@ $tg_executor = 0; $status = 0; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # naming service $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; diff --git a/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl b/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl index f5ba8f6b033..d31d6f9c562 100755 --- a/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl +++ b/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl @@ -38,9 +38,6 @@ $status = 0; $dat_file = "TestNodeManagerMap.dat"; $cdp_file = "DeploymentPlan.cdp"; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # daemon for ($i = 0; $i < $nr_daemon; ++$i) { diff --git a/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl b/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl index e69165188a4..24b9dc6ec27 100755 --- a/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl +++ b/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl @@ -44,9 +44,6 @@ $tg_executor = 0; $status = 0; $cdp_file = "DeploymentPlan.cdp"; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # naming service $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; diff --git a/CIAO/tests/Bug_3834_Regression/descriptors/run_test.pl b/CIAO/tests/Bug_3834_Regression/descriptors/run_test.pl index cc7cc6a72c9..1c854d88e2b 100755 --- a/CIAO/tests/Bug_3834_Regression/descriptors/run_test.pl +++ b/CIAO/tests/Bug_3834_Regression/descriptors/run_test.pl @@ -42,9 +42,6 @@ $tg_executor = 0; $status = 0; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # naming service $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; diff --git a/CIAO/tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl b/CIAO/tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl index 462208e5299..72c6fee30b6 100755 --- a/CIAO/tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl +++ b/CIAO/tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl @@ -41,9 +41,6 @@ $tg_executor = 0; $status = 0; -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - sub create_targets { # daemon for ($i = 0; $i < $nr_daemon; ++$i) { diff --git a/CIAO/tests/CIAO_ComponentServer/Local_Facet/run_test.pl b/CIAO/tests/CIAO_ComponentServer/Local_Facet/run_test.pl index d9230ece23b..e0a8860f709 100755 --- a/CIAO/tests/CIAO_ComponentServer/Local_Facet/run_test.pl +++ b/CIAO/tests/CIAO_ComponentServer/Local_Facet/run_test.pl @@ -11,13 +11,6 @@ use PerlACE::TestTarget; $status = 0; $ciao_root = "$ENV{CIAO_ROOT}"; -foreach $i (@ARGV) { - if ($i eq '-debug') { - $ENV{"DANCE_TRACE_ENABLE"} = 1; - $ENV{"CIAO_TRACE_ENABLE"} = 1; - } -} - my $target = PerlACE::TestTarget::create_target (1); $TG = $target->CreateProcess ("client", "-s $ciao_root/bin/ciao_componentserver -d 120"); diff --git a/CIAO/tests/CIAO_ComponentServer/SimpleComponent/run_test.pl b/CIAO/tests/CIAO_ComponentServer/SimpleComponent/run_test.pl index d9230ece23b..e0a8860f709 100755 --- a/CIAO/tests/CIAO_ComponentServer/SimpleComponent/run_test.pl +++ b/CIAO/tests/CIAO_ComponentServer/SimpleComponent/run_test.pl @@ -11,13 +11,6 @@ use PerlACE::TestTarget; $status = 0; $ciao_root = "$ENV{CIAO_ROOT}"; -foreach $i (@ARGV) { - if ($i eq '-debug') { - $ENV{"DANCE_TRACE_ENABLE"} = 1; - $ENV{"CIAO_TRACE_ENABLE"} = 1; - } -} - my $target = PerlACE::TestTarget::create_target (1); $TG = $target->CreateProcess ("client", "-s $ciao_root/bin/ciao_componentserver -d 120"); |