diff options
Diffstat (limited to 'ACE/tests')
69 files changed, 104 insertions, 425 deletions
diff --git a/ACE/tests/Array_Map_Test.cpp b/ACE/tests/Array_Map_Test.cpp index 9d8ad4448ce..725814d7f33 100644 --- a/ACE/tests/Array_Map_Test.cpp +++ b/ACE/tests/Array_Map_Test.cpp @@ -296,7 +296,7 @@ index_operator_test () const_reverse_iterator const rlast = const_phonetic.rend (); for (const_reverse_iterator r = const_phonetic.rbegin (); - !(r == rlast); // Sun C++ Forte doesn't support operator!= + (r != rlast); ++r, --letter, --word) { if ((*r).first != *letter || (*r).second != *word) @@ -412,9 +412,6 @@ reference_count_test () std::pair<Map::iterator, bool> result; { - // Enter a new scope block to assure destruction of temporaries - // on systems like Solaris / Sun C++. - result = map.insert (std::make_pair (ACE_TString (ACE_TEXT ("Two")), counted)); @@ -424,9 +421,6 @@ reference_count_test () ACE_TEST_ASSERT (counted.refcount () == 3); { - // Enter a new scope block to assure destruction of temporaries - // on systems like Solaris / Sun C++. - result = map.insert (std::make_pair (ACE_TString (ACE_TEXT ("Three")), counted)); diff --git a/ACE/tests/Auto_Event_Test.cpp b/ACE/tests/Auto_Event_Test.cpp index 7b7d2828a43..dd960c75843 100644 --- a/ACE/tests/Auto_Event_Test.cpp +++ b/ACE/tests/Auto_Event_Test.cpp @@ -22,7 +22,7 @@ #include "ace/Atomic_Op.h" // msec that times are allowed to differ before test fails. -#if defined (ACE_HAS_HI_RES_TIMER) || defined (ACE_HAS_AIX_HI_RES_TIMER) || \ +#if defined (ACE_HAS_HI_RES_TIMER) || \ defined (ACE_HAS_PENTIUM) || \ defined (ACE_HAS_POWERPC_TIMER) # define ACE_ALLOWED_SLACK 100 diff --git a/ACE/tests/Based_Pointer_Test.cpp b/ACE/tests/Based_Pointer_Test.cpp index 875bb70d188..7b5f2ef3761 100644 --- a/ACE/tests/Based_Pointer_Test.cpp +++ b/ACE/tests/Based_Pointer_Test.cpp @@ -49,7 +49,7 @@ class Void_Pointer : public ACE_Based_Pointer<void> # define OBJ_SUFFIX ACE_DLL_SUFFIX #endif /* ACE_LD_DECORATOR_STR */ -#if defined (ACE_WIN32) || defined (ACE_OPENVMS) +#if defined (ACE_WIN32) # define OBJ_PREFIX ACE_DLL_PREFIX #else # define OBJ_PREFIX ACE_TEXT("./") ACE_DLL_PREFIX @@ -108,12 +108,7 @@ int singleton_test () -1); } -#if defined (ACE_OPENVMS) - // with OPENVMS symbol names > 31 cause us trouble with dlsym() - void* foo = dll.symbol (ACE_TEXT ("get_based_pointer_repo_inst")); -#else void* foo = dll.symbol (ACE_TEXT ("get_based_pointer_repository_instance")); -#endif // Cast the void* to function* with a long as intermediate. ptrdiff_t tmp = reinterpret_cast<ptrdiff_t> (foo); diff --git a/ACE/tests/Based_Pointer_Test_Lib.cpp b/ACE/tests/Based_Pointer_Test_Lib.cpp index 555bd2d98c7..fc0b9481c1a 100644 --- a/ACE/tests/Based_Pointer_Test_Lib.cpp +++ b/ACE/tests/Based_Pointer_Test_Lib.cpp @@ -14,16 +14,9 @@ #include "ace/svc_export.h" #include "ace/Based_Pointer_Repository.h" -#if defined (ACE_OPENVMS) -// with OPENVMS symbol names > 31 cause us trouble with dlsym() -extern "C" ACE_Svc_Export void * -get_based_pointer_repo_inst () -#else -extern "C" ACE_Svc_Export void * -get_based_pointer_repository_instance () -#endif +extern "C" ACE_Svc_Export void *get_based_pointer_repository_instance () { - void* baddr = ACE_BASED_POINTER_REPOSITORY::instance(); - return baddr; + void* baddr = ACE_BASED_POINTER_REPOSITORY::instance(); + return baddr; } diff --git a/ACE/tests/Bound_Ptr_Test.h b/ACE/tests/Bound_Ptr_Test.h index 250c8283c25..80cefeff78c 100644 --- a/ACE/tests/Bound_Ptr_Test.h +++ b/ACE/tests/Bound_Ptr_Test.h @@ -3,8 +3,7 @@ /** * @file Bound_Ptr_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author @author Christopher Kohlhoff <chris@kohlhoff.com> */ diff --git a/ACE/tests/Bug_3505_Regression_Test.cpp b/ACE/tests/Bug_3505_Regression_Test.cpp index 0609ec07ed7..291fd895f66 100644 --- a/ACE/tests/Bug_3505_Regression_Test.cpp +++ b/ACE/tests/Bug_3505_Regression_Test.cpp @@ -14,7 +14,6 @@ #include "ace/Service_Gestalt.h" #include "test_config.h" - int run_main (int, ACE_TCHAR *[]) { diff --git a/ACE/tests/Bug_3541_Regression_Test.cpp b/ACE/tests/Bug_3541_Regression_Test.cpp index 8fb700a7d34..302ade29a3b 100644 --- a/ACE/tests/Bug_3541_Regression_Test.cpp +++ b/ACE/tests/Bug_3541_Regression_Test.cpp @@ -21,7 +21,7 @@ run_main (int, ACE_TCHAR *[]) int ret = 0; -#if defined(ACE_WIN32) && !defined (ACE_USES_WINCE_SEMA_SIMULATION) +#if defined(ACE_WIN32) int lastError; // ACE_OS::event_init() diff --git a/ACE/tests/Bug_3911_Regression_Test.cpp b/ACE/tests/Bug_3911_Regression_Test.cpp index 7eb5463d201..55a98040cd0 100644 --- a/ACE/tests/Bug_3911_Regression_Test.cpp +++ b/ACE/tests/Bug_3911_Regression_Test.cpp @@ -20,14 +20,7 @@ init_test () { // Cleanup the MMAP file so we won't trip over the leftover mmap // file from the previous crash. -#if defined (ACE_HAS_WINCE) || defined (ACE_OPENVMS) - // WinCE cannot do fixed base, ever. - ACE_MMAP_Memory_Pool_Options options - (0, - ACE_MMAP_Memory_Pool_Options::NEVER_FIXED); -#else ACE_MMAP_Memory_Pool_Options options (ACE_DEFAULT_BASE_ADDR); -#endif /* ACE_HAS_WINCE */ //FUZZ: disable check_for_lack_ACE_OS ACE_MMAP_Memory_Pool mmap (MMAP_FILENAME, &options); //FUZZ: enable check_for_lack_ACE_OS diff --git a/ACE/tests/Bug_3943_Regression_Test.cpp b/ACE/tests/Bug_3943_Regression_Test.cpp index 2763741b581..25d9e48e46d 100644 --- a/ACE/tests/Bug_3943_Regression_Test.cpp +++ b/ACE/tests/Bug_3943_Regression_Test.cpp @@ -95,7 +95,6 @@ namespace { const DWORD minorVersion, const BYTE productType) { -#if !defined(ACE_HAS_WINCE) OSVERSIONINFOEX versioninfo; versioninfo.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEX); versioninfo.dwMajorVersion = majorVersion; @@ -170,27 +169,19 @@ namespace { } return 0; -#else // defined(ACE_HAS_WINCE) - // no version testing of WinCE has been performed - ACE_UNUSED_ARG (majorVersion); - ACE_UNUSED_ARG (minorVersion); - ACE_UNUSED_ARG (productType); - return -1; -#endif /* ACE_HAS_WINCE */ } #endif /* ACE_WIN32 */ int processENOBUFS() { -#if defined (ACE_WIN32) && !defined(ACE_HAS_WINCE) +#if defined (ACE_WIN32) // it has been identified that Windows7 does not have the ENOBUFS issue // but testing has not been performed on Server 2008 or Vista to identify - // wether the issue exists or not + // whether the issue exists or not return beforeVersion(6, 1, VER_NT_WORKSTATION); -#else // defined(ACE_HAS_WINCE) - // currently, no versions of WINCE identified to not have the ENOBUFS error +#else return 0; -#endif /* ACE_WIN32 && !ACE_HAS_WINCE */ +#endif /* ACE_WIN32 */ } struct IovecGuard @@ -205,31 +196,27 @@ namespace { static const int ALL_SLOTS = -1; }; + /* + * This class is the product created by both ACE_Connector + * and ACE_Acceptor objects. + */ class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> { - // = TITLE - // This class is the product created by both <ACE_Connector> - // and <ACE_Acceptor> objects. - // - // = DESCRIPTION - // This class gets its own header file to work around AIX C++ - // compiler "features" related to template instantiation... It is - // only used by Conn_Test.cpp. public: - Svc_Handler (ACE_Thread_Manager * = 0); // Do-nothing constructor. + Svc_Handler (ACE_Thread_Manager * = nullptr); - int open (void *) override; // Initialization hook. + int open (void *) override; - void send_data (); // Send data to server. + void send_data (); - void recv_data (); // Recv data from client. + void recv_data (); - int close (u_long = 0) override; // Shutdown the <Svc_Handler>. + int close (u_long = 0) override; private: enum Direction { READX, WRITEX }; // VxWorks defines READ and WRITE diff --git a/ACE/tests/CDR_File_Test.cpp b/ACE/tests/CDR_File_Test.cpp index aee71f3aa1f..40ccca78f00 100644 --- a/ACE/tests/CDR_File_Test.cpp +++ b/ACE/tests/CDR_File_Test.cpp @@ -70,32 +70,6 @@ ostream & operator << (ostream &os, const CDR_Test &t) { -#if defined (ACE_OPENVMS) - // to circumvent some obscure bug with OpenVMS iostreams digit conversions - // combined with shared libraries???? - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\n" - "Char: %c\n" - "Short: %u\n" - "Long: %d\n"), - t.char_, - t.word2_, - t.word4_)); - - ACE_CDR::ULongLong hi = (t.word8_ >> 32); - ACE_CDR::ULongLong lo = (t.word8_ & 0xffffffff); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\n" - "ULongLong 1st half: %x\n" - "ULongLong 2nd half: %x\n" - "Float: %f\n" - "Double: %f\n"), - ACE_Utils::truncate_cast<ACE_UINT32> (hi), - ACE_Utils::truncate_cast<ACE_UINT32> (lo), - t.fpoint_, - t.dprec_)); -#else os << "Char: " << t.char_ << endl << "Short: " << t.word2_ << endl << "Long: " << t.word4_ << endl; @@ -113,7 +87,6 @@ operator << (ostream &os, << dec << endl << "Float: " << t.fpoint_ << endl << "Double: " << t.dprec_ << endl; -#endif return os; } diff --git a/ACE/tests/Cache_Map_Manager_Test.h b/ACE/tests/Cache_Map_Manager_Test.h index 24cf916479a..31b2569f23e 100644 --- a/ACE/tests/Cache_Map_Manager_Test.h +++ b/ACE/tests/Cache_Map_Manager_Test.h @@ -4,8 +4,7 @@ /** * @file Cache_Map_Manager_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> */ diff --git a/ACE/tests/Cached_Accept_Conn_Test.cpp b/ACE/tests/Cached_Accept_Conn_Test.cpp index 960816e3402..71c07ca733c 100644 --- a/ACE/tests/Cached_Accept_Conn_Test.cpp +++ b/ACE/tests/Cached_Accept_Conn_Test.cpp @@ -30,18 +30,7 @@ #pragma warning(disable:4503) #endif /* _MSC_VER */ -// Note: To keep both sunCC5.0 without debugging symbols and gcc2.7.3 -// happy, it was necessary to have the definitions of the methods of -// the Accept_Strategy before the instantiations. - -// HPUX doesn't accept these declaration after their usage. - -// For some strange reason this must *not* be static since otherwise -// certain versions of SunC++ will not link properly. int connection_accepted = 0; - -// For some strange reason this must *not* be static since otherwise -// certain versions of SunC++ will not link properly. int debug = 0; template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> diff --git a/ACE/tests/Cached_Accept_Conn_Test.h b/ACE/tests/Cached_Accept_Conn_Test.h index 39d680c87e1..def161547ec 100644 --- a/ACE/tests/Cached_Accept_Conn_Test.h +++ b/ACE/tests/Cached_Accept_Conn_Test.h @@ -3,8 +3,7 @@ /** * @file Cached_Accept_Conn_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> */ diff --git a/ACE/tests/Cached_Conn_Test.h b/ACE/tests/Cached_Conn_Test.h index c9e9d6e6fe5..4ca36cd919c 100644 --- a/ACE/tests/Cached_Conn_Test.h +++ b/ACE/tests/Cached_Conn_Test.h @@ -3,8 +3,7 @@ /** * @file Cached_Conn_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> */ diff --git a/ACE/tests/Collection_Test.h b/ACE/tests/Collection_Test.h index b8f4c1cd76e..176fa491e51 100644 --- a/ACE/tests/Collection_Test.h +++ b/ACE/tests/Collection_Test.h @@ -5,8 +5,7 @@ /** * @file Collection_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Irfan Pyarali <irfan@cs.wustl.edu> */ diff --git a/ACE/tests/Compiler_Features_09_Test.cpp b/ACE/tests/Compiler_Features_09_Test.cpp index c765724237a..28e0be3cdc1 100644 --- a/ACE/tests/Compiler_Features_09_Test.cpp +++ b/ACE/tests/Compiler_Features_09_Test.cpp @@ -71,10 +71,6 @@ run_main (int, ACE_TCHAR *[]) // ... with a compliant implementation of std::auto_ptr<> you should be // able to write: // x = y; - // but the Solaris compiler was broken as of August, 2009!! So you have - // to work around in the following way. This compiler is important - // enough for the ACE community, so we have to support this broken - // configuration ... x.reset(y.release()); // ... there should be just one destruction so far ... diff --git a/ACE/tests/Conn_Test.h b/ACE/tests/Conn_Test.h index 637466d19fd..49531fb5603 100644 --- a/ACE/tests/Conn_Test.h +++ b/ACE/tests/Conn_Test.h @@ -4,9 +4,6 @@ /** * @file Conn_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. - * * @author Irfan Pyarali <irfan@cs.wustl.edu> */ //============================================================================= @@ -27,10 +24,6 @@ * * @brief This class is the product created by both <ACE_Connector> * and <ACE_Acceptor> objects. - * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Conn_Test.cpp. */ class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> { diff --git a/ACE/tests/DLL_Test.cpp b/ACE/tests/DLL_Test.cpp index 7e43c6267f8..6539deccb62 100644 --- a/ACE/tests/DLL_Test.cpp +++ b/ACE/tests/DLL_Test.cpp @@ -26,7 +26,7 @@ # define OBJ_SUFFIX ACE_DLL_SUFFIX #endif /* ACE_LD_DECORATOR_STR */ -#if defined (ACE_WIN32) || defined (ACE_OPENVMS) +#if defined (ACE_WIN32) # define OBJ_PREFIX ACE_DLL_PREFIX #else # define OBJ_PREFIX ACE_TEXT("./") ACE_DLL_PREFIX diff --git a/ACE/tests/Dynamic_Priority_Test.cpp b/ACE/tests/Dynamic_Priority_Test.cpp index de5939b43ed..0d2ec3ff127 100644 --- a/ACE/tests/Dynamic_Priority_Test.cpp +++ b/ACE/tests/Dynamic_Priority_Test.cpp @@ -697,7 +697,7 @@ run_main (int, ACE_TCHAR *[]) ACE_START_TEST (ACE_TEXT ("Dynamic_Priority_Test")); #if defined (ACE_HAS_TIMED_MESSAGE_BLOCKS) - // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. + // Enable FIFO scheduling if (ACE_OS::sched_params ( ACE_Sched_Params ( ACE_SCHED_FIFO, diff --git a/ACE/tests/FIFO_Test.cpp b/ACE/tests/FIFO_Test.cpp index c5f665a4fdc..7a2648516c6 100644 --- a/ACE/tests/FIFO_Test.cpp +++ b/ACE/tests/FIFO_Test.cpp @@ -104,15 +104,8 @@ server (void *arg) ACE_TEXT ("select")), 0); - // On AIX, select() always seems to select a fifo handle as a normal file, - // always readable. Just wait a second... -# if defined (AIX) || defined (HPUX) || defined (__osf__) - ACE_OS::sleep (1); -# endif /* AIX || HPUX */ - // Read the things the client is sending; alphabet, huge overflow, then // alphabet. - char buf[BUFSIZ]; ssize_t recv_count; ssize_t expect = static_cast <ssize_t> (ACE_OS::strlen (ACE_ALPHABET)); diff --git a/ACE/tests/Framework_Component_DLL.h b/ACE/tests/Framework_Component_DLL.h index 91deea999cb..f99bbce4777 100644 --- a/ACE/tests/Framework_Component_DLL.h +++ b/ACE/tests/Framework_Component_DLL.h @@ -3,8 +3,7 @@ /** * @file Framework_Component_DLL.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Don Hinton <dhinton@ieee.org> */ diff --git a/ACE/tests/Framework_Component_Test.h b/ACE/tests/Framework_Component_Test.h index 5a77fb7f623..2b8fd75d3e1 100644 --- a/ACE/tests/Framework_Component_Test.h +++ b/ACE/tests/Framework_Component_Test.h @@ -3,8 +3,7 @@ /** * @file Framework_Component_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Don Hinton <dhinton@ieee.org> */ diff --git a/ACE/tests/INET_Addr_Test.cpp b/ACE/tests/INET_Addr_Test.cpp index ff1b5f8fe6e..2a7e69a51bf 100644 --- a/ACE/tests/INET_Addr_Test.cpp +++ b/ACE/tests/INET_Addr_Test.cpp @@ -248,11 +248,6 @@ int run_main (int, ACE_TCHAR *[]) static_cast<const struct sockaddr_in6*> (addr_port.get_addr()); const struct sockaddr_in6 *check_in6 = static_cast<const struct sockaddr_in6*> (check.get_addr()); -# if defined(AIX) - - ACE_ERROR((LM_ERROR, ACE_TEXT (" addr_port_in6->sin6_len=%d, check_in6->sin6_len=%d\n") - , (int)addr_port_in6->sin6_len, (int)check_in6->sin6_len)); -# endif ACE_ERROR((LM_ERROR, ACE_TEXT (" addr_port_in6->sin6_family=%d, check_in6->sin6_family=%d\n") , (int)addr_port_in6->sin6_family, (int)check_in6->sin6_family)); diff --git a/ACE/tests/IOStream_Test.cpp b/ACE/tests/IOStream_Test.cpp index 46ca847729a..7901b5e84cf 100644 --- a/ACE/tests/IOStream_Test.cpp +++ b/ACE/tests/IOStream_Test.cpp @@ -153,9 +153,8 @@ client (void *arg = 0) // We don't _need_ to dynamically allocate the ACE_SOCK_IOStream. // But if we don't, it doesn't get destroyed on some platforms, - // e.g., g++ 2.7.2.1 and Sun C++ 4.2 on Solaris 2.5.1. (It does work - // on Linux, so the code seems fine.) If we manage the storage - // ourselves, we _will_ destroy it at the end of this function. + // If we manage the storage ourselves, we _will_ destroy it at + // the end of this function. ACE_SOCK_IOStream server; ACE_INET_Addr *remote_addr = (ACE_INET_Addr *) arg; @@ -269,9 +268,8 @@ server (void *arg = 0) { // We don't _need_ to dynamically allocate the ACE_SOCK_IOStream. // But if we don't, it doesn't get destroyed on some platforms, - // e.g., g++ 2.7.2.1 and Sun C++ 4.2 on Solaris 2.5.1. (It does work - // on Linux, so the code seems fine.) If we manage the storage - // ourselves, we _will_ destroy it at the end of this function. + // If we manage the storage ourselves, we _will_ destroy it at + // the end of this function. ACE_SOCK_IOStream client_handler; ACE_INET_Addr server_addr; diff --git a/ACE/tests/Logging_Strategy_Test.cpp b/ACE/tests/Logging_Strategy_Test.cpp index 273dbcadf48..c3d61cadabb 100644 --- a/ACE/tests/Logging_Strategy_Test.cpp +++ b/ACE/tests/Logging_Strategy_Test.cpp @@ -36,8 +36,7 @@ #include "ace/Thread_Manager.h" #if defined (ACE_AS_STATIC_LIBS) || \ - (!defined (ACE_WIN32) && !defined (ACE_HAS_SVR4_DYNAMIC_LINKING) && \ - !defined (__hpux)) + (!defined (ACE_WIN32) && !defined (ACE_HAS_SVR4_DYNAMIC_LINKING)) #include "ace/Logging_Strategy.h" #endif @@ -430,9 +429,7 @@ int run_main (int argc, ACE_TCHAR *argv []) // though, and you may activate the logging strategy as described in // the non-DLL section below under DLL environments as well. -#if !defined (ACE_AS_STATIC_LIBS) && \ - (defined (ACE_WIN32) || defined (ACE_HAS_SVR4_DYNAMIC_LINKING) || \ - defined (__hpux)) +#if !defined (ACE_AS_STATIC_LIBS) && (defined (ACE_WIN32) || defined (ACE_HAS_SVR4_DYNAMIC_LINKING)) // Platform support DLLs, and not configured to link statically ACE_TCHAR arg_str[250]; @@ -467,8 +464,7 @@ int run_main (int argc, ACE_TCHAR *argv []) ((LM_ERROR, "Error initializing the ACE_Logging_Strategy.\n"), 1); -#endif /* !ACE_AS_STATIC_LIBS && (ACE_WIN32 || - ACE_HAS_SVR4_DYNAMIC_LINKING || __hpux) */ +#endif /* !ACE_AS_STATIC_LIBS && (ACE_WIN32 ACE_HAS_SVR4_DYNAMIC_LINKING) */ // launch a new Thread if (ACE_Thread_Manager::instance ()->spawn diff --git a/ACE/tests/MEM_Stream_Test.h b/ACE/tests/MEM_Stream_Test.h index adc7cdd0dd6..990fdd4645e 100644 --- a/ACE/tests/MEM_Stream_Test.h +++ b/ACE/tests/MEM_Stream_Test.h @@ -5,8 +5,7 @@ * @file MEM_Stream_Test.h * * This file has the class definitions needed for template generation in - * MEM_Stream_Test.cpp. They have to be in a separate file so AIX xlC can - * find them at auto-instantiate time. + * MEM_Stream_Test.cpp. * * @author Steve Huston <shuston@riverace.com> */ diff --git a/ACE/tests/Main.cpp b/ACE/tests/Main.cpp index 46833b5d73f..3d248d70163 100644 --- a/ACE/tests/Main.cpp +++ b/ACE/tests/Main.cpp @@ -10,11 +10,8 @@ */ //============================================================================= - #include "ace/OS_main.h" -#if defined (ACE_HAS_WINCE) -# include "ace/ACE.h" -#endif /* ACE_HAS_WINCE */ + int run_main (int argc, ACE_TCHAR *argv[]); int diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp index 97c419fcfbe..c93ea9b304e 100644 --- a/ACE/tests/Malloc_Test.cpp +++ b/ACE/tests/Malloc_Test.cpp @@ -35,7 +35,7 @@ typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> MALLOC; #define MMAP_FILENAME ACE_TEXT ("test_file") #define MUTEX_NAME ACE_TEXT ("test_lock") -#if !defined (ACE_LINUX) && !defined (ACE_OPENVMS) \ +#if !defined (ACE_LINUX) \ && !defined (ACE_ANDROID) \ && !(defined (ACE_WIN32) \ && (defined (ghs) || defined (__MINGW32__) )) \ @@ -70,7 +70,7 @@ static const void *PARENT_BASE_ADDR = ACE_DEFAULT_BASE_ADDR; // processes. So, though the whole PI pointer thing is tested here, // it isn't actually using multiple address ranges. -#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 && !defined (HPUX)) +#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) # define CHILD_ADDR_DELTA (1024*1024) #else # define CHILD_ADDR_DELTA 0 @@ -91,15 +91,7 @@ myallocator (const void *base_addr = 0) if (static_allocator.get () == 0) { -#if defined (ACE_HAS_WINCE) || defined (ACE_OPENVMS) - // WinCE cannot do fixed base, ever. - ACE_UNUSED_ARG (base_addr); - ACE_MMAP_Memory_Pool_Options options - (0, - ACE_MMAP_Memory_Pool_Options::NEVER_FIXED); -#else ACE_MMAP_Memory_Pool_Options options (base_addr); -#endif /* ACE_HAS_WINCE */ #if !defined (ACE_TEST_REMAP_ON_FAULT) options.minimum_bytes_ = 512 * 1024; @@ -118,15 +110,7 @@ init_test (const void *base_addr = 0) { // Cleanup the MMAP file so we won't trip over the leftover mmap // file from the previous crash. -#if defined (ACE_HAS_WINCE) || defined (ACE_OPENVMS) - // WinCE cannot do fixed base, ever. - ACE_UNUSED_ARG (base_addr); - ACE_MMAP_Memory_Pool_Options options - (0, - ACE_MMAP_Memory_Pool_Options::NEVER_FIXED); -#else ACE_MMAP_Memory_Pool_Options options (base_addr); -#endif /* ACE_HAS_WINCE */ //FUZZ: disable check_for_lack_ACE_OS ACE_MMAP_Memory_Pool mmap (MMAP_FILENAME, &options); //FUZZ: enable check_for_lack_ACE_OS @@ -307,7 +291,7 @@ child () // virtual address on every 32 bit process. On WinNT/2k, memory above // 2Gb is reserved for the system. So, we need to check at runtime // (we want an ACE_HAS_WINNT4 == 0 ace to run on either). -// To catch any odd case arising from Pharlap and/or WinCE, do the +// To catch any odd case arising from Pharlap, do the // run time check and run the NT4-or-better code unless we're on // CE or something other than NT4 (Pharlap reports itself as NT 3.51). static void diff --git a/ACE/tests/Malloc_Test.h b/ACE/tests/Malloc_Test.h index c675830581b..6b64e856531 100644 --- a/ACE/tests/Malloc_Test.h +++ b/ACE/tests/Malloc_Test.h @@ -2,9 +2,7 @@ /** * @file Malloc_Test.h * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Malloc_Test.cpp. + * It is only used by Malloc_Test.cpp. * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ diff --git a/ACE/tests/Map_Test.h b/ACE/tests/Map_Test.h index 0574733260c..5b82ff9b7ef 100644 --- a/ACE/tests/Map_Test.h +++ b/ACE/tests/Map_Test.h @@ -5,8 +5,7 @@ * @file Map_Test.h * * This file has the class definitions needed for template generation in - * Map_Test.cpp. They have to be in a separate file so AIX xlC can - * find them at auto-instantiate time. + * Map_Test.cpp. * * @author Irfan Pyarali <irfan@cs.wustl.edu> */ diff --git a/ACE/tests/Message_Queue_Test.cpp b/ACE/tests/Message_Queue_Test.cpp index ce5163e5be4..be63d886a1a 100644 --- a/ACE/tests/Message_Queue_Test.cpp +++ b/ACE/tests/Message_Queue_Test.cpp @@ -44,11 +44,7 @@ using QUEUE = ACE_Message_Queue<ACE_NULL_SYNCH>; using ITERATOR = ACE_Message_Queue_Iterator<ACE_NULL_SYNCH>; using REVERSE_ITERATOR = ACE_Message_Queue_Reverse_Iterator<ACE_NULL_SYNCH>; -#if defined (ACE_HAS_WINCE) -static const int MESSAGE_FACTOR = 10000; -#else static const int MESSAGE_FACTOR = 100000; -#endif static const int MAX_MESSAGES = 10000; static const int MAX_MESSAGE_SIZE = 32; static const char test_message[] = "ACE_Message_Queue Test Message"; diff --git a/ACE/tests/Message_Queue_Test_Ex.h b/ACE/tests/Message_Queue_Test_Ex.h index 8dd9a4a544e..0642fffb96a 100644 --- a/ACE/tests/Message_Queue_Test_Ex.h +++ b/ACE/tests/Message_Queue_Test_Ex.h @@ -4,8 +4,7 @@ /** * @file Message_Queue_Test_Ex.h * - * Define class needed for generating templates. IBM C++ requires this - * to be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Michael Vitlo <mvitalo@sprynet.com> * @author Irfan Pyarali <irfan@cs.wustl.edu> diff --git a/ACE/tests/Multicast_Test.cpp b/ACE/tests/Multicast_Test.cpp index c00aaa347b0..524767532ec 100644 --- a/ACE/tests/Multicast_Test.cpp +++ b/ACE/tests/Multicast_Test.cpp @@ -255,7 +255,7 @@ MCT_Config::open (int argc, ACE_TCHAR *argv[]) { int n = ACE_OS::atoi (getopt.opt_arg ()); // I'm assuming 0 means unlimited, so just use whatever the - // user provides. Seems to work okay on Solaris 5.8. + // user provides. if (IP_MAX_MEMBERSHIPS == 0) this->groups_ = n; else diff --git a/ACE/tests/Multicast_Test_IPV6.cpp b/ACE/tests/Multicast_Test_IPV6.cpp index 65347b3bf7d..11056ef53c7 100644 --- a/ACE/tests/Multicast_Test_IPV6.cpp +++ b/ACE/tests/Multicast_Test_IPV6.cpp @@ -265,7 +265,7 @@ MCT_Config::open (int argc, ACE_TCHAR *argv[]) { int n = ACE_OS::atoi (getopt.opt_arg ()); // I'm assuming 0 means unlimited, so just use whatever the - // user provides. Seems to work okay on Solaris 5.8. + // user provides. if (IP_MAX_MEMBERSHIPS == 0) this->groups_ = n; else diff --git a/ACE/tests/Network_Adapters_Test.cpp b/ACE/tests/Network_Adapters_Test.cpp index 7ef95d8116d..24838782704 100644 --- a/ACE/tests/Network_Adapters_Test.cpp +++ b/ACE/tests/Network_Adapters_Test.cpp @@ -835,7 +835,7 @@ extern "C" } #endif /* #if defined (ACE_HAS_SIG_C_FUNC) */ -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) static BOOL WINAPI CtrlHandler(DWORD fdwCtrlType) { switch (fdwCtrlType) @@ -1011,9 +1011,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_START_TEST (ACE_TEXT ("Network_Adapters_Test")); #if defined (ACE_WIN32) -#if !defined (ACE_HAS_WINCE) SetConsoleCtrlHandler(&CtrlHandler, TRUE); -#endif #else /* #if defined (ACE_WIN32) */ // Set a handler for SIGSEGV signal to call for abort. ACE_Sig_Action sa1 ((ACE_SignalHandler) sigsegv_handler, SIGSEGV); diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp index 03666ca0ae2..b9fad773749 100644 --- a/ACE/tests/OS_Test.cpp +++ b/ACE/tests/OS_Test.cpp @@ -108,7 +108,7 @@ rename_test () } ACE_OS::fclose (f); -#if defined (ACE_WIN32) && defined (ACE_LACKS_WIN32_MOVEFILEEX) || defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && defined (ACE_LACKS_WIN32_MOVEFILEEX) // Can't rename if new_file exists already. ACE_OS::unlink (new_file); #endif @@ -603,8 +603,6 @@ snprintf_test (SNPrintF_t fn) ACE_OS::memset(buf, 0xab, 2*BUFFER_SIZE); retval = fn (buf, BUFFER_SIZE, "%d", 1234); - // HP-UX has broken vsnprintf -#if !defined (HPUX) if (retval != 4) { ACE_ERROR ((LM_ERROR, @@ -612,7 +610,6 @@ snprintf_test (SNPrintF_t fn) retval)); ++error_count; } -#endif /* !HPUX */ if (buf[3] != 0) { diff --git a/ACE/tests/Priority_Reactor_Test.h b/ACE/tests/Priority_Reactor_Test.h index 7bdc5ff9d1d..44b64f7bbd1 100644 --- a/ACE/tests/Priority_Reactor_Test.h +++ b/ACE/tests/Priority_Reactor_Test.h @@ -3,9 +3,7 @@ /** * @file Priority_Reactor_Test.h * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Priority_Reactor_Test.cpp. + * It is only used by Priority_Reactor_Test.cpp. * * @author Carlos O'Ryan <coryan@cs.wustl.edu> */ diff --git a/ACE/tests/Priority_Task_Test.cpp b/ACE/tests/Priority_Task_Test.cpp index 91a16596730..305c7f0aa83 100644 --- a/ACE/tests/Priority_Task_Test.cpp +++ b/ACE/tests/Priority_Task_Test.cpp @@ -199,12 +199,6 @@ run_main (int argc, ACE_TCHAR *argv[]) // Spawn off ACE_MAX_ITERATIONS of tasks, passing each one their // iteration number as their priority. - - // NOTE: on Solaris, for example, this requests the min FIFO - // priority. But, this test doesn't use the Realtime scheduling - // class. The FIFO priorities are used because they're all - // nonnegative. - ACE_Sched_Priority_Iterator priority (ACE_SCHED_FIFO, ACE_SCOPE_THREAD); diff --git a/ACE/tests/Proactor_Test.cpp b/ACE/tests/Proactor_Test.cpp index e82b054b90c..6657c096a15 100644 --- a/ACE/tests/Proactor_Test.cpp +++ b/ACE/tests/Proactor_Test.cpp @@ -50,7 +50,6 @@ # include "ace/POSIX_Proactor.h" # include "ace/POSIX_CB_Proactor.h" -# include "ace/SUN_Proactor.h" #endif /* ACE_WIN32 */ @@ -58,7 +57,7 @@ // Proactor Type (UNIX only, Win32 ignored) -using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, SUN, CB }; +using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, CB }; static ProactorType proactor_type = DEFAULT; // POSIX : > 0 max number aio operations proactor, @@ -238,16 +237,6 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) break; #endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ -# if defined (sun) - case SUN: - ACE_NEW_RETURN (proactor_impl, - ACE_SUN_Proactor (max_op), - -1); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("(%t) Create Proactor Type = SUN\n"))); - break; -# endif /* sun */ - # if !defined(ACE_HAS_BROKEN_SIGEVENT_STRUCT) case CB: ACE_NEW_RETURN (proactor_impl, @@ -1722,7 +1711,6 @@ print_usage (int /* argc */, ACE_TCHAR *argv[]) ACE_TEXT ("\n a AIOCB") ACE_TEXT ("\n i SIG") ACE_TEXT ("\n c CB") - ACE_TEXT ("\n s SUN") ACE_TEXT ("\n d default") ACE_TEXT ("\n-d <duplex mode 1-on/0-off>") ACE_TEXT ("\n-h <host> for Client mode") @@ -1761,11 +1749,6 @@ set_proactor_type (const ACE_TCHAR *ptype) case 'I': proactor_type = SIG; return 1; -#if defined (sun) - case 'S': - proactor_type = SUN; - return 1; -#endif /* sun */ #if !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT) case 'C': proactor_type = CB; @@ -1849,13 +1832,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) } // switch } // while - if (proactor_type == SUN && threads > 1) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sun aiowait is not thread-safe; ") - ACE_TEXT ("changing to 1 thread\n"))); - threads = 1; - } - return 0; } diff --git a/ACE/tests/Proactor_Test_IPV6.cpp b/ACE/tests/Proactor_Test_IPV6.cpp index c4e2adb050d..0a4e4e84c18 100644 --- a/ACE/tests/Proactor_Test_IPV6.cpp +++ b/ACE/tests/Proactor_Test_IPV6.cpp @@ -51,14 +51,13 @@ # include "ace/POSIX_Proactor.h" # include "ace/POSIX_CB_Proactor.h" -# include "ace/SUN_Proactor.h" #endif /* defined (ACE_HAS_WIN32_OVERLAPPED_IO) */ #include "Proactor_Test.h" // Proactor Type (UNIX only, Win32 ignored) -using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, SUN, CB }; +using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, CB }; static ProactorType proactor_type = DEFAULT; // POSIX : > 0 max number aio operations proactor, @@ -200,7 +199,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) ACE_TEST_ASSERT (this->proactor_ == 0); -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) ACE_UNUSED_ARG (type_proactor); ACE_UNUSED_ARG (max_op); @@ -238,16 +237,6 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) break; #endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ -# if defined (sun) - case SUN: - ACE_NEW_RETURN (proactor_impl, - ACE_SUN_Proactor (max_op), - -1); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("(%t) Create Proactor Type = SUN\n"))); - break; -# endif /* sun */ - # if !defined(ACE_HAS_BROKEN_SIGEVENT_STRUCT) case CB: ACE_NEW_RETURN (proactor_impl, @@ -264,7 +253,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) break; } -#endif // (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#endif // (ACE_WIN32) // always delete implementation 1 , not !(proactor_impl == 0) ACE_NEW_RETURN (this->proactor_, @@ -1316,8 +1305,7 @@ Client::initiate_write_stream () static const size_t complete_message_length = ACE_OS::strlen (complete_message); -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) - +#if defined (ACE_WIN32) ACE_Message_Block *mb1 = 0, *mb2 = 0, *mb3 = 0; @@ -1354,7 +1342,7 @@ Client::initiate_write_stream () ACE_TEXT ("Client::ACE_Asynch_Stream::writev")), -1); } -#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#else /* defined (ACE_WIN32) */ ACE_Message_Block *mb = 0; @@ -1381,7 +1369,7 @@ Client::initiate_write_stream () ACE_TEXT ("write")), -1); } -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ this->io_count_++; this->total_w_++; @@ -1397,7 +1385,7 @@ Client::initiate_read_stream () static const size_t complete_message_length = ACE_OS::strlen (complete_message); -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) ACE_Message_Block *mb1 = 0, *mb2 = 0, *mb3 = 0, @@ -1446,7 +1434,7 @@ Client::initiate_read_stream () ACE_TEXT ("Client::ACE_Asynch_Read_Stream::readv")), -1); } -#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#else /* defined (ACE_WIN32) */ // Try to read more chunks size_t blksize = ( complete_message_length > BUFSIZ ) ? @@ -1479,7 +1467,7 @@ Client::initiate_read_stream () ACE_TEXT ("read")), -1); } -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ this->io_count_++; this->total_r_++; @@ -1530,7 +1518,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) ACE_TEXT ("error"), result.error ())); -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if defined (ACE_WIN32) size_t bytes_transferred = result.bytes_transferred (); char index = 0; for (ACE_Message_Block* mb_i = &mb; @@ -1561,7 +1549,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) index, mb_i->rd_ptr ())); } -#else /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#else /* defined (ACE_WIN32) */ // write 0 at string end for proper printout (if end of mb, it's 0 already) mb.rd_ptr()[0] = '\0'; // move rd_ptr backwards as required for printout @@ -1570,7 +1558,7 @@ Client::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) ACE_TEXT ("%s = %s\n"), ACE_TEXT ("message_block"), mb.rd_ptr ())); -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* defined (ACE_WIN32) */ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("**** end of message ****************\n"))); @@ -1760,7 +1748,6 @@ print_usage (int /* argc */, ACE_TCHAR *argv[]) ACE_TEXT ("\n a AIOCB") ACE_TEXT ("\n i SIG") ACE_TEXT ("\n c CB") - ACE_TEXT ("\n s SUN") ACE_TEXT ("\n d default") ACE_TEXT ("\n-d <duplex mode 1-on/0-off>") ACE_TEXT ("\n-h <host> for Client mode") @@ -1799,11 +1786,6 @@ set_proactor_type (const ACE_TCHAR *ptype) case 'I': proactor_type = SIG; return 1; -#if defined (sun) - case 'S': - proactor_type = SUN; - return 1; -#endif /* sun */ #if !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT) case 'C': proactor_type = CB; @@ -1891,13 +1873,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) } // switch } // while - if (proactor_type == SUN && threads > 1) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sun aiowait is not thread-safe; ") - ACE_TEXT ("changing to 1 thread\n"))); - threads = 1; - } - return 0; } diff --git a/ACE/tests/Proactor_UDP_Test.cpp b/ACE/tests/Proactor_UDP_Test.cpp index 5d32acc263d..30457b30ac3 100644 --- a/ACE/tests/Proactor_UDP_Test.cpp +++ b/ACE/tests/Proactor_UDP_Test.cpp @@ -47,12 +47,11 @@ # include "ace/POSIX_Proactor.h" # include "ace/POSIX_CB_Proactor.h" -# include "ace/SUN_Proactor.h" #endif /* ACE_WIN32 */ // Proactor Type (UNIX only, Win32 ignored) -using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, SUN, CB }; +using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, CB }; static ProactorType proactor_type = DEFAULT; // POSIX : > 0 max number aio operations proactor, @@ -233,16 +232,6 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) break; #endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ -# if defined (sun) - case SUN: - ACE_NEW_RETURN (proactor_impl, - ACE_SUN_Proactor (max_op), - -1); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("(%t) Create Proactor Type = SUN\n"))); - break; -# endif /* sun */ - # if !defined(ACE_HAS_BROKEN_SIGEVENT_STRUCT) case CB: ACE_NEW_RETURN (proactor_impl, @@ -746,10 +735,9 @@ struct Session_Data // indicating the addressing info for the client. // Master is initialized with a count of the number of expected sessions. After // this number are set up, Master will stop listening for session requests. -// This is a bit fragile but is necessary because on HP-UX, AIX, et al., it -// is impossible to close/cancel a socket with an outstanding UDP recieve -// (on AIX the process is so wedged the machine needs to be rebooted to -// clear it!). So, this bit of messiness is necessary for portability. +// This is a bit fragile but is necessary because on HP-UX, et al., it +// is impossible to close/cancel a socket with an outstanding UDP receive +// So, this bit of messiness is necessary for portability. // When the Master is destroyed, it will try to stop establishing sessions // but this will only work on Windows. class Master : public ACE_Handler @@ -1989,7 +1977,6 @@ print_usage (int /* argc */, ACE_TCHAR *argv[]) ACE_TEXT ("\n a AIOCB") ACE_TEXT ("\n i SIG") ACE_TEXT ("\n c CB") - ACE_TEXT ("\n s SUN") ACE_TEXT ("\n d default") ACE_TEXT ("\n-d <duplex mode 1-on/0-off>") ACE_TEXT ("\n-h <host> for Client mode") @@ -2028,11 +2015,6 @@ set_proactor_type (const ACE_TCHAR *ptype) case 'I': proactor_type = SIG; return 1; -#if defined (sun) - case 'S': - proactor_type = SUN; - return 1; -#endif /* sun */ #if !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT) case 'C': proactor_type = CB; @@ -2116,13 +2098,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) } // switch } // while - if (proactor_type == SUN && threads > 1) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sun aiowait is not thread-safe; ") - ACE_TEXT ("changing to 1 thread\n"))); - threads = 1; - } - return 0; } diff --git a/ACE/tests/Process_Env_Test.cpp b/ACE/tests/Process_Env_Test.cpp index a7107a0fbec..4b9342c8557 100644 --- a/ACE/tests/Process_Env_Test.cpp +++ b/ACE/tests/Process_Env_Test.cpp @@ -14,7 +14,7 @@ #include "ace/Process.h" #include "ace/SString.h" -#if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR) using setenvfn_t = void (*)(const ACE_TCHAR *, const ACE_TCHAR *, void *); void create_large_env (setenvfn_t setenv, void *ctx) @@ -54,7 +54,7 @@ run_main (int, ACE_TCHAR*[]) int test_status = 0; ACE_START_TEST (ACE_TEXT ("Process_Env_Test")); -#if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR) ACE_Process_Options options ( 0, ACE_Process_Options::DEFAULT_COMMAND_LINE_BUF_LEN, @@ -120,7 +120,7 @@ run_main (int, ACE_TCHAR*[]) #else ACE_DEBUG ((LM_INFO, "This test is for Win32 without ACE_USES_WCHAR\n")); -#endif /* ACE_WIN32 && !ACE_USES_WCHAR && !ACE_HAS_WINCE */ +#endif /* ACE_WIN32 && !ACE_USES_WCHAR */ ACE_END_TEST; return test_status; diff --git a/ACE/tests/Process_Manager_Test.cpp b/ACE/tests/Process_Manager_Test.cpp index 7464ffded68..241498941b9 100644 --- a/ACE/tests/Process_Manager_Test.cpp +++ b/ACE/tests/Process_Manager_Test.cpp @@ -75,9 +75,7 @@ spawn_child (const ACE_TCHAR *argv0, int sleep_time, int my_process_id) { -#if defined (ACE_HAS_WINCE) -const ACE_TCHAR *cmdline_format = ACE_TEXT("%s %d"); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) const ACE_TCHAR *cmdline_format = ACE_TEXT("\"%s\" %s %d"); #elif !defined (ACE_USES_WCHAR) const ACE_TCHAR *cmdline_format = ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR ACE_TEXT("%s %s %d"); @@ -134,9 +132,7 @@ const ACE_TCHAR *cmdline_format = ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR ACE opts.process_name (argv0); #ifndef ACE_LACKS_VA_FUNCTIONS opts.command_line (cmdline_format, -#if !defined (ACE_HAS_WINCE) argv0, -#endif /* !ACE_HAS_WINCE */ cmd, sleep_time); #else @@ -570,8 +566,7 @@ run_main (int argc, ACE_TCHAR *argv[]) } #endif /* ACE_HAS_THREADS */ -#if !defined (ACE_OPENVMS) && \ - (defined ACE_WIN32 || !defined ACE_LACKS_UNIX_SIGNALS) +#if defined ACE_WIN32 || !defined ACE_LACKS_UNIX_SIGNALS // -------------------------------------------------- // Finally, try the reactor stuff... mgr.open (ACE_Process_Manager::DEFAULT_SIZE, @@ -601,7 +596,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P) %d processes left in manager\n"), nr_procs)); -#endif /* !defined (ACE_OPENVMS) */ +#endif /* defined (ACE_WIN32) */ #endif // ACE_HAS_PROCESS_SPAWN ACE_END_TEST; return test_status; diff --git a/ACE/tests/Process_Manual_Event_Test.cpp b/ACE/tests/Process_Manual_Event_Test.cpp index 10c2d9187a6..a7a4832f457 100644 --- a/ACE/tests/Process_Manual_Event_Test.cpp +++ b/ACE/tests/Process_Manual_Event_Test.cpp @@ -184,20 +184,6 @@ run_main (int argc, ACE_TCHAR *argv[]) // The parent cleans up any remnant of past runs of this test. // See Bugzilla #2662 for further info. - // On AIX, this is done by removing the shared memory objects before - // trying to run. -# if defined (AIX) - // FUZZ: disable check_for_lack_ACE_OS - if (::shm_unlink (event_ping_name) != 0 && errno != ENOENT) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P) event_ping %p\n"), - ACE_TEXT ("shm_unlink"))); - if (::shm_unlink (event_pong_name) != 0 && errno != ENOENT) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P) event_pong %p\n"), - ACE_TEXT ("shm_unlink"))); - // FUZZ: enable check_for_lack_ACE_OS -# endif /* AIX */ ACE_TCHAR const * argv_0 = argc > 0 ? argv[0] : ACE_TEXT ("Process_Manual_Event_Test"); diff --git a/ACE/tests/Process_Strategy_Test.cpp b/ACE/tests/Process_Strategy_Test.cpp index 8b29d634394..d8df9490bac 100644 --- a/ACE/tests/Process_Strategy_Test.cpp +++ b/ACE/tests/Process_Strategy_Test.cpp @@ -48,11 +48,6 @@ // Counting_Service and Options in here #include "Process_Strategy_Test.h" -// This test does not function properly when fork() is used on HP-UX -#if defined(__hpux) -#define ACE_LACKS_FORK -#endif /* __hpux */ - ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Options, ACE_Null_Mutex); // Define a <Strategy_Acceptor> that's parameterized by the @@ -361,13 +356,6 @@ Counting_Service::handle_input (ACE_HANDLE) { char buf[BUFSIZ]; ACE_Time_Value* timeout = 0; -#if defined (__hpux) - // Even though we're in handle_input, there seems to be a - // situation on HP-UX where there is nothing to recv just yet. - // So, we recv() with a timeout and everything works. - ACE_Time_Value hpux_timeout (3); - timeout = &hpux_timeout; -#endif /* __hpux */ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) reading from peer on %d\n"), diff --git a/ACE/tests/Process_Strategy_Test.h b/ACE/tests/Process_Strategy_Test.h index a5a6c731d9d..8075bd35e7c 100644 --- a/ACE/tests/Process_Strategy_Test.h +++ b/ACE/tests/Process_Strategy_Test.h @@ -5,8 +5,7 @@ * @file Process_Strategy_Test.h * * This file contains the definition of Counting_Service and - * Options. Some compilers need it in a .h file for template - * instantiation (such as AIX C Set ++). + * Options. * * @author Doug Schmidt <d.schmidt@vanderbilt.edu> and Kevin Boyle <kboyle@sanwafp.com> */ diff --git a/ACE/tests/Process_Test.cpp b/ACE/tests/Process_Test.cpp index 3cfc9def393..da2c0f67bb2 100644 --- a/ACE/tests/Process_Test.cpp +++ b/ACE/tests/Process_Test.cpp @@ -252,9 +252,7 @@ run_main (int argc, ACE_TCHAR *argv[]) // Although most systems provide some mechanism to do this, the code // in this test uses Linux-specific techniques. Thus, although it // is possible to add the code for the checks on, for example, - // HP-UX (pstat_getproc, pstat_getpathname) and - // AIX (/proc is available, but there's no self and the fds are not links - // to the opened file names), the code isn't here at present. + // HP-UX (pstat_getproc, pstat_getpathname) #if defined (ACE_LACKS_FORK) || defined (ACE_LACKS_READLINK) || !defined(ACE_LINUX) ACE_ERROR ((LM_INFO, ACE_TEXT ("The remainder of this test is not supported on this platform\n"))); diff --git a/ACE/tests/Reactor_Fairness_Test.h b/ACE/tests/Reactor_Fairness_Test.h index 468439c218a..848a817ba92 100644 --- a/ACE/tests/Reactor_Fairness_Test.h +++ b/ACE/tests/Reactor_Fairness_Test.h @@ -4,9 +4,7 @@ * @file Reactor_Fairness_Test.h * * This file includes template class definitions for the - * Reactor_Fairness_Test.cpp program. This class gets its own - * header file to work around AIX C++ compiler "features" related - * to template instantiation... + * Reactor_Fairness_Test.cpp program. * * @author Steve Huston <shuston@riverace.com> */ diff --git a/ACE/tests/Reactor_Performance_Test.h b/ACE/tests/Reactor_Performance_Test.h index 5fa44547edd..758ac20745f 100644 --- a/ACE/tests/Reactor_Performance_Test.h +++ b/ACE/tests/Reactor_Performance_Test.h @@ -4,9 +4,7 @@ * @file Reactor_Performance_Test.h * * This file includes template class definitions for the - * Reactor_Performance_Test.cpp program. This class gets its own - * header file to work around AIX C++ compiler "features" related - * to template instantiation... + * Reactor_Performance_Test.cpp program. * * @author Irfan Pyarali <irfan@cs.wustl.edu> and Steve Huston <shuston@riverace.com> */ diff --git a/ACE/tests/SOCK_Connector_Test.cpp b/ACE/tests/SOCK_Connector_Test.cpp index 40296f00f84..2db953b4c21 100644 --- a/ACE/tests/SOCK_Connector_Test.cpp +++ b/ACE/tests/SOCK_Connector_Test.cpp @@ -103,10 +103,9 @@ find_another_host (ACE_TCHAR other_host[]) // an infinite loop on Linux --mas 03-08-2001 while ((h = gethostent ()) != 0) { - if (ACE_OS::strcmp (h->h_name, - ACE_TEXT_ALWAYS_CHAR (ACE_DEFAULT_SERVER_HOST)) == 0) + if (ACE_OS::strcmp (h->h_name, ACE_TEXT_ALWAYS_CHAR (ACE_DEFAULT_SERVER_HOST)) == 0) continue; - // AIX just _has_ to be different + if (ACE_OS::strcmp (h->h_name, "loopback") == 0) continue; diff --git a/ACE/tests/SSL/Main.cpp b/ACE/tests/SSL/Main.cpp index 46833b5d73f..3d248d70163 100644 --- a/ACE/tests/SSL/Main.cpp +++ b/ACE/tests/SSL/Main.cpp @@ -10,11 +10,8 @@ */ //============================================================================= - #include "ace/OS_main.h" -#if defined (ACE_HAS_WINCE) -# include "ace/ACE.h" -#endif /* ACE_HAS_WINCE */ + int run_main (int argc, ACE_TCHAR *argv[]); int diff --git a/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp b/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp index 8a52126f1b0..162d22215fb 100644 --- a/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp +++ b/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp @@ -38,8 +38,7 @@ #include "ace/SSL/SSL_SOCK_Acceptor.h" #include "ace/SSL/SSL_SOCK_Stream.h" - -#if defined (ACE_HAS_THREADS) && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) +#if defined (ACE_HAS_THREADS) && (defined (ACE_WIN32) || (defined (ACE_HAS_AIO_CALLS))) // This only works on Win32 platforms and on Unix platforms // supporting POSIX aio calls. diff --git a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h index 6d96043f40f..48775635862 100644 --- a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h +++ b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h @@ -3,9 +3,7 @@ /** * @file Thread_Pool_Reactor_SSL_Test.h * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Thread_Pool_Reactor_Test_SSL.cpp. + * It is only used by Thread_Pool_Reactor_Test_SSL.cpp. * * @author Irfan Pyarali <irfan@cs.wustl.edu> Nanbor Wang <nanbor@cs.wustl.edu> */ diff --git a/ACE/tests/STL_algorithm_Test_T.h b/ACE/tests/STL_algorithm_Test_T.h index 7aeccccb1ea..0b7a40b0f71 100644 --- a/ACE/tests/STL_algorithm_Test_T.h +++ b/ACE/tests/STL_algorithm_Test_T.h @@ -16,12 +16,6 @@ template <typename T> int test_STL_algorithm (T & container); -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "STL_algorithm_Test_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("STL_algorithm_Test_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* ACE_TESTS_STL_ALGORITHM_TEST_T_H */ diff --git a/ACE/tests/Semaphore_Test.cpp b/ACE/tests/Semaphore_Test.cpp index d43318c96aa..6818f969d34 100644 --- a/ACE/tests/Semaphore_Test.cpp +++ b/ACE/tests/Semaphore_Test.cpp @@ -20,7 +20,7 @@ #include "ace/OS_NS_unistd.h" // msec that times are allowed to differ before test fails. -#if defined (ACE_HAS_HI_RES_TIMER) || defined (ACE_HAS_AIX_HI_RES_TIMER) || \ +#if defined (ACE_HAS_HI_RES_TIMER) || \ defined (ACE_HAS_PENTIUM) || \ defined (ACE_HAS_POWERPC_TIMER) # define ACE_ALLOWED_SLACK 100 diff --git a/ACE/tests/Service_Config_Test.cpp b/ACE/tests/Service_Config_Test.cpp index faecd5b834b..859d7d33cb2 100644 --- a/ACE/tests/Service_Config_Test.cpp +++ b/ACE/tests/Service_Config_Test.cpp @@ -183,7 +183,7 @@ testLoadingServiceConfFileAndProcessNo (int argc, ACE_TCHAR *argv[]) // Configurator file appropriate to the platform. // For example, Windows Unicode uses UTF-16. // - // iconv(1) found on Linux and Solaris, for example, can + // iconv(1) found on Linux, for example, can // be used to convert between encodings. // // Byte ordering is also an issue, so we should be @@ -285,7 +285,7 @@ testLoadingServiceConfFile (int argc, ACE_TCHAR *argv[]) // Configurator file appropriate to the platform. // For example, Windows Unicode uses UTF-16. // - // iconv(1) found on Linux and Solaris, for example, can + // iconv(1) found on Linux, for example, can // be used to convert between encodings. // // Byte ordering is also an issue, so we should be @@ -676,7 +676,7 @@ testNonACEThread () u_int errors_before = error; -#if defined (ACE_HAS_WTHREADS) && !defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_WTHREADS) HANDLE thr_h = (HANDLE)_beginthreadex (0, 0, &nonacethreadentry, diff --git a/ACE/tests/Signal_Test.cpp b/ACE/tests/Signal_Test.cpp index 29f40c78eb9..25cf75a6e5d 100644 --- a/ACE/tests/Signal_Test.cpp +++ b/ACE/tests/Signal_Test.cpp @@ -336,7 +336,7 @@ run_test (ACE_THR_FUNC worker, { // For the synchronous signal tests, block signals to prevent // asynchronous delivery to default handler (at least necessary - // on linux and solaris; POSIX spec also states that signal(s) + // on linux ; POSIX spec also states that signal(s) // should be blocked before call to sigwait()) ACE_Sig_Guard guard; diff --git a/ACE/tests/TP_Reactor_Test.h b/ACE/tests/TP_Reactor_Test.h index 32c23525273..b5f7e66cd3c 100644 --- a/ACE/tests/TP_Reactor_Test.h +++ b/ACE/tests/TP_Reactor_Test.h @@ -3,8 +3,7 @@ /** * @file TP_Reactor_Test.h * - * Define class needed for generating templates. IBM C++ requires this to - * be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Alexander Libman <alibman@ihug.com.au> * @author <alexl@rumblgroup.com> diff --git a/ACE/tests/TSS_Test_Errno.h b/ACE/tests/TSS_Test_Errno.h index d2c9c8166e4..de556a585fc 100644 --- a/ACE/tests/TSS_Test_Errno.h +++ b/ACE/tests/TSS_Test_Errno.h @@ -4,9 +4,7 @@ /** * @file TSS_Test_Errno.h * - * This file contains the definition of Errno. Some compilers need - * it in a .h file for template instantiation (such as AIX C Set - * ++). + * This file contains the definition of Errno. * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ @@ -21,9 +19,7 @@ * * @brief Define a simple Errno abstraction * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by TSS_Test.cpp. + * It is only used by TSS_Test.cpp. */ class Errno { diff --git a/ACE/tests/Task_Ex_Test.h b/ACE/tests/Task_Ex_Test.h index 01aa1c1ce08..ccb7c377ed9 100644 --- a/ACE/tests/Task_Ex_Test.h +++ b/ACE/tests/Task_Ex_Test.h @@ -4,8 +4,7 @@ /** * @file Task_Ex_Test.h * - * Define class needed for generating templates. IBM C++ requires this - * to be in its own file for auto template instantiation. + * Define class needed for generating templates. * * @author Kobi Cohen-Arazi <kobi-co@barak-online.net> */ diff --git a/ACE/tests/Thread_Creation_Threshold_Test.cpp b/ACE/tests/Thread_Creation_Threshold_Test.cpp index a84bd553651..1627e013309 100644 --- a/ACE/tests/Thread_Creation_Threshold_Test.cpp +++ b/ACE/tests/Thread_Creation_Threshold_Test.cpp @@ -6,11 +6,7 @@ * This test program stresses how many threads can be * consecutively (not simultaneously) created on a platform. * Rather than testing exhaustively, it establishes a - * semi-arbitrary upper limit (MAX_THREAD)of threads. The limit - * is only partly arbitrary because it was chosen as a value that - * exceeded an observed upper limit on the values that Solaris 9 - * will accept as arguments to thr_concurrency(), used by - * ACE_OS::thr_create(THR_NEW_LWP). + * semi-arbitrary upper limit (MAX_THREAD)of threads. * * @author Chris Cleeland <cleeland@ociweb.com> */ diff --git a/ACE/tests/Thread_Pool_Reactor_Resume_Test.h b/ACE/tests/Thread_Pool_Reactor_Resume_Test.h index 67b95e0ccb9..a2fe552260d 100644 --- a/ACE/tests/Thread_Pool_Reactor_Resume_Test.h +++ b/ACE/tests/Thread_Pool_Reactor_Resume_Test.h @@ -3,9 +3,7 @@ /** * @file Thread_Pool_Reactor_Resume_Test.h * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Thread_Pool_Reactor_Test.cpp. + * It is only used by Thread_Pool_Reactor_Test.cpp. * * @author Irfan Pyarali <irfan@cs.wustl.edu> Nanbor Wang <nanbor@cs.wustl.edu> */ diff --git a/ACE/tests/Thread_Pool_Reactor_Test.h b/ACE/tests/Thread_Pool_Reactor_Test.h index 78e9dc7b0be..a1abf6852a9 100644 --- a/ACE/tests/Thread_Pool_Reactor_Test.h +++ b/ACE/tests/Thread_Pool_Reactor_Test.h @@ -3,9 +3,7 @@ /** * @file Thread_Pool_Reactor_Test.h * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Thread_Pool_Reactor_Test.cpp. + * It is only used by Thread_Pool_Reactor_Test.cpp. * * @author Irfan Pyarali <irfan@cs.wustl.edu> Nanbor Wang <nanbor@cs.wustl.edu> */ diff --git a/ACE/tests/Thread_Pool_Test.cpp b/ACE/tests/Thread_Pool_Test.cpp index 0a76061e31a..7be44853b36 100644 --- a/ACE/tests/Thread_Pool_Test.cpp +++ b/ACE/tests/Thread_Pool_Test.cpp @@ -223,14 +223,12 @@ Thread_Pool::test_queue_deactivation_shutdown () if (manual) { -#if !defined (ACE_HAS_WINCE) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) enter a new message for ") ACE_TEXT ("the task pool..."))); n = ACE_OS::read (ACE_STDIN, mb->wr_ptr (), mb->size ()); -#endif // ACE_HAS_WINCE } else { @@ -315,14 +313,12 @@ Thread_Pool::test_empty_message_shutdown () if (manual) { -#if !defined (ACE_HAS_WINCE) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) enter a new message for ") ACE_TEXT ("the task pool..."))); n = ACE_OS::read (ACE_STDIN, mb->wr_ptr (), mb->size ()); -#endif // ACE_HAS_WINCE } else { diff --git a/ACE/tests/Unload_libACE.cpp b/ACE/tests/Unload_libACE.cpp index b1a1b2d831b..17088486a32 100644 --- a/ACE/tests/Unload_libACE.cpp +++ b/ACE/tests/Unload_libACE.cpp @@ -26,10 +26,6 @@ #endif /* !ACE_VXWORKS && !__MINGW32__ && !CYGWIN32 */ #endif /* __GNUC__ */ -#if defined (__hpux) || defined (__SUNPRO_CC) -#define UNLOAD_LIBACE_TEST 1 -#endif /* (__hpux) || (__SUNPRO_CC) */ - #if defined (ACE_AS_STATIC_LIBS) #undef UNLOAD_LIBACE_TEST #endif /* ACE_AS_STATIC_LIBS */ @@ -160,9 +156,7 @@ main (int, char **) #else strcat (buf, "ACE"); #endif /* ACE_LIB_NAME */ -#if defined (__hpux) && !(defined (__ia64) && (__ia64 == 1)) - strcat (buf, ".sl"); -#elif defined (__APPLE__) +#if defined (__APPLE__) strcat (buf, ".dylib"); #else strcat (buf, ".so"); @@ -240,11 +234,9 @@ main (int, char **) #else # if defined (WIN32) && defined (ACE_USES_WCHAR) // Borrow include list from ace_wchar.h -# if defined (ACE_HAS_WINCE) -# include /**/ <wtypes.h> -# elif !defined (__BORLANDC__) +# if !defined (__BORLANDC__) # include /**/ <wchar.h> -# endif /* ACE_HAS_WINCE || __BORLANDC__ */ +# endif /* __BORLANDC__ */ int wmain (int, wchar_t **) diff --git a/ACE/tests/Upgradable_RW_Test.h b/ACE/tests/Upgradable_RW_Test.h index f27f18995f9..d6de6cbc254 100644 --- a/ACE/tests/Upgradable_RW_Test.h +++ b/ACE/tests/Upgradable_RW_Test.h @@ -3,9 +3,7 @@ /** * @file Upgradable_RW_Test.h * - * This class gets its own header file to work around AIX C++ - * compiler "features" related to template instantiation... It is - * only used by Upgradable_RW_Test.cpp. + * It is only used by Upgradable_RW_Test.cpp. * * @author Michael Kircher <mk1@cs.wustl.edu> */ diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst index 26069c4b405..c8b018e3eb6 100644 --- a/ACE/tests/run_test.lst +++ b/ACE/tests/run_test.lst @@ -122,7 +122,7 @@ Dirent_Test: !VxWorks_RTP !LabVIEW_RT Dynamic_Priority_Test Dynamic_Test Enum_Interfaces_Test: !NO_NETWORK !LynxOS -Env_Value_Test: !WinCE !LabVIEW_RT +Env_Value_Test: !LabVIEW_RT FIFO_Test: !ACE_FOR_TAO Framework_Component_Test: !STATIC !nsk Future_Set_Test: !nsk !ACE_FOR_TAO @@ -149,7 +149,7 @@ MM_Shared_Memory_Test: !VxWorks !nsk !ACE_FOR_TAO !LynxOS MT_NonBlocking_Connect_Test: !ST MT_Reactor_Timer_Test MT_Reactor_Upcall_Test: !nsk -MT_Reference_Counted_Event_Handler_Test: !OpenVMS_IA64Crash !LynxOS +MT_Reference_Counted_Event_Handler_Test: !LynxOS MT_Reference_Counted_Event_Handler_Test -b 0: LynxOS MT_Reference_Counted_Event_Handler_Test -a 0: LynxOS MT_Reference_Counted_Notify_Test @@ -194,7 +194,7 @@ Proactor_UDP_Test: !VxWorks !LynxOS !nsk !ACE_FOR_TAO !BAD_AIO Process_Env_Test: !VxWorks !PHARLAP Process_Test: !VxWorks !ACE_FOR_TAO !PHARLAP Process_Manager_Test: !VxWorks !ACE_FOR_TAO !PHARLAP -Process_Manual_Event_Test: !HPUX !VxWorks !ACE_FOR_TAO !PHARLAP +Process_Manual_Event_Test: !VxWorks !ACE_FOR_TAO !PHARLAP Process_Mutex_Test: !VxWorks !ACE_FOR_TAO !PHARLAP Process_Semaphore_Test: !VxWorks !ACE_FOR_TAO !PHARLAP RB_Tree_Test @@ -279,7 +279,7 @@ SOCK_SEQPACK_SCTP_Test: !MSVC !nsk !ACE_FOR_TAO SOCK_Test_IPv6: !nsk Process_Strategy_Test: !VxWorks !LynxOS !ACE_FOR_TAO !PHARLAP Recursive_Condition_Bug_Test: !ST -UnloadLibACE: !STATIC !WinCE !LabVIEW_RT +UnloadLibACE: !STATIC !LabVIEW_RT UUID_Test: !NO_UUID !ACE_FOR_TAO Wild_Match_Test SSL/Bug_2912_Regression_Test: SSL !ACE_FOR_TAO !BAD_AIO diff --git a/ACE/tests/test_config.h b/ACE/tests/test_config.h index 82b7059ab75..beb395d7b6e 100644 --- a/ACE/tests/test_config.h +++ b/ACE/tests/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) @@ -63,11 +57,11 @@ # define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".log") #endif /* ACE_LOG_FILE_EXT_NAME */ -#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/ACE/tests/tests.mpc b/ACE/tests/tests.mpc index 3a311cb2fae..c98a938e184 100644 --- a/ACE/tests/tests.mpc +++ b/ACE/tests/tests.mpc @@ -1169,13 +1169,6 @@ project(Message Queue Test) : acetest { Source_Files { Message_Queue_Test.cpp } - verbatim(gnuace,local) { - # Needs a larger heap on AIX to avoid overwriting stacks in the counting - # part of the test. - ifdef AIX_VERS - LDFLAGS += -bmaxdata:0x20000000 - endif - } } project(Monotonic_Manual_Event Test) : acetest { @@ -2194,7 +2187,6 @@ project(Based Pointer Test) : acetest { } project(Library Unload): unload_libace { - avoids += wince exename = UnloadLibACE staticflags += ACE_AS_STATIC_LIBS Source_Files { |