diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-02-01 15:44:33 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-02-01 15:44:33 +0100 |
commit | 6198126ce20cc418252f461621c81d19ee2b36e4 (patch) | |
tree | 01823c79fa88799e0c96d18eb0689fa96fa64cd4 /ACE/tests | |
parent | 8ab31e3e5bb8c09a9c326a54545f4cb475345a78 (diff) | |
download | ATCD-6198126ce20cc418252f461621c81d19ee2b36e4.tar.gz |
Removed pharlap support
Diffstat (limited to 'ACE/tests')
-rw-r--r-- | ACE/tests/Conn_Test.cpp | 8 | ||||
-rw-r--r-- | ACE/tests/Log_Msg_Test.cpp | 2 | ||||
-rw-r--r-- | ACE/tests/Test_Output.cpp | 12 | ||||
-rw-r--r-- | ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp | 2 | ||||
-rw-r--r-- | ACE/tests/Thread_Pool_Reactor_Test.cpp | 2 | ||||
-rw-r--r-- | ACE/tests/test_config.h | 5 |
6 files changed, 4 insertions, 27 deletions
diff --git a/ACE/tests/Conn_Test.cpp b/ACE/tests/Conn_Test.cpp index c44c607df25..b44f9547a9c 100644 --- a/ACE/tests/Conn_Test.cpp +++ b/ACE/tests/Conn_Test.cpp @@ -81,16 +81,8 @@ using CACHED_CONNECT_STRATEGY = ACE_Cached_Connect_Strategy<Svc_Handler, ACE_SOC #define REFCOUNTED_HASH_RECYCLABLE_ADDR ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> // Default number of clients/servers. -#if defined (ACE_HAS_PHARLAP) -// PharLap is, by default, resource contrained. Test for something that works -// on the default configuration. -static int n_servers = 2; -static int n_clients = 4; -#else static int n_servers = 5; static int n_clients = 5; -#endif /* ACE_HAS_PHARLAP */ - static int n_client_iterations = 3; Svc_Handler::Svc_Handler (ACE_Thread_Manager *) diff --git a/ACE/tests/Log_Msg_Test.cpp b/ACE/tests/Log_Msg_Test.cpp index 96262570a46..045152faec2 100644 --- a/ACE/tests/Log_Msg_Test.cpp +++ b/ACE/tests/Log_Msg_Test.cpp @@ -506,7 +506,7 @@ test_ostream () 1); } -#if !defined (ACE_VXWORKS) && !defined (ACE_HAS_PHARLAP) || (defined(ACE_VXWORKS) && (ACE_VXWORKS > 0x690)) +#if !defined (ACE_VXWORKS) || (defined(ACE_VXWORKS) && (ACE_VXWORKS > 0x690)) # define TEST_CAN_UNLINK_IN_ADVANCE #endif diff --git a/ACE/tests/Test_Output.cpp b/ACE/tests/Test_Output.cpp index a886cfed6a3..664b2e5ed90 100644 --- a/ACE/tests/Test_Output.cpp +++ b/ACE/tests/Test_Output.cpp @@ -52,8 +52,7 @@ ACE_Test_Output::~ACE_Test_Output () ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM); ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR); -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && \ - (!defined (ACE_HAS_PHARLAP) || defined (ACE_PHARLAP_TESTLOG_TO_FILE)) +#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) delete this->output_file_; #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ } @@ -74,13 +73,6 @@ ACE_Test_Output::output_file () int ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) { -#if defined (ACE_HAS_PHARLAP) && !defined (ACE_PHARLAP_TESTLOG_TO_FILE) - // For PharLap, just send it all to the host console for now - redirect - // to a file there for saving/analysis. - EtsSelectConsole(ETS_CO_HOST); - ACE_LOG_MSG->msg_ostream (&cout); - -#else ACE_TCHAR temp[MAXPATHLEN + 1] = { 0 }; // Ignore the error value since the directory may already exist. const ACE_TCHAR *test_dir = 0; @@ -151,8 +143,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ACE_LACKS_IOSTREAM_TOTALLY */ ACE_LOG_MSG->msg_ostream (this->output_file_, 0); -#endif /* ACE_HAS_PHARLAP && !ACE_PHARLAP_TESTLOG_TO_FILE */ - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER ); ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); diff --git a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp index edfbcf035a7..04eb3fc6ec7 100644 --- a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp +++ b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp @@ -56,7 +56,7 @@ static size_t svr_thrno = ACE_MAX_THREADS; // Default network parameters (MAX_BINDS and system buffers) are too small // for full test on some platforms; add platforms that can't handle too many // connection simultaneously here. -#if defined (ACE_VXWORKS) || defined (ACE_HAS_PHARLAP) +#if defined (ACE_VXWORKS) #define ACE_LOAD_FACTOR /2 #else #define ACE_LOAD_FACTOR diff --git a/ACE/tests/Thread_Pool_Reactor_Test.cpp b/ACE/tests/Thread_Pool_Reactor_Test.cpp index aa654361fba..e792840294d 100644 --- a/ACE/tests/Thread_Pool_Reactor_Test.cpp +++ b/ACE/tests/Thread_Pool_Reactor_Test.cpp @@ -58,7 +58,7 @@ static size_t svr_thrno = ACE_MAX_THREADS; // Default network parameters (MAX_BINDS and system buffers) are too small // for full test on some platforms; add platforms that can't handle too many // connection simultaneously here. -#if defined (ACE_VXWORKS) || defined (ACE_HAS_PHARLAP) +#if defined (ACE_VXWORKS) #define ACE_LOAD_FACTOR /2 #else #define ACE_LOAD_FACTOR diff --git a/ACE/tests/test_config.h b/ACE/tests/test_config.h index beb395d7b6e..bcd4ecd0c3f 100644 --- a/ACE/tests/test_config.h +++ b/ACE/tests/test_config.h @@ -57,12 +57,7 @@ # define ACE_LOG_FILE_EXT_NAME ACE_TEXT (".log") #endif /* ACE_LOG_FILE_EXT_NAME */ -#if defined (ACE_HAS_PHARLAP) -size_t const ACE_MAX_CLIENTS = 4; -#else size_t const ACE_MAX_CLIENTS = 30; -#endif /* ACE_HAS_PHARLAP */ - size_t const ACE_NS_MAX_ENTRIES = 1000; size_t const ACE_DEFAULT_USECS = 1000; size_t const ACE_MAX_TIMERS = 4; |