summaryrefslogtreecommitdiff
path: root/orbsvcs/DevGuideExamples/ImplRepo/Activator/run_test.pl
diff options
context:
space:
mode:
Diffstat (limited to 'orbsvcs/DevGuideExamples/ImplRepo/Activator/run_test.pl')
-rwxr-xr-xorbsvcs/DevGuideExamples/ImplRepo/Activator/run_test.pl20
1 files changed, 10 insertions, 10 deletions
diff --git a/orbsvcs/DevGuideExamples/ImplRepo/Activator/run_test.pl b/orbsvcs/DevGuideExamples/ImplRepo/Activator/run_test.pl
index 658cdce17c0..ed774dc64cf 100755
--- a/orbsvcs/DevGuideExamples/ImplRepo/Activator/run_test.pl
+++ b/orbsvcs/DevGuideExamples/ImplRepo/Activator/run_test.pl
@@ -1,4 +1,4 @@
-# $Id$
+# $Id$
eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
& eval 'exec perl -S $0 $argv:q'
@@ -25,8 +25,8 @@ my $WAIT_TIMEOUT = 2;
my $DEBUG_LEVEL = 1;
my $OBJ_REF_STYLE = "-orbobjrefstyle url";
-my $implrepo_server = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/ImplRepo_Service";
-my $imr_activator = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/ImR_Activator";
+my $implrepo_server = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator";
+my $imr_activator = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_activator";
my $tao_imr = "$ENV{ACE_ROOT}/bin/tao_imr";
my $implrepo_ior = "imr.ior";
@@ -97,7 +97,7 @@ $TI->IgnoreExeSubDir(1);
sub RunImRUtil {
my $cmd = shift;
-
+
print ">>> " . $TI->CommandLine() . "\n";
$TI->Arguments("-ORBInitRef ImplRepoService=file://$ti_imriorfile $cmd");
return $TI->SpawnWaitKill($ti->ProcessStartWaitInterval());
@@ -128,7 +128,7 @@ if ($ti->PutFile ($implrepo_ior) == -1) {
}
if (SpawnWait($Act, $activator_ior, $act) != 0) {
- $ImR->Kill(); $ImR->TimedWait(1);
+ $ImR->Kill(); $ImR->TimedWait(1);
exit 1;
}
@@ -136,19 +136,19 @@ if (SpawnWait($Act, $activator_ior, $act) != 0) {
#we want to run the server once to generate the ior file.
if (SpawnWait($Srv, $messenger_ior, $imr) != 0) {
- $Act->Kill(); $Act->TimedWait(1);
- $ImR->Kill(); $ImR->TimedWait(1);
+ $Act->Kill(); $Act->TimedWait(1);
+ $ImR->Kill(); $ImR->TimedWait(1);
exit 1;
}
if ($imr->GetFile ($implrepo_ior) == -1) {
print STDERR "ERROR: cannot retrieve file <$imr_srviorfile>\n";
- $Act->Kill(); $Act->TimedWait(1);
+ $Act->Kill(); $Act->TimedWait(1);
$ImR->Kill (); $ImR->TimedWait (1);
exit 1;
}
if ($c1->PutFile ($implrepo_ior) == -1) {
print STDERR "ERROR: cannot set file <$c1_srviorfile>\n";
- $Act->Kill(); $Act->TimedWait(1);
+ $Act->Kill(); $Act->TimedWait(1);
$ImR->Kill (); $ImR->TimedWait (1);
exit 1;
}
@@ -165,7 +165,7 @@ if ($Srv_status != 0) {
RunImRUtil("list -v");
-# Note : If the server registers itself, then it won't set the
+# Note : If the server registers itself, then it won't set the
# activator name. If we don't set it here, then the activator
# won't be able to start the server.
my $actname = $ti->hostname;