From 90bc38ea5a216e6e7efd8c5e2f19bf533d44c48d Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Wed, 2 Aug 2006 21:38:18 +0000 Subject: Wed Aug 2 21:32:27 UTC 2006 Adam Mitz --- TAO/ChangeLog | 14 ++++++++++++++ TAO/orbsvcs/examples/ImR/Advanced/run_test.pl | 6 +++--- TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl | 4 ++-- TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl | 13 +++---------- TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl | 5 +---- TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl | 3 --- 6 files changed, 23 insertions(+), 22 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 5f71b22a8d7..12dda2c0178 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,17 @@ +Wed Aug 2 21:32:27 UTC 2006 Adam Mitz + + * orbsvcs/examples/ImR/Advanced/run_test.pl: + * orbsvcs/tests/CosEvent/Timeout/run_test.pl: + * orbsvcs/tests/ImplRepo/scale/run_test.pl: + * orbsvcs/tests/Notify/Reconnecting/run_test.pl: + * orbsvcs/tests/Notify/XML_Persistence/run_test.pl: + + In each case, the Perl scripts were depending on the fact that + $TAO_ROOT and $ACE_ROOT/TAO were the same value. These changes + make use of the new $PerlACE::TAO_ROOT variable so that the tests + will run when $TAO_ROOT is not $ACE_ROOT/TAO but still assume that + $TAO_ROOT is $ACE_ROOT/TAO if $TAO_ROOT is not set. + Wed Aug 2 20:15:37 UTC 2006 Adam Mitz * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp: diff --git a/TAO/orbsvcs/examples/ImR/Advanced/run_test.pl b/TAO/orbsvcs/examples/ImR/Advanced/run_test.pl index ff25de6d125..0025c8d1fc9 100755 --- a/TAO/orbsvcs/examples/ImR/Advanced/run_test.pl +++ b/TAO/orbsvcs/examples/ImR/Advanced/run_test.pl @@ -137,7 +137,7 @@ sub start_imr # Start the IMR Service unlink "implrepo.ior"; $IMPL = new PerlACE::Process( - "$ENV{ACE_ROOT}/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service", + "$PerlACE::TAO_ROOT/orbsvcs/ImplRepo_Service/ImplRepo_Service", $IMR_CMD); $IMPL->Spawn(); PerlACE::waitforfile_timed("implrepo.ior", 10); @@ -156,7 +156,7 @@ sub kill_imr $tool_params = "$tool_params -a"; } - my $TOOL = new PerlACE::Process("$ENV{ACE_ROOT}/bin/tao_imr", $tool_params); + my $TOOL = new PerlACE::Process("$PerlACE::ACE_ROOT/bin/tao_imr", $tool_params); $TOOL->IgnoreExeSubDir(1); $TOOL->SpawnWaitKill(5); @@ -220,7 +220,7 @@ sub start_activator # Start the Activator unlink "activator.ior"; $ACT = new PerlACE::Process( - "$ENV{ACE_ROOT}/TAO/orbsvcs/ImplRepo_Service/ImR_Activator", + "$PerlACE::TAO_ROOT/orbsvcs/ImplRepo_Service/ImR_Activator", $ACT_CMD); $ACT->Spawn(); PerlACE::waitforfile_timed("activator.ior", 5); diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl b/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl index 489b16188e3..31bb090e606 100755 --- a/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl +++ b/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl @@ -18,7 +18,7 @@ unlink $esiorfile; # start Naming Service -$NameService = "$ENV{ACE_ROOT}/TAO/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$PerlACE::TAO_ROOT/orbsvcs/Naming_Service/Naming_Service"; $NS = new PerlACE::Process($NameService, "-o $nsiorfile"); $NS->Spawn(); if (PerlACE::waitforfile_timed ($nsiorfile, 5) == -1) { @@ -28,7 +28,7 @@ if (PerlACE::waitforfile_timed ($nsiorfile, 5) == -1) { } # start Event Service -$EventService = "$ENV{ACE_ROOT}/TAO/orbsvcs/CosEvent_Service/CosEvent_Service"; +$EventService = "$PerlACE::TAO_ROOT/orbsvcs/CosEvent_Service/CosEvent_Service"; $ES = new PerlACE::Process($EventService, "-ORBSvcConf cosevent.conf " ."-b -o $esiorfile $arg_ns_ref"); $ES->Spawn(); diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl index ccbc5f6ba44..1342057093d 100755 --- a/TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl @@ -6,8 +6,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # -*- perl -*- ############################################################################### -my $ACE_ROOT = $ENV{ACE_ROOT}; - use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; use Cwd; @@ -18,11 +16,6 @@ use strict; my $cwd = getcwd(); -if (!defined $ACE_ROOT) { - print "Error: ACE_ROOT not defined.\n"; - return 1; -} - my $imr_activator_ior = PerlACE::LocalFile ("imr_activator.ior"); my $imr_locator_ior = PerlACE::LocalFile ("imr_locator.ior"); @@ -31,9 +24,9 @@ my $refstyle = " -ORBobjrefstyle URL"; my $persistxml = PerlACE::LocalFile ("persist.xml"); my $persist = PerlACE::LocalFile ("persist.dat"); -my $IMR_LOCATOR = new PerlACE::Process ("$ACE_ROOT/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service"); -my $IMR_ACTIVATOR = new PerlACE::Process ("$ACE_ROOT/TAO/orbsvcs/ImplRepo_Service/ImR_Activator"); -my $TAO_IMR = new PerlACE::Process("$ACE_ROOT/bin/tao_imr"); +my $IMR_LOCATOR = new PerlACE::Process ("$PerlACE::TAO_ROOT/orbsvcs/ImplRepo_Service/ImplRepo_Service"); +my $IMR_ACTIVATOR = new PerlACE::Process ("$PerlACE::TAO_ROOT/orbsvcs/ImplRepo_Service/ImR_Activator"); +my $TAO_IMR = new PerlACE::Process("$PerlACE::ACE_ROOT/bin/tao_imr"); my $SVR = new PerlACE::Process (PerlACE::LocalFile ("server")); my $CLI = new PerlACE::Process (PerlACE::LocalFile ("client")); diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl b/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl index f9d35686da8..67ebe2186a0 100755 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl @@ -10,9 +10,6 @@ use PerlACE::Run_Test; my($eventType) = "-any"; # your choice of -any -structured or -sequence -my($ACE_ROOT) = $ENV{ACE_ROOT}; -my($TAO_ROOT) = "$ACE_ROOT/TAO"; - my($notify_port) = "9889"; #file used to detect notification service startup @@ -69,7 +66,7 @@ unlink $notify_ior; ##define the processes first -my($NS) = new PerlACE::Process("$TAO_ROOT/orbsvcs/Notify_Service/Notify_Service"); +my($NS) = new PerlACE::Process("$PerlACE::TAO_ROOT/orbsvcs/Notify_Service/Notify_Service"); my($CON) = new PerlACE::Process("./Consumer"); my($SUP) = new PerlACE::Process("./Supplier"); diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl b/TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl index 8140370ffd8..8a53d539de9 100755 --- a/TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/run_test.pl @@ -11,9 +11,6 @@ use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; use File::Compare; -$ACE_ROOT = $ENV{ACE_ROOT}; -$TAO_ROOT = "$ACE_ROOT/TAO"; - $port = 12000 + PerlACE::uniqueid (); sub cleanup() { -- cgit v1.2.1