diff options
Diffstat (limited to 'TAO/orbsvcs/tests')
59 files changed, 28 insertions, 210 deletions
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp index a6e3b6a798c..b24fd7d9b5f 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp @@ -256,13 +256,6 @@ static const short ace_cc_yycheck[] = { 4, #pragma alloca #define ACE_CC_YYSTACK_USE_ALLOCA #else /* not MSDOS, or __TURBOC__, or _AIX */ -#if 0 -#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up, - and on HPUX 10. Eventually we can turn this on. */ -#define ACE_CC_YYSTACK_USE_ALLOCA -#define alloca __builtin_alloca -#endif /* __hpux */ -#endif #endif /* not _AIX */ #endif /* not MSDOS, or __TURBOC__ */ #endif /* not sparc */ diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index d2a9f33c2a1..8ec3b162ffe 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -90,7 +90,7 @@ Driver::run (int argc, ACE_TCHAR* argv[]) int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, min_priority, diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index 66b26fc2ac2..0202dcaee91 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -84,7 +84,7 @@ ECMS_Driver::run (int argc, ACE_TCHAR* argv[]) int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, min_priority, diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl index a4be43018e0..28afc4f0a1f 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl @@ -27,7 +27,7 @@ ECM_Federation::supplier_types () const ACE_INLINE const char* ECM_Federation::supplier_name (CORBA::ULong i) const { - if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->supplier_types_)) + if (i < static_cast<CORBA::ULong> (this->supplier_types_)) return this->supplier_names_[i]; return 0; } @@ -35,7 +35,7 @@ ECM_Federation::supplier_name (CORBA::ULong i) const ACE_INLINE CORBA::ULong ECM_Federation::supplier_ipaddr (CORBA::ULong i) const { - if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->supplier_types_)) + if (i < static_cast<CORBA::ULong> (this->supplier_types_)) return this->supplier_ipaddr_[i]; return 0; } @@ -49,7 +49,7 @@ ECM_Federation::consumer_types () const ACE_INLINE const char* ECM_Federation::consumer_name (CORBA::ULong i) const { - if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->consumer_types_)) + if (i < static_cast<CORBA::ULong> (this->consumer_types_)) return this->consumer_names_[i]; return 0; } @@ -57,7 +57,7 @@ ECM_Federation::consumer_name (CORBA::ULong i) const ACE_INLINE CORBA::ULong ECM_Federation::consumer_ipaddr (CORBA::ULong i) const { - if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->consumer_types_)) + if (i < static_cast<CORBA::ULong> (this->consumer_types_)) return this->consumer_ipaddr_[i]; return 0; } diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index c0f9d476954..e9481bcd951 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -21,10 +21,6 @@ #include "ace/OS_NS_strings.h" #include <memory> -#if defined (sun) -# include <sys/lwp.h> /* for _lwp_self */ -#endif /* sun */ - Test_ECG::Test_ECG () : lcl_name_ ("Test_ECG"), rmt_name_ (""), @@ -60,22 +56,13 @@ Test_ECG::Test_ECG () void print_priority_info (const char *const name) { -#if defined (ACE_HAS_PTHREADS) || defined (sun) +#if defined (ACE_HAS_PTHREADS) #if defined (ACE_HAS_PTHREADS) struct sched_param param; int policy, status; if ((status = pthread_getschedparam (pthread_self (), &policy, ¶m)) == 0) { -# ifdef sun - ACE_DEBUG ((LM_DEBUG, - "%C (%lu|%u); policy is %d, priority is %d\n", - name, - ACE_OS::getpid (), - _lwp_self (), - pthread_self (), - policy, param.sched_priority)); -# else /* ! sun */ ACE_DEBUG ((LM_DEBUG, "%C (%lu|%u); policy is %d, priority is %d\n", name, @@ -83,7 +70,6 @@ print_priority_info (const char *const name) 0, pthread_self (), policy, param.sched_priority )); -# endif /* ! sun */ } else { ACE_DEBUG ((LM_DEBUG,"pthread_getschedparam failed: %d\n", status)); } @@ -119,7 +105,7 @@ print_priority_info (const char *const name) #endif /* sun */ #else ACE_UNUSED_ARG (name); -#endif /* ACE_HAS_PTHREADS || sun */ +#endif /* ACE_HAS_PTHREADS */ } int @@ -222,7 +208,7 @@ Test_ECG::run (int argc, ACE_TCHAR* argv[]) int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, min_priority, diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index a10cc5b53ad..403a38f8f75 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -93,10 +93,9 @@ ECT_Consumer_Driver::run (int argc, ACE_TCHAR* argv[]) } } - int min_priority = - ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, min_priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index 4168b9c133c..4dc0053f3b6 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -104,10 +104,9 @@ ECT_Supplier_Driver::run (int argc, ACE_TCHAR* argv[]) } } - int min_priority = - ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO); + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, min_priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index d2eaa541490..cc1bc13d837 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -136,10 +136,9 @@ ECT_Throughput::run (int argc, ACE_TCHAR* argv[]) int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; - priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, - priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp index e467d335503..2837ba34dbb 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp @@ -153,8 +153,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) TAO_ECG_UDP_Out_Endpoint endpoint; // need to be explicit about the address type when built with // IPv6 support, otherwise SOCK_DGram::open defaults to ipv6 when - // given a sap_any address. This causes trouble on at least solaris - // and windows, or at most on not-linux. + // given a sap_any address. This causes trouble on at least windows, + // or at most on not-linux. if (endpoint.dgram ().open (ACE_Addr::sap_any, send_addr.get_type()) == -1) { diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index f3644488f24..b5b82c362ff 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -27,8 +27,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp index 91415ec499c..4310fd57c57 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp @@ -26,8 +26,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index c297a9147e3..b72b31e0d90 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -220,8 +220,8 @@ EC_Driver::move_to_rt_class () + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, priority, ACE_SCOPE_PROCESS)) != 0) diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl index f9cc8fd812f..f45ddef340f 100755 --- a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl +++ b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl @@ -167,9 +167,6 @@ print STDERR "Starting Client: $prog $args\n"; $CL = $test->CreateProcess ("$prog", "$args"); # Some systems may take a very long time to process 100 objects. -# For example, on a Solaris/SPARC system it was found that it took -# 8 seconds to bind 100 objects compared to 0.08 seconds on a -# Linux/Intel computer. So add to the wait time. $client = $CL->SpawnWaitKill ($test->ProcessStartWaitInterval() + 105); if ($client != 0) { diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp index 15ac48ac812..2f3c009efb1 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp @@ -77,7 +77,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) // Ignore the error value since the directory may already exist. const ACE_TCHAR *test_dir {}; -#if !defined (ACE_HAS_WINCE) # if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) test_dir = ACE_OS::getenv (ACE_TEXT ("ACE_TEST_DIR")); # else @@ -93,7 +92,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ACE_WIN32 || !ACE_USES_WCHAR */ if (test_dir == 0) -#endif /* ACE_HAS_WINCE */ test_dir = ACE_TEXT (""); // This could be done with ACE_OS::sprintf() but it requires different @@ -123,11 +121,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) // directory does exist, it causes a wierd console error message // about "cat: input error on standard input: Is a directory". So, // VxWorks users must create the directory manually. -# if defined (ACE_HAS_WINCE) - ACE_OS::mkdir (ACE_LOG_DIRECTORY_FOR_MKDIR); -# else ACE_OS::mkdir (ACE_LOG_DIRECTORY); -# endif // ACE_HAS_WINCE # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp index 15ac48ac812..2f3c009efb1 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp @@ -77,7 +77,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) // Ignore the error value since the directory may already exist. const ACE_TCHAR *test_dir {}; -#if !defined (ACE_HAS_WINCE) # if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) test_dir = ACE_OS::getenv (ACE_TEXT ("ACE_TEST_DIR")); # else @@ -93,7 +92,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ACE_WIN32 || !ACE_USES_WCHAR */ if (test_dir == 0) -#endif /* ACE_HAS_WINCE */ test_dir = ACE_TEXT (""); // This could be done with ACE_OS::sprintf() but it requires different @@ -123,11 +121,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) // directory does exist, it causes a wierd console error message // about "cat: input error on standard input: Is a directory". So, // VxWorks users must create the directory manually. -# if defined (ACE_HAS_WINCE) - ACE_OS::mkdir (ACE_LOG_DIRECTORY_FOR_MKDIR); -# else ACE_OS::mkdir (ACE_LOG_DIRECTORY); -# endif // ACE_HAS_WINCE # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp index 15ac48ac812..2f3c009efb1 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp @@ -77,7 +77,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) // Ignore the error value since the directory may already exist. const ACE_TCHAR *test_dir {}; -#if !defined (ACE_HAS_WINCE) # if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) test_dir = ACE_OS::getenv (ACE_TEXT ("ACE_TEST_DIR")); # else @@ -93,7 +92,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ACE_WIN32 || !ACE_USES_WCHAR */ if (test_dir == 0) -#endif /* ACE_HAS_WINCE */ test_dir = ACE_TEXT (""); // This could be done with ACE_OS::sprintf() but it requires different @@ -123,11 +121,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) // directory does exist, it causes a wierd console error message // about "cat: input error on standard input: Is a directory". So, // VxWorks users must create the directory manually. -# if defined (ACE_HAS_WINCE) - ACE_OS::mkdir (ACE_LOG_DIRECTORY_FOR_MKDIR); -# else ACE_OS::mkdir (ACE_LOG_DIRECTORY); -# endif // ACE_HAS_WINCE # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) diff --git a/TAO/orbsvcs/tests/HTIOP/test_config.h b/TAO/orbsvcs/tests/HTIOP/test_config.h index 6a0904281cf..e08ad3c0a52 100644 --- a/TAO/orbsvcs/tests/HTIOP/test_config.h +++ b/TAO/orbsvcs/tests/HTIOP/test_config.h @@ -35,13 +35,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/Log_Msg.h" -#if defined (ACE_HAS_WINCE) -// Note that Pocket PC 2002 will NOT create a directory if it does not start with a leading '\'. -// PPC 2002 only accepts '\log' as a valid directory name, while 'log\' works under WinCE 3.0. -# define ACE_LOG_DIRECTORY_FOR_MKDIR ACE_TEXT ("\\log") -# define ACE_LOG_DIRECTORY ACE_TEXT ("\\log\\") -# define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X) -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) # define ACE_LOG_DIRECTORY ACE_TEXT ("log\\") # define ACE_LOG_DIRECTORY_FOR_MKDIR ACE_TEXT ("log\\") # define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X) @@ -57,11 +51,11 @@ #define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".log") -#if defined (ACE_HAS_WINCE) || defined (ACE_HAS_PHARLAP) +#if defined (ACE_HAS_PHARLAP) size_t const ACE_MAX_CLIENTS = 4; #else size_t const ACE_MAX_CLIENTS = 30; -#endif /* ACE_HAS_WINCE */ +#endif /* ACE_HAS_PHARLAP */ size_t const ACE_NS_MAX_ENTRIES = 1000; size_t const ACE_DEFAULT_USECS = 1000; diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc index a8fa7f3af1e..5769b24876a 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc @@ -57,12 +57,6 @@ project(nestea server) : portableserver, orbsvcsexe, avoids_minimum_corba, iorta nestea_server_i.cpp nestea_server.cpp } - // To avoid link errors with SunCC 5.[34], put this project's - // object files (and resulting SunWS_cache directory) in a different - // location than the default. - verbatim(gnuace, macros) { - VDIR = $(if $(ARCH),$(ARCH)/).obj/nestea_server/ - } } project(nestea client) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable { @@ -77,11 +71,5 @@ project(nestea client) : portableserver, orbsvcsexe, avoids_minimum_corba, iorta nestea_client_i.cpp nestea_client.cpp } - // To avoid link errors with SunCC 5.[34], put this project's - // object files (and resulting SunWS_cache directory) in a different - // location than the default. - verbatim(gnuace, macros) { - VDIR = $(if $(ARCH),$(ARCH)/).obj/nestea_client/ - } } diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp index 27a7cc1090c..3d1bbe2684d 100644 --- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp @@ -55,7 +55,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { // Detection of closed on read currently not working certain platforms. -#if defined (sun) || defined (AIX) || defined (__FreeBSD_version) +#if defined (__FreeBSD_version) return 2; #endif diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/README b/TAO/orbsvcs/tests/Miop/McastLocal/README index ef226909492..1d6d2bc44db 100644 --- a/TAO/orbsvcs/tests/Miop/McastLocal/README +++ b/TAO/orbsvcs/tests/Miop/McastLocal/README @@ -17,13 +17,8 @@ loopback interface (via its This is testing that these configuartion options are correctly working for MIOP. *********************************** -Note -This test currently fails on Solaris (at least ultra10) -as loopback multicasting seems to have a hardcoded (and unchangeable) SndSock -size of 0. It then throws away all data that is being sent by the client, -therefore the servers will timeout as they won't receive any message. -Some other systems (AIX and MacOS) also have problems with loopback +Some other systems (MacOS) also have problems with loopback multicasting issuing errno such as "Network/address unreachable" for each send. diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl index fb38960eccc..4171598ddae 100755 --- a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl @@ -22,8 +22,6 @@ my $test = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed $test->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $experiment_timeout = 60; $startup_timeout = 60; diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl index 1f699934ef0..d8abc1dad28 100755 --- a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl +++ b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl @@ -22,8 +22,6 @@ my $test = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed $test->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $experiment_timeout = 60; $startup_timeout = 60; diff --git a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl index 1e3905e547c..65a6f4e22fa 100755 --- a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl index 78f6114cfeb..7aebe8adb25 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl index 91ae2a85513..4680033d4e9 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $domain1 = "domain1"; $domain2 = "domain2"; $expect_pass = "0"; diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl index 46929f02acf..793ae6427e5 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl @@ -26,8 +26,6 @@ $sup->AddLibPath ('../lib'); $con1->AddLibPath ('../lib'); $con2->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl index 72ee2ef01ec..94b32ace888 100755 --- a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl @@ -28,8 +28,6 @@ $stc->AddLibPath ('../lib'); $ses->AddLibPath ('../lib'); $sec->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); $deadline = 0; diff --git a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl index 08fb3d48377..4d89c2ea9c4 100755 --- a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl @@ -7,8 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; -PerlACE::check_privilege_group(); - $status = 0; $debug_level = '0'; diff --git a/TAO/orbsvcs/tests/Notify/MC/run_test.pl b/TAO/orbsvcs/tests/Notify/MC/run_test.pl index 2c39fbdd1d8..0c94da066bd 100755 --- a/TAO/orbsvcs/tests/Notify/MC/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/MC/run_test.pl @@ -26,8 +26,6 @@ $mon->AddLibPath ('../lib'); $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - # define the following as necessary to customize the test my $static_build = 0; my $port = $ns->RandomPort (); diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl index c5bbbcf2552..4132769ee50 100755 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $experiment_timeout = 60; $startup_timeout = 60; $shutdown_timeout = 10; diff --git a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl index b26025b89d4..fbe92157694 100755 --- a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl @@ -28,8 +28,6 @@ $stc->AddLibPath ('../lib'); $ses->AddLibPath ('../lib'); $sec->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $deadline = 0; $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h index 110c1cbf2c6..a5457acb7d2 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h @@ -50,10 +50,6 @@ protected: /// Create the POA with the params parsed. void create (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa); -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE, diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl index 8c557aa1972..efb64a5eacf 100755 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl index d9b2fbadf98..fdc1cd84a40 100755 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl index 3b6d2c1b6c7..556c71e84de 100755 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl index 7002b6aaf44..15b32fb30aa 100755 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl @@ -24,8 +24,6 @@ my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - $port = $ns->RandomPort (); $host = $ns->HostName (); diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl index c6282c68e8b..0b38411716b 100755 --- a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl @@ -21,8 +21,6 @@ my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\ my $sup = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; -PerlACE::check_privilege_group(); - $experiment_timeout = 120; $startup_timeout = 120; $nfsconffile = "notify.conf"; diff --git a/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl b/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl index 0795c8cce42..1c95fc0d989 100755 --- a/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl @@ -25,8 +25,6 @@ $sup->AddLibPath ('../lib'); $con->AddLibPath ('../lib'); $ns->AddLibPath ('../lib'); -PerlACE::check_privilege_group(); - #my $nscorbaloc = "-ORBInitRef NameService=file://$namingior"; my $supiorfile = "supplier.ior"; diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp index be12aa0b2b0..3df1a5da8d2 100644 --- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp +++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp @@ -3,12 +3,12 @@ #include "orbsvcs/NotifyExtC.h" #include "orbsvcs/Notify/Notify_EventChannelFactory_i.h" -// On SunOS 5.8 and MacOS X, the static initialization trick used +// On MacOS X, the static initialization trick used // in the CosNotification_Serv library does not work. Including the // initializer class here works around the problem. -#if defined (sun) || defined (__APPLE__) +#if defined (__APPLE__) #include "orbsvcs/Notify/CosNotify_Initializer.h" -#endif /* sun || __APPLE__ */ +#endif /* __APPLE__ */ #include "tao/TimeBaseC.h" #include "tao/corba.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h index 1f7ecaefee3..527e2bc4844 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h @@ -45,10 +45,6 @@ public: static const char* name (); protected: -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { INIT, diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h index 4cc0689e70c..559ed609abe 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h @@ -25,10 +25,6 @@ class TAO_Notify_Tests_Command; * * @brief Template class to create COMMAND specific factories. */ -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif template <class COMMAND> class TAO_Notify_Tests_Command_Factory_T : public TAO_Notify_Tests_Command_Factory, public ACE_Service_Object { @@ -47,13 +43,7 @@ public: TAO_Notify_Tests_Command* create (); }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Command_Factory_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Command_Factory_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_COMMAND_FACTORY_T_H */ diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h index 7b9a8b7cf82..581379612e4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h @@ -45,10 +45,6 @@ public: protected: /// = Data Members -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE, diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h index e9cedf5d4db..8ba7047f528 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h @@ -74,13 +74,7 @@ protected: const CosNotification::EventTypeSeq & removed); }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Consumer_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Consumer_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Notify_Tests_CONSUMER_T_H */ diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h index aa45aef7489..9900fe4772a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h @@ -49,10 +49,6 @@ public: protected: ///= Data Members -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE, diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h index f679a6682b4..66bd77adb5d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h @@ -44,10 +44,6 @@ public: static const char* name (); protected: -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE_FACTORY, diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h index 263b2df4803..af5ed4e01ad 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h @@ -103,13 +103,7 @@ protected: typename Proxy_Traits::ID proxy_id_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Peer_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Peer_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Notify_Tests_PEER_T_H */ diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h index 12778f61a6e..cac534dd344 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h @@ -47,10 +47,6 @@ public: protected: ///= Data Members -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE, diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h index e0d01d2559d..557188fd4d1 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h @@ -46,10 +46,6 @@ public: static const char* name (); protected: -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE, diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h index e7b13a30048..f95c319339c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h @@ -44,10 +44,6 @@ public: static const char* name (); protected: -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h -#undef COMMAND -#endif enum COMMAND { CREATE, diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h index 43d4e6310b2..cd580dab358 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h @@ -75,13 +75,7 @@ protected: const CosNotification::EventTypeSeq & removed); }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Supplier_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Supplier_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Notify_Tests_SUPPLIER_T_H */ diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl index 3c4198790f7..cf925af1e25 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl @@ -7,8 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; -PerlACE::check_privilege_group(); - my $nm_service = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $nt_service = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; my $consumer = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl index 9411ec61050..0567a2f11c2 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl @@ -6,8 +6,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; -PerlACE::check_privilege_group(); - $status = 0; @test_configs = ( "reactive.conf", "lookup.conf", "listener.conf"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl index a20b3706fb3..546265378a4 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl @@ -22,8 +22,6 @@ my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\ my $sup = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; -PerlACE::check_privilege_group(); - # -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h getopts ("n:s:c:o:h"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl index 0a4f35bb22c..45c3137daeb 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl @@ -22,8 +22,6 @@ my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\ my $sup = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; -PerlACE::check_privilege_group(); - # -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h getopts ("n:s:c:o:h"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl index f58e0e09cc9..06f7066d653 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl @@ -22,8 +22,6 @@ my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\ my $sup = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; -PerlACE::check_privilege_group(); - # -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h getopts ("n:s:c:o:h:debug"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl index 93777990d13..92fd042da40 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl @@ -22,8 +22,6 @@ my $nfs = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\ my $sup = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; my $con = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"; -PerlACE::check_privilege_group(); - # -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h getopts ("n:s:c:o:h:debug"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl index f9b2b14509b..8563834b89c 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl @@ -9,8 +9,6 @@ use PerlACE::TestTarget; use File::Copy; use Getopt::Std; -PerlACE::check_privilege_group(); - $status = 0; $debug_level = '0'; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl index 889e1dfba12..275ed49867e 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl @@ -9,10 +9,6 @@ use PerlACE::TestTarget; use File::Copy; use Getopt::Std; -PerlACE::check_privilege_group(); - -$status = 0; - # -n notify.conf -s high_path.conf -c other_paths.conf -o output_dir -h getopts ("n:s:c:o:h"); diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h index cd921327d7a..6417e6df24d 100644 --- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h +++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h @@ -39,8 +39,6 @@ private: #pragma warning(pop) #endif /* _MSC_VER */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Simple_Dynamic.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_SIMPLE_DYNAMIC_H */ |