summaryrefslogtreecommitdiff
path: root/TAO/tests/Multiple/run_test.pl
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/Multiple/run_test.pl')
-rwxr-xr-xTAO/tests/Multiple/run_test.pl22
1 files changed, 12 insertions, 10 deletions
diff --git a/TAO/tests/Multiple/run_test.pl b/TAO/tests/Multiple/run_test.pl
index d294b655cc9..8d601878a17 100755
--- a/TAO/tests/Multiple/run_test.pl
+++ b/TAO/tests/Multiple/run_test.pl
@@ -10,23 +10,25 @@ use PerlACE::Run_Test;
$status = 0;
-$direct_colloc = "-ORBCollocationStrategy direct";
-$no_colloc = "-ORBCollocation no";
-
-# @todo Test should take -o and -k options to specify iorfile
-# Hard coded in test.
-$iorfile = "s.ior";
+$iorbase = "server.ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
unlink $iorfile;
+my $class = (PerlACE::is_vxworks_test() ? 'PerlACE::ProcessVX' :
+ 'PerlACE::Process');
if (PerlACE::is_vxworks_test()) {
-$SV = new PerlACE::ProcessVX ("server");
+ $SV = new PerlACE::ProcessVX ("server", "-o $iorbase");
+ $direct_colloc = "-ORBCollocationStrategy direct -o $iorbase";
+ $no_colloc = "-ORBCollocation no -o $iorbase";
+
}
else {
-$SV = new PerlACE::Process ("server");
+ $SV = new PerlACE::Process ("server", "-o $iorfile");
+ $direct_colloc = "-ORBCollocationStrategy direct -o $iorfile";
+ $no_colloc = "-ORBCollocation no -o $iorfile";
}
-
-$CL = new PerlACE::Process ("client");
+$CL = new PerlACE::Process ("client", "-k file://$iorfile");
#
# Test using ThruPOA collocation.