This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a commit to branch reduce_apr_influence in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 47c8ee6432291ba66f88e645b0aac855918ac2d0 Author: Stephen Webb <[email protected]> AuthorDate: Sun Nov 19 16:28:24 2023 +1100 The AsyncAppendr thread no longer uses APR threads --- src/test/cpp/asyncappendertestcase.cpp | 2 -- src/test/cpp/helpers/charsetencodertestcase.cpp | 4 ---- src/test/cpp/net/socketappendertestcase.cpp | 2 -- src/test/cpp/net/telnetappendertestcase.cpp | 2 -- src/test/cpp/net/xmlsocketappendertestcase.cpp | 3 +-- 5 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/test/cpp/asyncappendertestcase.cpp b/src/test/cpp/asyncappendertestcase.cpp index dedbded9..e7086dc7 100644 --- a/src/test/cpp/asyncappendertestcase.cpp +++ b/src/test/cpp/asyncappendertestcase.cpp @@ -108,7 +108,6 @@ class BlockableVectorAppender : public VectorAppender LOG4CXX_PTR_DEF(BlockableVectorAppender); -#if APR_HAS_THREADS /** * Tests of AsyncAppender. */ @@ -324,4 +323,3 @@ class AsyncAppenderTestCase : public AppenderSkeletonTestCase }; LOGUNIT_TEST_SUITE_REGISTRATION(AsyncAppenderTestCase); -#endif diff --git a/src/test/cpp/helpers/charsetencodertestcase.cpp b/src/test/cpp/helpers/charsetencodertestcase.cpp index b44a6e4c..0d7750da 100644 --- a/src/test/cpp/helpers/charsetencodertestcase.cpp +++ b/src/test/cpp/helpers/charsetencodertestcase.cpp @@ -36,9 +36,7 @@ LOGUNIT_CLASS(CharsetEncoderTestCase) LOGUNIT_TEST(encode3); LOGUNIT_TEST(encode4); LOGUNIT_TEST(encode5); -#if APR_HAS_THREADS LOGUNIT_TEST(thread1); -#endif LOGUNIT_TEST_SUITE_END(); enum { BUFSIZE = 256 }; @@ -224,7 +222,6 @@ public: LOGUNIT_ASSERT(iter == greeting.end()); } -#if APR_HAS_THREADS class ThreadPackage { public: @@ -379,7 +376,6 @@ public: LOGUNIT_ASSERT_EQUAL((apr_uint32_t) THREAD_COUNT * THREAD_REPS, package->getPass()); delete package; } -#endif }; diff --git a/src/test/cpp/net/socketappendertestcase.cpp b/src/test/cpp/net/socketappendertestcase.cpp index 0a462cb6..2271930f 100644 --- a/src/test/cpp/net/socketappendertestcase.cpp +++ b/src/test/cpp/net/socketappendertestcase.cpp @@ -21,7 +21,6 @@ using namespace log4cxx; using namespace log4cxx::helpers; -#if APR_HAS_THREADS /** Unit tests of log4cxx::SocketAppender */ @@ -92,4 +91,3 @@ class SocketAppenderTestCase : public AppenderSkeletonTestCase }; LOGUNIT_TEST_SUITE_REGISTRATION(SocketAppenderTestCase); -#endif diff --git a/src/test/cpp/net/telnetappendertestcase.cpp b/src/test/cpp/net/telnetappendertestcase.cpp index 7482f959..41c88798 100644 --- a/src/test/cpp/net/telnetappendertestcase.cpp +++ b/src/test/cpp/net/telnetappendertestcase.cpp @@ -25,7 +25,6 @@ using namespace log4cxx; using namespace log4cxx::helpers; using namespace log4cxx::net; -#if APR_HAS_THREADS /** Unit tests of log4cxx::TelnetAppender */ @@ -101,4 +100,3 @@ class TelnetAppenderTestCase : public AppenderSkeletonTestCase }; LOGUNIT_TEST_SUITE_REGISTRATION(TelnetAppenderTestCase); -#endif diff --git a/src/test/cpp/net/xmlsocketappendertestcase.cpp b/src/test/cpp/net/xmlsocketappendertestcase.cpp index 79445bec..cfd715b8 100644 --- a/src/test/cpp/net/xmlsocketappendertestcase.cpp +++ b/src/test/cpp/net/xmlsocketappendertestcase.cpp @@ -23,7 +23,6 @@ using namespace log4cxx; using namespace log4cxx::helpers; -#if APR_HAS_THREADS /** Unit tests of log4cxx::net::XMLSocketAppender */ @@ -60,4 +59,4 @@ class XMLSocketAppenderTestCase : public AppenderSkeletonTestCase }; LOGUNIT_TEST_SUITE_REGISTRATION(XMLSocketAppenderTestCase); -#endif +
