diff options
Diffstat (limited to 'TAO/orbsvcs/tests/ImplRepo/run_test.pl')
-rwxr-xr-x | TAO/orbsvcs/tests/ImplRepo/run_test.pl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl index 532f878adbe..21fcf064c49 100755 --- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl @@ -45,7 +45,7 @@ my $endpoint = "-ORBEndpoint " . "$protocol" . "://:" . $port; my $IMR_LOCATOR = new PerlACE::Process ("../../ImplRepo_Service/ImplRepo_Service"); my $IMR_ACTIVATOR = new PerlACE::Process ("../../ImplRepo_Service/ImR_Activator"); -my $TAO_IMR = new PerlACE::Process("$ENV{ACE_ROOT}/bin/tao_imr"); +my $TAO_IMR = new PerlACE::Process("../../../../bin/tao_imr"); # We want the tao_imr executable to be found exactly in the path # given, without being modified by the value of -ExeSubDir. @@ -272,7 +272,7 @@ sub airplane_ir_test my $imr_initref = "-ORBInitRef ImplRepoService=file://$imr_locator_ior"; - $IMR_LOCATOR->Arguments ("-d 2 -o $imr_locator_ior $refstyle"); + $IMR_LOCATOR->Arguments ("-d 2 -o $imr_locator_ior"); $IMR_LOCATOR->Spawn (); if (PerlACE::waitforfile_timed ($imr_locator_ior, 5) == -1) { @@ -372,7 +372,7 @@ sub nestea_ir_test my $imr_initref = "-orbobjrefstyle URL -ORBInitRef ImplRepoService=file://$imr_locator_ior"; - $IMR_LOCATOR->Arguments ("-d 2 -o $imr_locator_ior $refstyle"); + $IMR_LOCATOR->Arguments ("-d 2 -o $imr_locator_ior"); $IMR_LOCATOR->Spawn (); if (PerlACE::waitforfile_timed ($imr_locator_ior, 10) == -1) { @@ -510,7 +510,7 @@ sub perclient my $imr_initref = "-orbobjrefstyle URL -ORBInitRef ImplRepoService=file://$imr_locator_ior"; # specify an endpoint so that we can use corbaloc url for the client. - $IMR_LOCATOR->Arguments ("-d 2 -orbendpoint iiop://:8888 -o $imr_locator_ior $refstyle"); + $IMR_LOCATOR->Arguments ("-d 2 -orbendpoint iiop://:8888 -o $imr_locator_ior"); $IMR_LOCATOR->Spawn (); if (PerlACE::waitforfile_timed ($imr_locator_ior, 10) == -1) { @@ -605,7 +605,7 @@ sub shutdown_repo # Specify an endpoint so that we can restart on the same port. # Specify persistence so that we can test that shutdown-repo -a works after reconnect - $IMR_LOCATOR->Arguments ("-p test.repo -d 1 -orbendpoint iiop://:8888 -o $imr_locator_ior $refstyle"); + $IMR_LOCATOR->Arguments ("-p test.repo -d 1 -orbendpoint iiop://:8888 -o $imr_locator_ior"); unlink $imr_locator_ior; $IMR_LOCATOR->Spawn (); @@ -685,7 +685,7 @@ sub persistent_ir_test unlink $imr_locator_ior; ## Be sure to start the ImR on a consistent endpoint, so that any created IORs ## remain valid even if the ImR restarts. - $IMR_LOCATOR->Arguments ("-orbendpoint iiop://:8888 -x $backing_store -d 2 -o $imr_locator_ior $refstyle"); + $IMR_LOCATOR->Arguments ("-orbendpoint iiop://:8888 -x $backing_store -d 2 -o $imr_locator_ior"); $IMR_LOCATOR->Spawn (); if (PerlACE::waitforfile_timed ($imr_locator_ior, 10) == -1) { print STDERR "ERROR: cannot find $imr_locator_ior\n"; |