This is an automated email from the ASF dual-hosted git repository. tschoening pushed a commit to branch ghpr_14_replace-ant-build-with-cmake in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 06875bd4164700df875576b7e1b4be10c5435804 Author: Stephen Webb <[email protected]> AuthorDate: Mon Feb 3 13:51:26 2020 +1100 Revert "Fix failing defaultinittestcase" This reverts commit d08e392e9a354cd2f2c58c7ec0e81df521812de8. --- src/test/cpp/CMakeLists.txt | 2 +- src/test/cpp/defaultinit/CMakeLists.txt | 5 ++--- src/test/cpp/defaultinit/testcase1.cpp | 2 +- src/test/cpp/defaultinit/testcase2.cpp | 4 +--- src/test/cpp/defaultinit/testcase3.cpp | 4 +--- src/test/cpp/defaultinit/testcase4.cpp | 4 +--- 6 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/test/cpp/CMakeLists.txt b/src/test/cpp/CMakeLists.txt index 9d7b0e3..cc5d250 100644 --- a/src/test/cpp/CMakeLists.txt +++ b/src/test/cpp/CMakeLists.txt @@ -53,7 +53,7 @@ foreach(testName IN LISTS ALL_LOG4CXX_TESTS) target_include_directories(${testName} PRIVATE ${CMAKE_CURRENT_LIST_DIR} $<TARGET_PROPERTY:log4cxx,INCLUDE_DIRECTORIES>) target_link_libraries(${testName} PRIVATE testingFramework testingUtilities log4cxx ${APR_LIBRARIES}) add_test(NAME ${testName} - COMMAND ${testName} -v ${${testName}_command_args} + COMMAND ${testName} -v WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../resources ) set_tests_properties(${testName} PROPERTIES diff --git a/src/test/cpp/defaultinit/CMakeLists.txt b/src/test/cpp/defaultinit/CMakeLists.txt index 45d8dce..a9d2ee8 100644 --- a/src/test/cpp/defaultinit/CMakeLists.txt +++ b/src/test/cpp/defaultinit/CMakeLists.txt @@ -1,3 +1,2 @@ -add_executable(uninitializedtestcase testcase1.cpp) -add_executable(defaultinittestcase testcase2.cpp testcase3.cpp testcase4.cpp) -set(ALL_LOG4CXX_TESTS ${ALL_LOG4CXX_TESTS} uninitializedtestcase defaultinittestcase PARENT_SCOPE) +add_executable(defaultinittestcase testcase1.cpp testcase2.cpp testcase3.cpp testcase4.cpp) +set(ALL_LOG4CXX_TESTS ${ALL_LOG4CXX_TESTS} defaultinittestcase PARENT_SCOPE) diff --git a/src/test/cpp/defaultinit/testcase1.cpp b/src/test/cpp/defaultinit/testcase1.cpp index b0059a4..9d60bb5 100644 --- a/src/test/cpp/defaultinit/testcase1.cpp +++ b/src/test/cpp/defaultinit/testcase1.cpp @@ -48,5 +48,5 @@ public: }; -LOGUNIT_TEST_SUITE_REGISTRATION(TestCase1) +LOGUNIT_TEST_SUITE_REGISTRATION_DISABLED(TestCase1) diff --git a/src/test/cpp/defaultinit/testcase2.cpp b/src/test/cpp/defaultinit/testcase2.cpp index df1d236..13c755d 100644 --- a/src/test/cpp/defaultinit/testcase2.cpp +++ b/src/test/cpp/defaultinit/testcase2.cpp @@ -23,7 +23,6 @@ #include <log4cxx/logger.h> #include "../insertwide.h" #include "../logunit.h" -#include <log4cxx/xml/domconfigurator.h> using namespace log4cxx; @@ -36,7 +35,6 @@ LOGUNIT_CLASS(TestCase2) public: void setUp() { - log4cxx::xml::DOMConfigurator::configure("input/xml/defaultInit.xml"); } void tearDown() @@ -58,6 +56,6 @@ public: }; -LOGUNIT_TEST_SUITE_REGISTRATION(TestCase2) +LOGUNIT_TEST_SUITE_REGISTRATION_DISABLED(TestCase2) diff --git a/src/test/cpp/defaultinit/testcase3.cpp b/src/test/cpp/defaultinit/testcase3.cpp index da9471d..37e0761 100644 --- a/src/test/cpp/defaultinit/testcase3.cpp +++ b/src/test/cpp/defaultinit/testcase3.cpp @@ -16,7 +16,6 @@ */ #include <log4cxx/logmanager.h> -#include <log4cxx/propertyconfigurator.h> #include <log4cxx/logger.h> #include "../insertwide.h" #include "../logunit.h" @@ -32,7 +31,6 @@ LOGUNIT_CLASS(TestCase3) public: void setUp() { - PropertyConfigurator::configure(LOG4CXX_FILE("input/defaultInit3.properties")); } void tearDown() @@ -54,4 +52,4 @@ public: }; -LOGUNIT_TEST_SUITE_REGISTRATION(TestCase3) +LOGUNIT_TEST_SUITE_REGISTRATION_DISABLED(TestCase3) diff --git a/src/test/cpp/defaultinit/testcase4.cpp b/src/test/cpp/defaultinit/testcase4.cpp index 1ff3a2e..64bc06e 100644 --- a/src/test/cpp/defaultinit/testcase4.cpp +++ b/src/test/cpp/defaultinit/testcase4.cpp @@ -21,7 +21,6 @@ #include <log4cxx/logmanager.h> #include <log4cxx/logger.h> -#include <log4cxx/xml/domconfigurator.h> #include "../insertwide.h" #include "../logunit.h" @@ -36,7 +35,6 @@ LOGUNIT_CLASS(TestCase4) public: void setUp() { - log4cxx::xml::DOMConfigurator::configure("input/xml/defaultInit.xml"); } void tearDown() @@ -59,5 +57,5 @@ public: }; -LOGUNIT_TEST_SUITE_REGISTRATION(TestCase4) +LOGUNIT_TEST_SUITE_REGISTRATION_DISABLED(TestCase4)
