diff options
author | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-07-12 13:37:26 +0000 |
---|---|---|
committer | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-07-12 13:37:26 +0000 |
commit | 91493d8652dc461ab72e8e91535dbe598253ad8d (patch) | |
tree | 194f22c533283d5883cc3b755b9c2460aa4d85c8 | |
parent | 86b6fb82b24b05c1141ad075034431f359e8b2a5 (diff) | |
download | ATCD-91493d8652dc461ab72e8e91535dbe598253ad8d.tar.gz |
ChangeLogTag: Tue Jul 12 08:33:05 2005 Chad Elliott <elliott_c@ociweb.com>
25 files changed, 180 insertions, 25 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9ba394bae71..cfa3da25954 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,41 @@ +Tue Jul 12 08:33:05 2005 Chad Elliott <elliott_c@ociweb.com> + + * tests/RTCORBA/Banded_Connections/bands.irix: + * tests/RTCORBA/Banded_Connections/run_test.pl: + * tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: + + Added support for IRIX. + + * tests/RTCORBA/Collocation/continuous.conf: + * tests/RTCORBA/Collocation/continuous.conf.xml: + * tests/RTCORBA/Collocation/run_test.pl: + * tests/RTCORBA/Destroy_Thread_Pool/continuous.conf: + * tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml: + * tests/RTCORBA/Destroy_Thread_Pool/run_test.pl: + * tests/RTCORBA/Persistent_IOR/continuous.conf: + * tests/RTCORBA/Persistent_IOR/continuous.conf.xml: + * tests/RTCORBA/Persistent_IOR/run_test.pl: + * tests/RTCORBA/Persistent_IOR/server.cpp: + * tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf: + * tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml: + * tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl: + * tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp: + * tests/RTCORBA/Server_Declared/continuous.conf: + * tests/RTCORBA/Server_Declared/continuous.conf.xml: + * tests/RTCORBA/Server_Declared/run_test.pl: + * tests/RTCORBA/Thread_Pool/continuous.conf: + * tests/RTCORBA/Thread_Pool/continuous.conf.xml: + * tests/RTCORBA/Thread_Pool/run_test.pl: + + For HP-UX, the only priority mapping that makes sense is + continuous. For each of these tests, I added a configurator file + to set the priority mapping and only use it on HP-UX. + + * tests/RTCORBA/common_args.cpp: + + sscanf wasn't working properly (at least with aCC 3.60) so I + switched to strtoul. + Tue Jul 12 13:29:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tests/RTCORBA/Persistent_IOR/client.cpp: @@ -231,11 +269,11 @@ Mon Jul 11 13:39:34 2005 Gary Maxey <gary.maxey@hp.com> Mon Jul 11 21:08:17 2005 Boris Kolpackov <boris@kolpackov.net> - * orbsvcs/examples/Notify/Federation/Gate/Export.h: - * orbsvcs/examples/Notify/Federation/Gate/Gate.h: - * orbsvcs/examples/Notify/Federation/Gate/Gate.mpc: + * orbsvcs/examples/Notify/Federation/Gate/Export.h: + * orbsvcs/examples/Notify/Federation/Gate/Gate.h: + * orbsvcs/examples/Notify/Federation/Gate/Gate.mpc: - Added export macro. + Added export macro. Mon Jul 11 09:07:26 2005 Justin Michel <michel_j@ociweb.com> diff --git a/TAO/tests/RTCORBA/Banded_Connections/bands.irix b/TAO/tests/RTCORBA/Banded_Connections/bands.irix new file mode 100644 index 00000000000..fe403f56fda --- /dev/null +++ b/TAO/tests/RTCORBA/Banded_Connections/bands.irix @@ -0,0 +1 @@ +19 23 24 28 29 33 diff --git a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl index 489c269d6be..ab526f9b9d9 100755 --- a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl +++ b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl @@ -20,23 +20,26 @@ print STDERR "\n********** RTCORBA Priority Banded Connections Unit Test\n"; # Different priority values for the bands on each OS. -$server_args = - "-b bands.unix"; - if ($^O eq "MSWin32") { $server_args = "-b bands.nt"; } - -if ($^O eq "dec_osf") { +elsif ($^O eq "dec_osf") { $server_args = "-b bands.tru64"; } - -if ($^O eq "hpux") { +elsif ($^O eq "hpux") { $server_args = "-b bands.hpux"; } +elsif ($^O eq "irix") { + $server_args = + "-b bands.irix"; +} +else { + $server_args = + "-b bands.unix"; +} if (PerlACE::is_vxworks_test()) { $SV = new PerlACE::ProcessVX ("server", $server_args); diff --git a/TAO/tests/RTCORBA/Collocation/continuous.conf b/TAO/tests/RTCORBA/Collocation/continuous.conf new file mode 100644 index 00000000000..8d8795f4817 --- /dev/null +++ b/TAO/tests/RTCORBA/Collocation/continuous.conf @@ -0,0 +1,2 @@ +# 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 new file mode 100644 index 00000000000..f297697bc7c --- /dev/null +++ b/TAO/tests/RTCORBA/Collocation/continuous.conf.xml @@ -0,0 +1,6 @@ +<?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 d8e8bcc985b..fe1e28e0b4a 100755 --- a/TAO/tests/RTCORBA/Collocation/run_test.pl +++ b/TAO/tests/RTCORBA/Collocation/run_test.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../bin'; use PerlACE::Run_Test; +$continuous = ($^O eq 'hpux'); + print STDERR "\n********** RTCORBA Collocation Unit Test **********\n\n"; if (PerlACE::is_vxworks_test()) { @@ -17,6 +19,10 @@ else { $T = new PerlACE::Process ("Collocation"); } +if ($continuous) { + $T->Arguments("-ORBSvcConf continuous$PerlACE::svcconf_ext"); +} + $test = $T->SpawnWaitKill(60); 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 new file mode 100644 index 00000000000..8d8795f4817 --- /dev/null +++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf @@ -0,0 +1,2 @@ +# 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 new file mode 100644 index 00000000000..f297697bc7c --- /dev/null +++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml @@ -0,0 +1,6 @@ +<?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 25ccc3504f6..7aa95bf33c1 100755 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl +++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl @@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../bin'; use PerlACE::Run_Test; +$continuous = ($^O eq 'hpux'); + print STDERR "\n********** RTCORBA Destroy_Thread_Pool Unit Test **********\n\n"; if (PerlACE::is_vxworks_test()) { @@ -17,6 +19,10 @@ else { $T = new PerlACE::Process ("Destroy_Thread_Pool"); } +if ($continuous) { + $T->Arguments("-ORBSvcConf continuous$PerlACE::svcconf_ext"); +} + $test = $T->SpawnWaitKill (60); if ($test != 0) { 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 ba40eab7c7d..5e38104203f 100755 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl @@ -12,7 +12,7 @@ $status = 0; $quiet = 0; # check for -q flag -if ($ARGV[0] eq '-q') { +if ($#ARGV >= 0 && $ARGV[0] eq '-q') { $quiet = 1; } @@ -22,8 +22,6 @@ $data_file = PerlACE::LocalFile ("test_run.data"); $debug_level = 1; $iterations = 50; -$priority1 = 45; -$priority2 = 50; if ($^O eq "MSWin32") { $priority1 = 2; @@ -37,6 +35,14 @@ elsif ($^O eq "hpux") { $priority1 = 17; $priority2 = 22; } +elsif ($^O eq "irix") { + $priority1 = 27; + $priority2 = 33; +} +else { + $priority1 = 45; + $priority2 = 50; +} # Clean up leftovers from previous runs. unlink $iorfile; diff --git a/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf b/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf new file mode 100644 index 00000000000..8d8795f4817 --- /dev/null +++ b/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf @@ -0,0 +1,2 @@ +# 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 new file mode 100644 index 00000000000..f297697bc7c --- /dev/null +++ b/TAO/tests/RTCORBA/Persistent_IOR/continuous.conf.xml @@ -0,0 +1,6 @@ +<?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 c7abccc3a34..7a874d31e6b 100755 --- a/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl +++ b/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl @@ -8,10 +8,14 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib '../../../../bin'; use PerlACE::Run_Test; +$status = 0; $iiop_port = 27532; $tp_iiop_port = 27533; -$extra_server_args = "-d 1 -ORBobjrefstyle url -ORBEndpoint iiop://1.0\@:$iiop_port -ORBLaneEndpoint 2:0 iiop://1.0\@:$tp_iiop_port"; +$continuous = ($^O eq 'hpux'); + +$extra_server_args = ($continuous ? "-ORBSvcConf continuous$PerlACE::svcconf_ext " : '') . + "-d 1 -ORBobjrefstyle url -ORBEndpoint iiop://1.0\@:$iiop_port -ORBLaneEndpoint 2:0 iiop://1.0\@:$tp_iiop_port"; @iorfiles = ( @@ -75,9 +79,15 @@ sub run_server $SV->Spawn (); + $server = $SV->Wait (10); + if ($server == 0) + { + return 0; + } + for $file (@$iorfiles) { - if (PerlACE::waitforfile_timed ($file, 10) == -1) + if (PerlACE::waitforfile_timed ($file, 1) == -1) { print STDERR "ERROR: cannot find ior file: $file\n"; $status = 1; diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp index 8cf8cfb2c7c..d75fb4a6afd 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp +++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp @@ -424,6 +424,18 @@ main (int argc, char **argv) orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } + ACE_CATCH (CORBA::INTERNAL, ex) + { + if ((ex.minor() & 0x1F) == 9) { + ACE_DEBUG ((LM_DEBUG, "You must be superuser to run " + "this test on this platform.\n")); + return 0; + } + else { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); + return -1; + } + } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf new file mode 100644 index 00000000000..8d8795f4817 --- /dev/null +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf @@ -0,0 +1,2 @@ +# 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 new file mode 100644 index 00000000000..f297697bc7c --- /dev/null +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml @@ -0,0 +1,6 @@ +<?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 d30f64811a0..158192e3461 100755 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl @@ -11,6 +11,8 @@ use PerlACE::Run_Test; $server_static_threads = 1; $server_dynamic_threads = 0; $status = 0; +$continuous = ($^O eq 'hpux'); +$common_args = ($continuous ? "-ORBSvcConf continuous$PerlACE::svcconf_ext" : ''); @configurations = ( @@ -47,11 +49,12 @@ sub run_test $arg = $parms[0]; if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server", "-s $server_static_threads -d $server_dynamic_threads"); + $SV = new PerlACE::ProcessVX ("server", "$common_args -s $server_static_threads -d $server_dynamic_threads"); } else { - $SV = new PerlACE::Process ("server", "-s $server_static_threads -d $server_dynamic_threads"); + $SV = new PerlACE::Process ("server", "$common_args -s $server_static_threads -d $server_dynamic_threads"); } + $server = $SV->Spawn (); if ($server == -1) { @@ -79,7 +82,7 @@ sub run_test print $test->{file}."\n"; } - $CL[$i] = new PerlACE::Process ("client", $arg); + $CL[$i] = new PerlACE::Process ("client", "$common_args $arg"); $CL[$i]->Spawn (); $client = $CL[$i]->WaitKill (20); diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp index 972265b77f7..e4ae87b051b 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp @@ -69,7 +69,13 @@ test_i::method (CORBA::ULong work, else if (current_priority == this->high_priority_) priority_string = "high"; else - ACE_ASSERT (0); + { + ACE_ERROR ((LM_ERROR, "ERROR: %d != %d and %d != %d\n", + current_priority, this->low_priority_, + current_priority, this->high_priority_)); + ACE_ASSERT (0); + } + ACE_DEBUG ((LM_DEBUG, "test_i::method - %s started at %T (%P|%t|%d|%d) for %d secs at priority %s\n", diff --git a/TAO/tests/RTCORBA/Server_Declared/continuous.conf b/TAO/tests/RTCORBA/Server_Declared/continuous.conf new file mode 100644 index 00000000000..8d8795f4817 --- /dev/null +++ b/TAO/tests/RTCORBA/Server_Declared/continuous.conf @@ -0,0 +1,2 @@ +# 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 new file mode 100644 index 00000000000..f297697bc7c --- /dev/null +++ b/TAO/tests/RTCORBA/Server_Declared/continuous.conf.xml @@ -0,0 +1,6 @@ +<?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 04c75bb3b3f..8e70a8d879c 100755 --- a/TAO/tests/RTCORBA/Server_Declared/run_test.pl +++ b/TAO/tests/RTCORBA/Server_Declared/run_test.pl @@ -29,10 +29,15 @@ elsif ($^O eq "dec_osf") { "-a 20 -b 30"; } elsif ($^O eq "hpux") { + $continuous = 1; $server_args = "-a 17 -b 29"; } +if ($continuous) { + $server_args .= " -ORBSvcConf continuous$PerlACE::svcconf_ext"; +} + $client_args = "-p file://$iorfile1 -o file://$iorfile2"; if (PerlACE::is_vxworks_test()) { $SV = new PerlACE::ProcessVX ("server", "-p test1.ior -o test2.ior $server_args"); diff --git a/TAO/tests/RTCORBA/Thread_Pool/continuous.conf b/TAO/tests/RTCORBA/Thread_Pool/continuous.conf new file mode 100644 index 00000000000..8d8795f4817 --- /dev/null +++ b/TAO/tests/RTCORBA/Thread_Pool/continuous.conf @@ -0,0 +1,2 @@ +# 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 new file mode 100644 index 00000000000..f297697bc7c --- /dev/null +++ b/TAO/tests/RTCORBA/Thread_Pool/continuous.conf.xml @@ -0,0 +1,6 @@ +<?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 568383dfa70..df32e821eef 100755 --- a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl +++ b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl @@ -10,6 +10,7 @@ use PerlACE::Run_Test; $number_of_clients = 4; $status = 0; +$continuous = ($^O eq 'hpux'); @configurations = ( @@ -63,6 +64,10 @@ else { $SV = new PerlACE::Process ("server"); } +if ($continuous) { + $SV->Arguments ("-ORBSvcConf continuous$PerlACE::svcconf_ext"); +} + $SV->Spawn (); for $test (@configurations) diff --git a/TAO/tests/RTCORBA/common_args.cpp b/TAO/tests/RTCORBA/common_args.cpp index b80ca5720d0..3085aa72bcb 100644 --- a/TAO/tests/RTCORBA/common_args.cpp +++ b/TAO/tests/RTCORBA/common_args.cpp @@ -4,6 +4,7 @@ #include "ace/Array_Base.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_math.h" +#include "ace/OS_NS_stdlib.h" typedef ACE_Array_Base<CORBA::ULong> ULong_Array; @@ -158,11 +159,16 @@ get_values (const char *test_type, char* working_string = string; for (CORBA::ULong i = 0; i < length; ++i) { - result = ::sscanf (working_string, - "%ul", - &values[i]); - if (result == 0 || result == EOF) - break; + // sscanf with "%ul" doesn't seem to work properly on HP-UX. So, + // we will use strtoul instead. + char* endptr = 0; + values[i] = ACE_OS::strtoul (working_string, &endptr, 10); + + if (endptr != working_string && endptr != 0 && *endptr != '\0') + { + result = 0; + break; + } working_string += ACE_OS::strlen (working_string); working_string += 1; |