summaryrefslogtreecommitdiff
path: root/TAO/tests/RTCORBA
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/RTCORBA')
-rwxr-xr-xTAO/tests/RTCORBA/Banded_Connections/run_test.pl9
-rwxr-xr-xTAO/tests/RTCORBA/Client_Propagated/run_test.pl7
-rwxr-xr-xTAO/tests/RTCORBA/Client_Protocol/run_test.pl33
-rwxr-xr-xTAO/tests/RTCORBA/Collocation/run_test.pl7
-rwxr-xr-xTAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl7
-rwxr-xr-xTAO/tests/RTCORBA/Linear_Priority/run_test.pl12
-rwxr-xr-xTAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl12
-rwxr-xr-xTAO/tests/RTCORBA/ORB_init/run_test.pl7
-rwxr-xr-xTAO/tests/RTCORBA/Persistent_IOR/run_test.pl15
-rwxr-xr-xTAO/tests/RTCORBA/Policies/run_test.pl7
-rwxr-xr-xTAO/tests/RTCORBA/Policy_Combinations/run_test.pl8
-rwxr-xr-xTAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl17
-rwxr-xr-xTAO/tests/RTCORBA/Private_Connection/run_test.pl7
-rwxr-xr-xTAO/tests/RTCORBA/RTMutex/run_test.pl7
-rwxr-xr-xTAO/tests/RTCORBA/Server_Declared/run_test.pl16
-rwxr-xr-xTAO/tests/RTCORBA/Thread_Pool/run_test.pl11
16 files changed, 137 insertions, 45 deletions
diff --git a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
index aaab606acd8..489c269d6be 100755
--- a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
+++ b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
@@ -38,8 +38,13 @@ if ($^O eq "hpux") {
"-b bands.hpux";
}
-$SV = new PerlACE::Process ("server", $server_args);
-$CL = new PerlACE::Process ("client");
+if (PerlACE::is_vxworks_test()) {
+ $SV = new PerlACE::ProcessVX ("server", $server_args);
+}
+else {
+ $SV = new PerlACE::Process ("server", $server_args);
+}
+$CL = new PerlACE::Process ("client", "-n file://$iorfile1 -o file://$iorfile2");
$SV->Spawn();
if (PerlACE::waitforfile_timed ($iorfile2, 10) == -1)
diff --git a/TAO/tests/RTCORBA/Client_Propagated/run_test.pl b/TAO/tests/RTCORBA/Client_Propagated/run_test.pl
index e6742be8d8e..1f218402506 100755
--- a/TAO/tests/RTCORBA/Client_Propagated/run_test.pl
+++ b/TAO/tests/RTCORBA/Client_Propagated/run_test.pl
@@ -16,7 +16,12 @@ unlink $iorfile;
print STDERR "\n RTCORBA CLIENT_PROPAGATED Priority Unit Test\n\n";
-$SV = new PerlACE::Process ("server", "-o $iorfile");
+if (PerlACE::is_vxworks_test()) {
+ $SV = new PerlACE::ProcessVX ("server", , "-o test.ior");
+}
+else {
+ $SV = new PerlACE::Process ("server", , "-o $iorfile");
+}
$CL = new PerlACE::Process ("client", "-k file://$iorfile");
$SV->Spawn ();
diff --git a/TAO/tests/RTCORBA/Client_Protocol/run_test.pl b/TAO/tests/RTCORBA/Client_Protocol/run_test.pl
index 383da124db0..353569681aa 100755
--- a/TAO/tests/RTCORBA/Client_Protocol/run_test.pl
+++ b/TAO/tests/RTCORBA/Client_Protocol/run_test.pl
@@ -20,21 +20,30 @@ print STDERR "\n********** RTCORBA Client Protocol Policy Unit Test\n\n";
# Arguments are platform-dependent (UIOP not available on Windows).
$server_args =
- "-s $iorfile1 -c $iorfile2 -p 1413566208 "
- ."-ORBendpoint iiop:// -ORBendpoint shmiop:// -ORBEndpoint uiop:// ";
+ (PerlACE::is_vxworks_test() ? "" : (($^O eq "MSWin32") ? "-p 1413566210 " : "-p 1413566208 "))
+ ."-ORBendpoint iiop:// "
+ .(PerlACE::is_vxworks_test() ? "" : "-ORBendpoint shmiop:// ")
+ .(($^O eq "MSWin32") ? "" : "-ORBEndpoint uiop:// ");
$client_args =
- "-s file://$iorfile1 -c file://$iorfile2 -p 1413566210 -ORBdebuglevel 1 ";
-
-if ($^O eq "MSWin32") {
- $server_args =
- "-s $iorfile1 -c $iorfile2 -p 1413566210 "
- ."-ORBendpoint iiop:// -ORBendpoint shmiop:// ";
- $client_args =
- "-s file://$iorfile1 -c file://$iorfile2 -ORBdebuglevel 1";
-}
+ "-s file://$iorfile1 -c file://$iorfile2 "
+ .(($^O eq "MSWin32") ? "" : "-p 1413566210 ")
+ ."-ORBdebuglevel 1 ";
+
+#if ($^O eq "MSWin32") {
+# $server_args =
+# "-p 1413566210 "
+# ."-ORBendpoint iiop:// -ORBendpoint shmiop:// ";
+# $client_args =
+# "-s file://$iorfile1 -c file://$iorfile2 -ORBdebuglevel 1";
+#}
# Start server.
-$SV = new PerlACE::Process ("server", $server_args);
+if (PerlACE::is_vxworks_test()) {
+ $SV = new PerlACE::ProcessVX ("server", "-s test1.ior -c test2.ior $server_args");
+}
+else {
+ $SV = new PerlACE::Process ("server", "-s $iorfile1 -c $iorfile2 $server_args");
+}
$CL = new PerlACE::Process ("client", $client_args);
$SV->Spawn ();
diff --git a/TAO/tests/RTCORBA/Collocation/run_test.pl b/TAO/tests/RTCORBA/Collocation/run_test.pl
index 7ea04278c24..d8e8bcc985b 100755
--- a/TAO/tests/RTCORBA/Collocation/run_test.pl
+++ b/TAO/tests/RTCORBA/Collocation/run_test.pl
@@ -10,7 +10,12 @@ use PerlACE::Run_Test;
print STDERR "\n********** RTCORBA Collocation Unit Test **********\n\n";
-$T = new PerlACE::Process ("Collocation");
+if (PerlACE::is_vxworks_test()) {
+ $T = new PerlACE::ProcessVX ("Collocation");
+}
+else {
+ $T = new PerlACE::Process ("Collocation");
+}
$test = $T->SpawnWaitKill(60);
if ($test == 2) {
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl
index d04d0035c73..25ccc3504f6 100755
--- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl
@@ -10,7 +10,12 @@ use PerlACE::Run_Test;
print STDERR "\n********** RTCORBA Destroy_Thread_Pool Unit Test **********\n\n";
-$T = new PerlACE::Process ("Destroy_Thread_Pool");
+if (PerlACE::is_vxworks_test()) {
+ $T = new PerlACE::ProcessVX ("Destroy_Thread_Pool");
+}
+else {
+ $T = new PerlACE::Process ("Destroy_Thread_Pool");
+}
$test = $T->SpawnWaitKill (60);
diff --git a/TAO/tests/RTCORBA/Linear_Priority/run_test.pl b/TAO/tests/RTCORBA/Linear_Priority/run_test.pl
index 564403b0c67..b5aa193758d 100755
--- a/TAO/tests/RTCORBA/Linear_Priority/run_test.pl
+++ b/TAO/tests/RTCORBA/Linear_Priority/run_test.pl
@@ -9,7 +9,7 @@ use lib '../../../../bin';
use PerlACE::Run_Test;
$status = 0;
-$iorfile = "ior";
+$iorfile = PerlACE::LocalFile("ior");
@configurations =
(
@@ -61,7 +61,8 @@ $iorfile = "ior";
sub run_client
{
- $CL = new PerlACE::Process ("client", @_);
+ my $arg = shift;
+ $CL = new PerlACE::Process ("client", "-k file://$iorfile " . $arg);
$CL->Spawn ();
@@ -77,7 +78,12 @@ sub run_client
sub run_server
{
- $SV = new PerlACE::Process ("server", @_);
+ if (PerlACE::is_vxworks_test()) {
+ $SV = new PerlACE::ProcessVX ("server", @_);
+ }
+ else {
+ $SV = new PerlACE::Process ("server", @_);
+ }
$SV->Spawn ();
if (PerlACE::waitforfile_timed ($iorfile, 10) == -1)
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
index af580051506..ba40eab7c7d 100755
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
@@ -43,14 +43,20 @@ unlink $iorfile;
unlink $data_file;
$server_args =
- "-o $iorfile -ORBdebuglevel $debug_level "
- ."-ORBendpoint iiop:// -ORBendpoint shmiop:// ";
+ "-ORBdebuglevel $debug_level "
+ ."-ORBendpoint iiop:// "
+ .(PerlACE::is_vxworks_test() ? "" : "-ORBendpoint shmiop:// ");
$client_args =
"-o file://$iorfile "
."-a $priority1 -b $priority2 -e 1413566210 -f 0 -n $iterations";
-$SV = new PerlACE::Process ("server", $server_args);
+if (PerlACE::is_vxworks_test()) {
+ $SV = new PerlACE::ProcessVX ("server", "-o test.ior $server_args");
+}
+else {
+ $SV = new PerlACE::Process ("server", "-o $iorfile $server_args");
+}
$CL = new PerlACE::Process ("client", $client_args);
print STDERR "\n********** MT Client Protocol & CLIENT_PROPAGATED combo Test\n\n";
diff --git a/TAO/tests/RTCORBA/ORB_init/run_test.pl b/TAO/tests/RTCORBA/ORB_init/run_test.pl
index 0d351700807..356ff8edb52 100755
--- a/TAO/tests/RTCORBA/ORB_init/run_test.pl
+++ b/TAO/tests/RTCORBA/ORB_init/run_test.pl
@@ -10,7 +10,12 @@ use PerlACE::Run_Test;
print STDERR "\n********** RTCORBA ORB_init Unit Test **********\n\n";
-$T = new PerlACE::Process ("ORB_init");
+if (PerlACE::is_vxworks_test()) {
+ $T = new PerlACE::ProcessVX ("ORB_init");
+}
+else {
+ $T = new PerlACE::Process ("ORB_init");
+}
$test = $T->SpawnWaitKill (60);
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl b/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl
index 08a8fed4db6..c7abccc3a34 100755
--- a/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl
+++ b/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl
@@ -27,12 +27,16 @@ $extra_server_args = "-d 1 -ORBobjrefstyle url -ORBEndpoint iiop://1.0\@:$iiop_p
{
iorfiles => [ "persistent_ior", "tp_persistent_ior", "transient_ior" ],
server => "-a tp_persistent_ior -p persistent_ior -t transient_ior $extra_server_args",
- clients => [ "-k file://tp_persistent_ior", "-k file://persistent_ior", "-k file://transient_ior -x" ],
+ clients => [ "-k file://".PerlACE::LocalFile("tp_persistent_ior"),
+ "-k file://".PerlACE::LocalFile("persistent_ior"),
+ "-k file://".PerlACE::LocalFile("transient_ior")." -x" ],
},
{
iorfiles => [ "not_used_ior_1", "not_used_ior_2", "transient_ior" ],
server => "-a not_used_ior_1 -p not_used_ior_2 -t transient_ior $extra_server_args",
- clients => [ "-k file://tp_persistent_ior", "-k file://persistent_ior", "-k file://transient_ior -x" ],
+ clients => [ "-k file://".PerlACE::LocalFile("tp_persistent_ior"),
+ "-k file://".PerlACE::LocalFile("persistent_ior"),
+ "-k file://".PerlACE::LocalFile("transient_ior")." -x" ],
},
);
@@ -62,7 +66,12 @@ sub run_server
print "\nRunning server with the following args: $args\n\n";
- $SV = new PerlACE::Process ("server", $args);
+ if (PerlACE::is_vxworks_test()) {
+ $SV = new PerlACE::ProcessVX ("server", $args);
+ }
+ else {
+ $SV = new PerlACE::Process ("server", $args);
+ }
$SV->Spawn ();
diff --git a/TAO/tests/RTCORBA/Policies/run_test.pl b/TAO/tests/RTCORBA/Policies/run_test.pl
index 23ab04cd393..8c87f1f6805 100755
--- a/TAO/tests/RTCORBA/Policies/run_test.pl
+++ b/TAO/tests/RTCORBA/Policies/run_test.pl
@@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
use lib '../../../../bin';
use PerlACE::Run_Test;
-$T = new PerlACE::Process ("Policies");
+if (PerlACE::is_vxworks_test()) {
+ $T = new PerlACE::ProcessVX ("Policies");
+}
+else {
+ $T = new PerlACE::Process ("Policies");
+}
$test = $T->SpawnWaitKill (60);
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl b/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl
index 3a8932a1c53..1f0077fcdd8 100755
--- a/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl
+++ b/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl
@@ -49,11 +49,17 @@ for $file (@iorfiles)
unlink $file;
}
-$SV = new PerlACE::Process ("server");
+if (PerlACE::is_vxworks_test()) {
+ $SV = new PerlACE::ProcessVX ("server");
+}
+else {
+ $SV = new PerlACE::Process ("server");
+}
$SV->Spawn ();
for $file (@iorfiles)
{
+ $file = PerlACE::LocalFile($file);
if (PerlACE::waitforfile_timed ($file, 10) == -1)
{
$server = $SV->TimedWait (1);
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl
index f487eb5eddb..d30f64811a0 100755
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl
@@ -40,13 +40,18 @@ sub run_test
{
for $test (@configurations)
{
- unlink $test->{file};
+ unlink PerlACE::LocalFile($test->{file});
}
my @parms = @_;
$arg = $parms[0];
- $SV = new PerlACE::Process ("server", "-s $server_static_threads -d $server_dynamic_threads");
+ if (PerlACE::is_vxworks_test()) {
+ $SV = new PerlACE::ProcessVX ("server", "-s $server_static_threads -d $server_dynamic_threads");
+ }
+ else {
+ $SV = new PerlACE::Process ("server", "-s $server_static_threads -d $server_dynamic_threads");
+ }
$server = $SV->Spawn ();
if ($server == -1)
{
@@ -55,7 +60,7 @@ sub run_test
for $test (@configurations)
{
- if (PerlACE::waitforfile_timed ($test->{file}, 10) == -1)
+ if (PerlACE::waitforfile_timed (PerlACE::LocalFile($test->{file}), 10) == -1)
{
$server = $SV->TimedWait (1);
if ($server == 2)
@@ -71,6 +76,7 @@ sub run_test
goto kill_server;
}
}
+ print $test->{file}."\n";
}
$CL[$i] = new PerlACE::Process ("client", $arg);
@@ -96,7 +102,7 @@ sub run_test
for $test (@configurations)
{
- unlink $test->{file};
+ unlink PerlACE::LocalFile($test->{file});
}
}
@@ -106,7 +112,8 @@ for $test (@configurations)
print STDERR "$test->{description}\n";
print STDERR "*************************************************************\n\n";
- run_test ("-k file://$test->{file} $test->{args}");
+ my $file = PerlACE::LocalFile($test->{file});
+ run_test ("-k file://$file $test->{args}");
}
exit $status
diff --git a/TAO/tests/RTCORBA/Private_Connection/run_test.pl b/TAO/tests/RTCORBA/Private_Connection/run_test.pl
index a828a6220d6..537c5b0fca6 100755
--- a/TAO/tests/RTCORBA/Private_Connection/run_test.pl
+++ b/TAO/tests/RTCORBA/Private_Connection/run_test.pl
@@ -18,7 +18,12 @@ unlink $iorfile2;
print STDERR "\n********** RTCORBA Private Connection Unit Test\n\n";
-$SV = new PerlACE::Process ("server", "-o $iorfile1 -p $iorfile2");
+if (PerlACE::is_vxworks_test()) {
+ $SV = new PerlACE::ProcessVX ("server", "-o test1.ior -p test2.ior");
+}
+else {
+ $SV = new PerlACE::Process ("server", "-o $iorfile1 -p $iorfile2");
+}
$CL = new PerlACE::Process ("client", "-o file://$iorfile1 -p file://$iorfile2 -ORBdebuglevel 3 ");
$SV->Spawn ();
diff --git a/TAO/tests/RTCORBA/RTMutex/run_test.pl b/TAO/tests/RTCORBA/RTMutex/run_test.pl
index e123f4ea033..c8815f69464 100755
--- a/TAO/tests/RTCORBA/RTMutex/run_test.pl
+++ b/TAO/tests/RTCORBA/RTMutex/run_test.pl
@@ -10,7 +10,12 @@ use PerlACE::Run_Test;
print STDERR "\n********** RTCORBA RTMutex Unit Test **********\n\n";
-$T = new PerlACE::Process ("server");
+if (PerlACE::is_vxworks_test()) {
+ $T = new PerlACE::ProcessVX ("server");
+}
+else {
+ $T = new PerlACE::Process ("server");
+}
$test = $T->SpawnWaitKill (60);
diff --git a/TAO/tests/RTCORBA/Server_Declared/run_test.pl b/TAO/tests/RTCORBA/Server_Declared/run_test.pl
index 37d8318df43..04c75bb3b3f 100755
--- a/TAO/tests/RTCORBA/Server_Declared/run_test.pl
+++ b/TAO/tests/RTCORBA/Server_Declared/run_test.pl
@@ -16,26 +16,30 @@ unlink $iorfile2;
$status = 0;
$server_args =
- "-p $iorfile1 -o $iorfile2 -a 45 -b 55";
+ "-a 45 -b 55";
print STDERR "Value is " . $^O;
if ($^O eq "MSWin32") {
$server_args =
- "-p $iorfile1 -o $iorfile2 -a 1 -b 2";
+ "-a 1 -b 2";
}
elsif ($^O eq "dec_osf") {
$server_args =
- "-p $iorfile1 -o $iorfile2 -a 20 -b 30";
+ "-a 20 -b 30";
}
elsif ($^O eq "hpux") {
$server_args =
- "-p $iorfile1 -o $iorfile2 -a 17 -b 29";
+ "-a 17 -b 29";
}
$client_args = "-p file://$iorfile1 -o file://$iorfile2";
-print STDERR "server $server_args\n";
-$SV = new PerlACE::Process ("server", $server_args);
+if (PerlACE::is_vxworks_test()) {
+ $SV = new PerlACE::ProcessVX ("server", "-p test1.ior -o test2.ior $server_args");
+}
+else {
+ $SV = new PerlACE::Process ("server", "-p $iorfile1 -o $iorfile2 $server_args");
+}
$CL = new PerlACE::Process ("client", $client_args);
print STDERR "\n********** RTCORBA SERVER_DECLARED Priority Unit Test\n\n";
diff --git a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl
index 58e94e40b60..568383dfa70 100755
--- a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl
+++ b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl
@@ -56,7 +56,12 @@ sub run_clients
}
}
-$SV = new PerlACE::Process ("server");
+if (PerlACE::is_vxworks_test()) {
+ $SV = new PerlACE::ProcessVX ("server");
+}
+else {
+ $SV = new PerlACE::Process ("server");
+}
$SV->Spawn ();
@@ -86,14 +91,14 @@ for $test (@configurations)
print STDERR "$test->{description}\n";
print STDERR "*************************************************************\n\n";
- run_clients ("-k file://$test->{file}", $number_of_clients);
+ run_clients ("-k file://".PerlACE::LocalFile($test->{file}), $number_of_clients);
}
print STDERR "\n************************\n";
print STDERR "Shutting down the server\n";
print STDERR "************************\n\n";
-run_clients ("-k file://$configurations[0]->{file} -i 0 -x", 1);
+run_clients ("-k file://".PerlACE::LocalFile($configurations[0]->{file})." -i 0 -x", 1);
kill_server:
View Lorry Controller Status