diff options
Diffstat (limited to 'TAO/orbsvcs/tests/ImplRepo/run_test.pl')
| -rwxr-xr-x | TAO/orbsvcs/tests/ImplRepo/run_test.pl | 79 |
1 files changed, 29 insertions, 50 deletions
diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl index 5cbbb6207fc..db65f2c736c 100755 --- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl @@ -13,15 +13,6 @@ $airplane_ior = "airplane.ior"; $nestea_ior = "nestea.ior"; $implrepo_ior = "implrepo.ior"; -$implrepo_server = "..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service". - $DIR_SEPARATOR."ImplRepo_Service".$EXE_EXT; -$tao_ir = "..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service". - $DIR_SEPARATOR."tao_ir".$EXE_EXT; -$airplane_server = $EXEPREFIX."airplane_server".$EXE_EXT; -$airplane_client = $EXEPREFIX."airplane_client".$EXE_EXT; -$nestea_server = $EXEPREFIX."nestea_server".$EXE_EXT; -$nestea_client = $EXEPREFIX."nestea_client".$EXE_EXT; - # Make sure the files are gone, so we can wait on them. unlink $airplane_ior; unlink $nestea_ior; @@ -31,105 +22,93 @@ unlink $implrepo_ior; sub airplane_test { - $SV = Process::Create ($airplane_server, + $SV = Process::Create ($EXEPREFIX."airplane_server".$Process::EXE_EXT, "-o $airplane_ior"); ACE::waitforfile ($airplane_ior); - $status = system ($airplane_client. + $status = system ($EXEPREFIX."airplane_client".$Process::EXE_EXT. " -k file://$airplane_ior"); $SV->Kill (); $SV->Wait (); + unlink $airplane_ior; } sub airplane_ir_test { - $IR = Process::Create ($implrepo_server, - "-ORBobjrefstyle url -o $implrepo_ior -d 0"); + $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT, + "-ORBsvcconf implrepo.conf -d 0"); ACE::waitforfile ($implrepo_ior); - system ($tao_ir." -ORBImplRepoIOR file://$implrepo_ior add plane -c \"airplane_server -i -ORBImplRepoIOR file://$implrepo_ior\""); - - $SV = Process::Create ($airplane_server, - "-o $airplane_ior -i -ORBobjrefstyle url -ORBImplRepoIOR file://$implrepo_ior"); + $SV = Process::Create ($EXEPREFIX."airplane_server".$Process::EXE_EXT, + "-o $airplane_ior -i -r"); ACE::waitforfile ($airplane_ior); - system($airplane_client." -k file://$airplane_ior"); - - system($tao_ir." -ORBImplRepoIOR file://$implrepo_ior shutdown plane"); + system($EXEPREFIX."airplane_client -k file://$airplane_ior"); - system($airplane_client." -k file://$airplane_ior"); - - $SV->Kill (); $SV->Wait (); $IR->Kill (); $IR->Wait (); } sub nestea_test { - $SV = Process::Create ($nestea_server, + $SV = Process::Create ($EXEPREFIX."nestea_server".$Process::EXE_EXT, "-o $nestea_ior"); ACE::waitforfile ($nestea_ior); - $status = system ($nestea_client. + $status = system ($EXEPREFIX."nestea_client".$Process::EXE_EXT. " -k file://$nestea_ior"); $SV->Kill (); $SV->Wait (); + + unlink $nestea_ior; } sub nestea_ir_test { - $IR = Process::Create ($implrepo_server, - "-ORBobjrefstyle url -o $implrepo_ior -d 0"); + $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT, + "-ORBsvcconf implrepo.conf -d 0"); ACE::waitforfile ($implrepo_ior); - system ($tao_ir." -ORBImplRepoIOR file://$implrepo_ior add nestea_server -c \"nestea_server -i -ORBImplRepoIOR file://$implrepo_ior\""); - - $SV = Process::Create ($nestea_server, - "-o $nestea_ior -i -ORBobjrefstyle url -ORBImplRepoIOR file://$implrepo_ior"); + $SV = Process::Create ($EXEPREFIX."nestea_server".$Process::EXE_EXT, + "-o $nestea_ior -i -r"); ACE::waitforfile ($nestea_ior); - system ($nestea_client." -k file://$nestea_ior"); - - system ($tao_ir." -ORBImplRepoIOR file://$implrepo_ior shutdown nestea_server"); + system($EXEPREFIX."nestea_client -k file://$nestea_ior"); - system ($nestea_client." -k file://$nestea_ior"); - - $SV->Kill (); $SV->Wait (); $IR->Kill (); $IR->Wait (); } sub both_ir_test { - $IR = Process::Create ($implrepo_server, - "-ORBobjrefstyle url -o $implrepo_ior -d 0"); + $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT, + "-ORBsvcconf implrepo.conf -d 0"); ACE::waitforfile ($implrepo_ior); - system ($tao_ir." -ORBImplRepoIOR file://$implrepo_ior add plane -c \"airplane_server -i -ORBImplRepoIOR file://$implrepo_ior\""); - system ($tao_ir." -ORBImplRepoIOR file://$implrepo_ior add nestea -c \"nestea_server -i -ORBImplRepoIOR file://$implrepo_ior\""); + $NSV = Process::Create ($EXEPREFIX."nestea_server".$Process::EXE_EXT, + "-o $nestea_ior -i -r"); - $ASV = Process::Create ($nestea_server, - "-o $nestea_ior -i -ORBobjrefstyle url -ORBImplRepoIOR file://$implrepo_ior"); - $NSV = Process::Create ($airplane_server, - "-o $airplane_ior -i -ORBobjrefstyle url -ORBImplRepoIOR file://$implrepo_ior"); + $ASV = Process::Create ($EXEPREFIX."airplane_server".$Process::EXE_EXT, + "-o $airplane_ior -i -r"); ACE::waitforfile ($nestea_ior); - $NCL = Process::Create ($nestea_client, "-k file://$nestea_ior"); + $NCL = Process::Create ($EXEPREFIX."nestea_client".$Process::EXE_EXT, + "-k file://$nestea_ior"); ACE::waitforfile ($airplane_ior); - system($airplane_client." -k file://$airplane_ior"); + system($EXEPREFIX."airplane_client -k file://$airplane_ior"); - $ASV->Kill (); $ASV->Wait (); - $NSV->Kill (); $NSV->Wait (); $NCL->Kill (); $NCL->Wait (); $IR->Kill (); $IR->Wait (); + $NSV->Wait (); + $ASV->Wait (); } @@ -144,7 +123,7 @@ for ($i = 0; $i <= $#ARGV; $i++) print "run_test test\n"; print "\n"; print "test -- Runs a specific test\n"; - print " airplane, airplane_ir, nestea, nestea_ir, both_ir\n"; + print " airplane, simple, or implrepo\n"; exit; } if ($ARGV[$i] eq "airplane") |