diff options
Diffstat (limited to 'TAO/tests/RTCORBA')
29 files changed, 6 insertions, 131 deletions
diff --git a/TAO/tests/RTCORBA/Banded_Connections/bands.hpux b/TAO/tests/RTCORBA/Banded_Connections/bands.hpux deleted file mode 100644 index f4b469e61f4..00000000000 --- a/TAO/tests/RTCORBA/Banded_Connections/bands.hpux +++ /dev/null @@ -1 +0,0 @@ -16 20 21 27 28 31 diff --git a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl index b7e699a64f4..36fb1648c9f 100755 --- a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl +++ b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl @@ -53,10 +53,6 @@ if ($^O eq "MSWin32") { $server_args = "-b bands.nt"; } -elsif ($^O eq "hpux") { - $server_args = - "-b bands.hpux"; -} else { $server_args = "-b bands.unix"; diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/run_test.pl b/TAO/tests/RTCORBA/Bug_3643_Regression/run_test.pl index dc8133995ef..592dc6439f5 100755 --- a/TAO/tests/RTCORBA/Bug_3643_Regression/run_test.pl +++ b/TAO/tests/RTCORBA/Bug_3643_Regression/run_test.pl @@ -12,7 +12,6 @@ my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 fail $number_of_clients = 4; $status = 0; -$continuous = ($^O eq 'hpux'); @configurations = ({ @@ -57,10 +56,6 @@ sub run_clients $SV = $server->CreateProcess ("server"); -if ($continuous) { - $SV->Arguments ("-ORBSvcConf continuous$PerlACE::svcconf_ext"); -} - $SV->Spawn (); for $test (@configurations) { diff --git a/TAO/tests/RTCORBA/Collocation/continuous.conf b/TAO/tests/RTCORBA/Collocation/continuous.conf deleted file mode 100644 index a4871d398f3..00000000000 --- a/TAO/tests/RTCORBA/Collocation/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/TAO/tests/RTCORBA/Collocation/continuous.conf.xml b/TAO/tests/RTCORBA/Collocation/continuous.conf.xml deleted file mode 100644 index f297697bc7c..00000000000 --- a/TAO/tests/RTCORBA/Collocation/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Collocation/run_test.pl b/TAO/tests/RTCORBA/Collocation/run_test.pl index 933821b6635..742c93117d6 100755 --- a/TAO/tests/RTCORBA/Collocation/run_test.pl +++ b/TAO/tests/RTCORBA/Collocation/run_test.pl @@ -7,18 +7,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; -$continuous = ($^O eq 'hpux'); - print STDERR "\n********** RTCORBA Collocation Unit Test **********\n\n"; my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; $T = $server->CreateProcess ("Collocation"); -if ($continuous) { - $T->Arguments("-ORBSvcConf continuous$PerlACE::svcconf_ext"); -} - $test = $T->SpawnWaitKill($server->ProcessStartWaitInterval ()); if ($test == 2) { # Mark as no longer running to avoid errors on exit. diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf b/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf deleted file mode 100644 index a4871d398f3..00000000000 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml b/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml deleted file mode 100644 index f297697bc7c..00000000000 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl index c5178cd358d..0dd08953484 100755 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl +++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl @@ -9,14 +9,9 @@ use PerlACE::TestTarget; my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; -$continuous = ($^O eq 'hpux'); - print STDERR "\n********** RTCORBA Destroy_Thread_Pool Unit Test **********\n\n"; $SV = $server->CreateProcess ("Destroy_Thread_Pool"); -if ($continuous) { - $SV->Arguments("-ORBSvcConf continuous$PerlACE::svcconf_ext"); -} $server_status = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf deleted file mode 100644 index 43526314bed..00000000000 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous -RTORBDynamicThreadIdleTimeout 1000000" diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml deleted file mode 100644 index bbb864e64b0..00000000000 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous -RTORBDynamicThreadIdleTimeout 1000000"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl index ad7ed09335e..11188a49f9d 100755 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl @@ -9,7 +9,6 @@ use PerlACE::TestTarget; $number_of_clients = 1; $status = 0; -$continuous = ($^O eq 'hpux'); my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; @@ -48,11 +47,6 @@ sub run_clients } $SV = $server->CreateProcess ("server"); - -if ($continuous) { - $SV->Arguments ("-ORBSvcConf continuous$PerlACE::svcconf_ext"); -} - $SV->Spawn (); for $test (@configurations) { 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 aafa46c19bf..3473e447733 100755 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl @@ -37,10 +37,6 @@ if ($^O eq "MSWin32") { $priority1 = 2; $priority2 = 1; } -elsif ($^O eq "hpux") { - $priority1 = 17; - $priority2 = 22; -} else { $priority1 = 45; $priority2 = 50; diff --git a/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf b/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf deleted file mode 100644 index a4871d398f3..00000000000 --- a/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml b/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml deleted file mode 100644 index f297697bc7c..00000000000 --- a/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl b/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl index af31dd971e8..f1dbb327896 100755 --- a/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl +++ b/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl @@ -15,10 +15,7 @@ $status = 0; $iiop_port = 27532; $tp_iiop_port = 27533; -$continuous = ($^O eq 'hpux'); - -$extra_server_args = ($continuous ? "-ORBSvcConf continuous$PerlACE::svcconf_ext " : '') . - "-d 1 -ORBEndpoint iiop://1.2\@:$iiop_port -ORBLaneEndpoint 2:0 iiop://1.2\@:$tp_iiop_port"; +$extra_server_args = "-d 1 -ORBEndpoint iiop://1.2\@:$iiop_port -ORBLaneEndpoint 2:0 iiop://1.2\@:$tp_iiop_port"; @iorfiles = ( diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf deleted file mode 100644 index a4871d398f3..00000000000 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml deleted file mode 100644 index f297697bc7c..00000000000 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/> -</ACE_Svc_Conf> 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 cc019b226fc..1a3af766444 100755 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl @@ -12,9 +12,6 @@ $server_dynamic_threads = 0; $status = 0; -$continuous = ($^O eq 'hpux'); -$common_args = ($continuous ? "-ORBSvcConf continuous$PerlACE::svcconf_ext" : ''); - my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; @@ -70,7 +67,7 @@ sub run_test my @parms = @_; $arg = $parms[0]; - $SV = $server->CreateProcess ("server", "$common_args -s $server_static_threads -d $server_dynamic_threads -o $server_iorfile"); + $SV = $server->CreateProcess ("server", "-s $server_static_threads -d $server_dynamic_threads -o $server_iorfile"); $server_status = $SV->Spawn (); if ($server_status == -1) { @@ -94,7 +91,7 @@ sub run_test } } - $CL[$i] = $client->CreateProcess ("client", "$common_args $arg"); + $CL[$i] = $client->CreateProcess ("client", "$arg"); $CL[$i]->Spawn (); $client_status = $CL[$i]->WaitKill ($client->ProcessStartWaitInterval () + 80); diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/bands_r b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/bands_r deleted file mode 100644 index 2be55e3fa32..00000000000 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/bands_r +++ /dev/null @@ -1 +0,0 @@ -0 10000 20000 30000 diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/invocation_priorities_r b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/invocation_priorities_r deleted file mode 100644 index 795a75037bc..00000000000 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/invocation_priorities_r +++ /dev/null @@ -1 +0,0 @@ -5000 25000
\ No newline at end of file diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/lanes_r b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/lanes_r deleted file mode 100644 index 8274a68e2ae..00000000000 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/lanes_r +++ /dev/null @@ -1 +0,0 @@ -0 5000 25000
\ No newline at end of file diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl index 5d6fef3a998..4cfcd847707 100755 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl @@ -30,17 +30,9 @@ my $status = 0; $extra_client_args = "-k file://$client_iorfile -ORBdebuglevel $client_debuglevel -d $client_debug -x"; $extra_server_args = "-ORBdebuglevel $server_debuglevel -d $server_debug"; - -if ($OSNAME eq "solaris") { - $lanes = "lanes_r"; - $bands = "bands_r"; - $inv_prio = "invocation_priorities_r"; -} -else { - $lanes = "lanes"; - $bands = "bands"; - $inv_prio = "invocation_priorities"; -} +$lanes = "lanes"; +$bands = "bands"; +$inv_prio = "invocation_priorities"; sub setup_configurations_2 { diff --git a/TAO/tests/RTCORBA/Server_Declared/continuous.conf b/TAO/tests/RTCORBA/Server_Declared/continuous.conf deleted file mode 100644 index a4871d398f3..00000000000 --- a/TAO/tests/RTCORBA/Server_Declared/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml b/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml deleted file mode 100644 index f297697bc7c..00000000000 --- a/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Server_Declared/run_test.pl b/TAO/tests/RTCORBA/Server_Declared/run_test.pl index 494b89cbd07..1bb249beafc 100755 --- a/TAO/tests/RTCORBA/Server_Declared/run_test.pl +++ b/TAO/tests/RTCORBA/Server_Declared/run_test.pl @@ -55,15 +55,6 @@ if ($^O eq "MSWin32") { $server_args = "-a 1 -b 2"; } -elsif ($^O eq "hpux") { - $continuous = 1; - $server_args = - "-a 17 -b 29"; -} - -if ($continuous) { - $server_args .= " -ORBSvcConf continuous$PerlACE::svcconf_ext"; -} $SV = $server->CreateProcess ("server", "-p $server_iorfile1 -o $server_iorfile2 $server_args"); $CL = $client->CreateProcess ("client", "-p file://$client_iorfile1 -o file://$client_iorfile2"); diff --git a/TAO/tests/RTCORBA/Thread_Pool/continuous.conf b/TAO/tests/RTCORBA/Thread_Pool/continuous.conf deleted file mode 100644 index a4871d398f3..00000000000 --- a/TAO/tests/RTCORBA/Thread_Pool/continuous.conf +++ /dev/null @@ -1,3 +0,0 @@ - -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml b/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml deleted file mode 100644 index f297697bc7c..00000000000 --- a/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl index b88220167c0..ae79da36238 100755 --- a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl +++ b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl @@ -32,7 +32,6 @@ if ($client->PutFile ($svc_conf.'.xml') == -1) { $number_of_clients = 4; $status = 0; -$continuous = ($^O eq 'hpux'); @configurations = ({ @@ -77,10 +76,6 @@ sub run_clients $SV = $server->CreateProcess ("server"); -if ($continuous) { - $SV->Arguments ("-ORBSvcConf continuous$PerlACE::svcconf_ext"); -} - $SV->Spawn (); for $test (@configurations) { |