[logging-log4cxx] branch master updated: GHPR #18 wants to introduce additional excluded tests, but not sure if this is the correct approach. If it's not, a missing SED shouldn't be excluded as well of course, so I'm removing that. I'm pretty sure to not want to add additional excluded tests, because at some points the running and optionally succeeded ones don't mean anything anymore if the half of them is not executed at all. Additionally, SED, ZIP and GZIP can easily be provided on Windows as well e.g. using the following or MS [...]

[ts...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tschoening pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git


The following commit(s) were added to refs/heads/master by this push:
     new 7667195  GHPR #18 wants to introduce additional excluded tests, but not sure if this is the correct approach. If it's not, a missing SED shouldn't be excluded as well of course, so I'm removing that. I'm pretty sure to not want to add additional excluded tests, because at some points the running and optionally succeeded ones don't mean anything anymore if the half of them is not executed at all. Additionally, SED, ZIP and GZIP can easily be provided on Windows as well e.g. using  [...]
7667195 is described below

commit 76671956437e35864e1a5d843cefdf42c8154b76
Author: Thorsten Schöning <ts...@am-soft.de>
AuthorDate: Mon Feb 17 11:10:23 2020 +0100

    GHPR #18 wants to introduce additional excluded tests, but not sure if this is the correct approach. If it's not, a missing SED shouldn't be excluded as well of course, so I'm removing that. I'm pretty sure to not want to add additional excluded tests, because at some points the running and optionally succeeded ones don't mean anything anymore if the half of them is not executed at all. Additionally, SED, ZIP and GZIP can easily be provided on Windows as well e.g. using the following  [...]
    
    > C:\Program Files (x86)\UnxUtils\usr\local\wbin
    > https://sourceforge.net/projects/unxutils/
    
    Not sure how to handle "Java_Development_FOUND" currently, though, because the former argument applies to that as well in theory.
---
 src/test/cpp/CMakeLists.txt       | 11 +++--------
 src/test/cpp/net/CMakeLists.txt   |  4 ++--
 src/test/cpp/varia/CMakeLists.txt |  4 +---
 src/test/cpp/xml/CMakeLists.txt   |  6 +++---
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/test/cpp/CMakeLists.txt b/src/test/cpp/CMakeLists.txt
index 6f86351..8c90999 100644
--- a/src/test/cpp/CMakeLists.txt
+++ b/src/test/cpp/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Determine whether to include tests that call sed
-find_program(sedProgram sed)
-
 # Components required by all tests
 add_library(testingFramework STATIC abts.cpp appenderskeletontestcase.cpp logunit.cpp vectorappender.cpp writerappendertestcase.cpp )
 target_include_directories(testingFramework PRIVATE ${CMAKE_CURRENT_LIST_DIR} $<TARGET_PROPERTY:log4cxx,INCLUDE_DIRECTORIES>)
@@ -8,7 +5,7 @@ add_subdirectory(util)
 target_sources(testingUtilities PRIVATE xml/xlevel.cpp)
 
 # Tests defined in this directory
-set(ALL_LOG4CXX_TESTS 
+set(ALL_LOG4CXX_TESTS
     asyncappendertestcase
     consoleappendertestcase
     decodingtest
@@ -22,15 +19,13 @@ set(ALL_LOG4CXX_TESTS
     leveltestcase
     loggertestcase
     mdctestcase
+    minimumtestcase
     ndctestcase
-   
+    patternlayouttest
     propertyconfiguratortest
     rollingfileappendertestcase
     streamtestcase
 )
-if(sedProgram)
-    list(APPEND ALL_LOG4CXX_TESTS minimumtestcase patternlayouttest)
-endif()
 foreach(fileName IN LISTS ALL_LOG4CXX_TESTS)
     add_executable(${fileName} "${fileName}.cpp")
 endforeach()
diff --git a/src/test/cpp/net/CMakeLists.txt b/src/test/cpp/net/CMakeLists.txt
index bee6f34..a5076f9 100644
--- a/src/test/cpp/net/CMakeLists.txt
+++ b/src/test/cpp/net/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 # Tests defined in this directory
-set(NET_TESTS 
+set(NET_TESTS
     socketappendertestcase
     sockethubappendertestcase
     syslogappendertestcase
@@ -13,7 +13,7 @@ endif(HAS_LIBESMPT)
 foreach(fileName IN LISTS NET_TESTS)
     add_executable(${fileName} "${fileName}.cpp")
 endforeach()
-if(Java_Development_FOUND AND sedProgram)
+if(Java_Development_FOUND)
     add_executable(socketservertestcase socketserverstarter.cpp socketservertestcase.cpp)
     add_dependencies(socketservertestcase test-classes)
     list(APPEND NET_TESTS socketservertestcase)
diff --git a/src/test/cpp/varia/CMakeLists.txt b/src/test/cpp/varia/CMakeLists.txt
index 2bef8aa..c0e87c0 100644
--- a/src/test/cpp/varia/CMakeLists.txt
+++ b/src/test/cpp/varia/CMakeLists.txt
@@ -1,11 +1,9 @@
 # Tests defined in this directory
 set(VARIA_TESTS
+    errorhandlertestcase
     levelmatchfiltertestcase
     levelrangefiltertestcase
 )
-if(sedProgram)
-    list(APPEND VARIA_TESTS errorhandlertestcase)
-endif()
 
 foreach(fileName  IN LISTS VARIA_TESTS)
     add_executable(${fileName} "${fileName}.cpp")
diff --git a/src/test/cpp/xml/CMakeLists.txt b/src/test/cpp/xml/CMakeLists.txt
index e9e421b..8c9ae7e 100644
--- a/src/test/cpp/xml/CMakeLists.txt
+++ b/src/test/cpp/xml/CMakeLists.txt
@@ -1,9 +1,9 @@
 add_executable(xmltests
+    domtestcase
     xmllayouttest
+    xmllayouttestcase
+    xmltests
 )
-if(sedProgram)
-    list(APPEND xmltests domtestcase xmllayouttestcase)
-endif()
 
 target_link_libraries(xmltests PRIVATE ${APR_UTIL_LIBRARIES})
 set(ALL_LOG4CXX_TESTS ${ALL_LOG4CXX_TESTS} xmltests PARENT_SCOPE)