From: Tobias Frost Date: Sat, 11 Dec 2021 12:19:34 +0100 Subject: Fix parallel execution of the testsuite As many of the individual testsuite uses the same output file for the artifacts of the test suites, the tests are racy if executed in parallel, eg. by ctest -jxx. This patch fixes it by assigning individual names for the test artifact files. --- src/test/cpp/customlogger/xloggertestcase.cpp | 2 +- src/test/cpp/hierarchythresholdtestcase.cpp | 2 +- src/test/cpp/l7dtestcase.cpp | 2 +- src/test/cpp/minimumtestcase.cpp | 2 +- src/test/cpp/ndctestcase.cpp | 2 +- src/test/cpp/patternlayouttest.cpp | 4 ++-- src/test/cpp/varia/errorhandlertestcase.cpp | 4 ++-- src/test/resources/input/hierarchyThreshold1.properties | 2 +- src/test/resources/input/hierarchyThreshold2.properties | 2 +- src/test/resources/input/hierarchyThreshold3.properties | 2 +- src/test/resources/input/hierarchyThreshold4.properties | 2 +- src/test/resources/input/hierarchyThreshold5.properties | 2 +- src/test/resources/input/hierarchyThreshold6.properties | 2 +- src/test/resources/input/hierarchyThreshold7.properties | 2 +- src/test/resources/input/hierarchyThreshold8.properties | 2 +- src/test/resources/input/l7d1.properties | 2 +- src/test/resources/input/ndc/NDC1.properties | 2 +- src/test/resources/input/patternLayout.mdc.1.properties | 2 +- src/test/resources/input/patternLayout1.properties | 6 +++--- src/test/resources/input/patternLayout10.properties | 2 +- src/test/resources/input/patternLayout11.properties | 2 +- src/test/resources/input/patternLayout12.properties | 2 +- src/test/resources/input/patternLayout2.properties | 2 +- src/test/resources/input/patternLayout4.properties | 2 +- src/test/resources/input/patternLayout5.properties | 2 +- src/test/resources/input/patternLayout6.properties | 2 +- src/test/resources/input/patternLayout7.properties | 2 +- src/test/resources/input/patternLayout8.properties | 2 +- src/test/resources/input/patternLayout9.properties | 2 +- src/test/resources/input/xml/customLogger1.xml | 2 +- src/test/resources/input/xml/customLogger2.xml | 2 +- src/test/resources/input/xml/fallback1.xml | 2 +- 32 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/test/cpp/customlogger/xloggertestcase.cpp b/src/test/cpp/customlogger/xloggertestcase.cpp index 278706f..22add6e 100644 --- a/src/test/cpp/customlogger/xloggertestcase.cpp +++ b/src/test/cpp/customlogger/xloggertestcase.cpp @@ -88,7 +88,7 @@ public: i++; LOG4CXX_DEBUG(logger, "Message " << i); - const File OUTPUT("output/temp"); + const File OUTPUT("output/customlogger"); std::string witness("witness/customLogger."); witness.append(number); const File WITNESS(witness); diff --git a/src/test/cpp/hierarchythresholdtestcase.cpp b/src/test/cpp/hierarchythresholdtestcase.cpp index d1b2759..7afce17 100644 --- a/src/test/cpp/hierarchythresholdtestcase.cpp +++ b/src/test/cpp/hierarchythresholdtestcase.cpp @@ -126,7 +126,7 @@ private: static LoggerPtr logger; }; -File HierarchyThresholdTestCase::TEMP(LOG4CXX_FILE("output/temp")); +File HierarchyThresholdTestCase::TEMP(LOG4CXX_FILE("output/hierarchythreshold")); LoggerPtr HierarchyThresholdTestCase::logger = Logger::getLogger(LOG4CXX_TEST_STR("HierarchyThresholdTestCase")); diff --git a/src/test/cpp/l7dtestcase.cpp b/src/test/cpp/l7dtestcase.cpp index e1b855b..c368b45 100644 --- a/src/test/cpp/l7dtestcase.cpp +++ b/src/test/cpp/l7dtestcase.cpp @@ -102,7 +102,7 @@ public: LOG4CXX_TEST_STR("log4j"), LOG4CXX_TEST_STR("log4cxx")); } - LOGUNIT_ASSERT(Compare::compare(LOG4CXX_FILE("output/temp"), + LOGUNIT_ASSERT(Compare::compare(LOG4CXX_FILE("output/l7d1"), LOG4CXX_FILE("witness/l7d.1"))); } diff --git a/src/test/cpp/minimumtestcase.cpp b/src/test/cpp/minimumtestcase.cpp index 8d171e0..49d5b34 100644 --- a/src/test/cpp/minimumtestcase.cpp +++ b/src/test/cpp/minimumtestcase.cpp @@ -246,7 +246,7 @@ private: }; -const File MinimumTestCase::FILTERED("output/filtered"); +const File MinimumTestCase::FILTERED("output/minimumfiltered"); LOGUNIT_TEST_SUITE_REGISTRATION(MinimumTestCase); diff --git a/src/test/cpp/ndctestcase.cpp b/src/test/cpp/ndctestcase.cpp index f0ab889..72de1eb 100644 --- a/src/test/cpp/ndctestcase.cpp +++ b/src/test/cpp/ndctestcase.cpp @@ -113,7 +113,7 @@ public: }; -File NDCTestCase::TEMP("output/temp"); +File NDCTestCase::TEMP("output/ndc"); LoggerPtr NDCTestCase::logger(Logger::getLogger("org.apache.log4j.NDCTestCase")); LOGUNIT_TEST_SUITE_REGISTRATION(NDCTestCase); diff --git a/src/test/cpp/patternlayouttest.cpp b/src/test/cpp/patternlayouttest.cpp index 80c3ff7..a6893da 100644 --- a/src/test/cpp/patternlayouttest.cpp +++ b/src/test/cpp/patternlayouttest.cpp @@ -542,8 +542,8 @@ private: }; -const LogString PatternLayoutTest::TEMP(LOG4CXX_STR("output/temp")); -const LogString PatternLayoutTest::FILTERED(LOG4CXX_STR("output/filtered")); +const LogString PatternLayoutTest::TEMP(LOG4CXX_STR("output/patternlayout")); +const LogString PatternLayoutTest::FILTERED(LOG4CXX_STR("output/patternlayoutfiltered")); LOGUNIT_TEST_SUITE_REGISTRATION(PatternLayoutTest); diff --git a/src/test/cpp/varia/errorhandlertestcase.cpp b/src/test/cpp/varia/errorhandlertestcase.cpp index f96e1d3..ba185a1 100644 --- a/src/test/cpp/varia/errorhandlertestcase.cpp +++ b/src/test/cpp/varia/errorhandlertestcase.cpp @@ -83,7 +83,7 @@ public: try { - Transformer::transform("output/temp", "output/filtered", filters); + Transformer::transform("output/fallback", "output/fallbackfiltered", filters); } catch (UnexpectedFormatException& e) { @@ -92,7 +92,7 @@ public: } - LOGUNIT_ASSERT(Compare::compare("output/filtered", "witness/fallback1")); + LOGUNIT_ASSERT(Compare::compare("output/fallbackfiltered", "witness/fallback1")); } void common() diff --git a/src/test/resources/input/hierarchyThreshold1.properties b/src/test/resources/input/hierarchyThreshold1.properties index 2a62676..41d7570 100644 --- a/src/test/resources/input/hierarchyThreshold1.properties +++ b/src/test/resources/input/hierarchyThreshold1.properties @@ -16,7 +16,7 @@ log4j.threshold=OFF log4j.rootLogger=,A log4j.appender.A=org.apache.log4j.FileAppender -log4j.appender.A.File=output/temp +log4j.appender.A.File=output/hierarchythreshold log4j.appender.A.Append=false log4j.appender.A.layout=org.apache.log4j.PatternLayout log4j.appender.A.layout.ConversionPattern=%p %c = %m%n diff --git a/src/test/resources/input/hierarchyThreshold2.properties b/src/test/resources/input/hierarchyThreshold2.properties index a997420..9e6bad7 100644 --- a/src/test/resources/input/hierarchyThreshold2.properties +++ b/src/test/resources/input/hierarchyThreshold2.properties @@ -16,7 +16,7 @@ log4j.threshold=FATAL log4j.rootLogger=,A log4j.appender.A=org.apache.log4j.FileAppender -log4j.appender.A.File=output/temp +log4j.appender.A.File=output/hierarchythreshold log4j.appender.A.Append=false log4j.appender.A.layout=org.apache.log4j.PatternLayout log4j.appender.A.layout.ConversionPattern=%p %c = %m%n diff --git a/src/test/resources/input/hierarchyThreshold3.properties b/src/test/resources/input/hierarchyThreshold3.properties index d81982d..4550ac7 100644 --- a/src/test/resources/input/hierarchyThreshold3.properties +++ b/src/test/resources/input/hierarchyThreshold3.properties @@ -16,7 +16,7 @@ log4j.threshold=ERROR log4j.rootLogger=,A log4j.appender.A=org.apache.log4j.FileAppender -log4j.appender.A.File=output/temp +log4j.appender.A.File=output/hierarchythreshold log4j.appender.A.Append=false log4j.appender.A.layout=org.apache.log4j.PatternLayout log4j.appender.A.layout.ConversionPattern=%p %c = %m%n diff --git a/src/test/resources/input/hierarchyThreshold4.properties b/src/test/resources/input/hierarchyThreshold4.properties index 97be410..31bb048 100644 --- a/src/test/resources/input/hierarchyThreshold4.properties +++ b/src/test/resources/input/hierarchyThreshold4.properties @@ -16,7 +16,7 @@ log4j.threshold=WARN log4j.rootLogger=,A log4j.appender.A=org.apache.log4j.FileAppender -log4j.appender.A.File=output/temp +log4j.appender.A.File=output/hierarchythreshold log4j.appender.A.Append=false log4j.appender.A.layout=org.apache.log4j.PatternLayout log4j.appender.A.layout.ConversionPattern=%p %c = %m%n diff --git a/src/test/resources/input/hierarchyThreshold5.properties b/src/test/resources/input/hierarchyThreshold5.properties index dd21f44..503869c 100644 --- a/src/test/resources/input/hierarchyThreshold5.properties +++ b/src/test/resources/input/hierarchyThreshold5.properties @@ -16,7 +16,7 @@ log4j.threshold=INFO log4j.rootLogger=,A log4j.appender.A=org.apache.log4j.FileAppender -log4j.appender.A.File=output/temp +log4j.appender.A.File=output/hierarchythreshold log4j.appender.A.Append=false log4j.appender.A.layout=org.apache.log4j.PatternLayout log4j.appender.A.layout.ConversionPattern=%p %c = %m%n diff --git a/src/test/resources/input/hierarchyThreshold6.properties b/src/test/resources/input/hierarchyThreshold6.properties index 1d57103..cbc677c 100644 --- a/src/test/resources/input/hierarchyThreshold6.properties +++ b/src/test/resources/input/hierarchyThreshold6.properties @@ -16,7 +16,7 @@ log4j.threshold=DEBUG log4j.rootLogger=,A log4j.appender.A=org.apache.log4j.FileAppender -log4j.appender.A.File=output/temp +log4j.appender.A.File=output/hierarchythreshold log4j.appender.A.Append=false log4j.appender.A.layout=org.apache.log4j.PatternLayout log4j.appender.A.layout.ConversionPattern=%p %c = %m%n diff --git a/src/test/resources/input/hierarchyThreshold7.properties b/src/test/resources/input/hierarchyThreshold7.properties index 4e06b63..ab0b99c 100644 --- a/src/test/resources/input/hierarchyThreshold7.properties +++ b/src/test/resources/input/hierarchyThreshold7.properties @@ -16,7 +16,7 @@ log4j.threshold=TRACE#org.apache.log4j.xml.XLevel log4j.rootLogger=ALL,A log4j.appender.A=org.apache.log4j.FileAppender -log4j.appender.A.File=output/temp +log4j.appender.A.File=output/hierarchythreshold log4j.appender.A.Append=false log4j.appender.A.layout=org.apache.log4j.PatternLayout log4j.appender.A.layout.ConversionPattern=%p %c = %m%n diff --git a/src/test/resources/input/hierarchyThreshold8.properties b/src/test/resources/input/hierarchyThreshold8.properties index dfec144..5ed9cf0 100644 --- a/src/test/resources/input/hierarchyThreshold8.properties +++ b/src/test/resources/input/hierarchyThreshold8.properties @@ -16,7 +16,7 @@ log4j.threshold=ALL log4j.rootLogger=ALL,A log4j.appender.A=org.apache.log4j.FileAppender -log4j.appender.A.File=output/temp +log4j.appender.A.File=output/hierarchythreshold log4j.appender.A.Append=false log4j.appender.A.layout=org.apache.log4j.PatternLayout log4j.appender.A.layout.ConversionPattern=%p %c = %m%n diff --git a/src/test/resources/input/l7d1.properties b/src/test/resources/input/l7d1.properties index 70a7188..aa6ac1a 100644 --- a/src/test/resources/input/l7d1.properties +++ b/src/test/resources/input/l7d1.properties @@ -15,7 +15,7 @@ # log4j.rootCategory=INFO, testAppender log4j.appender.testAppender=org.apache.log4j.FileAppender -log4j.appender.testAppender.File= output/temp +log4j.appender.testAppender.File= output/l7d1 log4j.appender.testAppender.Append=false log4j.appender.testAppender.layout=org.apache.log4j.PatternLayout log4j.appender.testAppender.layout.ConversionPattern=T1 %5p - %m%n diff --git a/src/test/resources/input/ndc/NDC1.properties b/src/test/resources/input/ndc/NDC1.properties index 8ced024..196829a 100644 --- a/src/test/resources/input/ndc/NDC1.properties +++ b/src/test/resources/input/ndc/NDC1.properties @@ -15,7 +15,7 @@ # log4j.rootCategory=DEBUG, testAppender log4j.appender.testAppender=org.apache.log4j.FileAppender -log4j.appender.testAppender.file=output/temp +log4j.appender.testAppender.file=output/ndc log4j.appender.testAppender.Append=false log4j.appender.testAppender.layout=org.apache.log4j.PatternLayout log4j.appender.testAppender.layout.ConversionPattern=%-5p %x - %m%n diff --git a/src/test/resources/input/patternLayout.mdc.1.properties b/src/test/resources/input/patternLayout.mdc.1.properties index 328dfef..188f8fe 100644 --- a/src/test/resources/input/patternLayout.mdc.1.properties +++ b/src/test/resources/input/patternLayout.mdc.1.properties @@ -15,7 +15,7 @@ # log4j.rootCategory=DEBUG, testAppender log4j.appender.testAppender=org.apache.log4j.FileAppender -log4j.appender.testAppender.File=output/temp +log4j.appender.testAppender.File=output/patternlayout log4j.appender.testAppender.Append=false log4j.appender.testAppender.layout=org.apache.log4j.PatternLayout log4j.appender.testAppender.layout.ConversionPattern=%-5p - %m %X \ No newline at end of file diff --git a/src/test/resources/input/patternLayout1.properties b/src/test/resources/input/patternLayout1.properties index ad485ec..97d17c5 100644 --- a/src/test/resources/input/patternLayout1.properties +++ b/src/test/resources/input/patternLayout1.properties @@ -15,7 +15,7 @@ # log4j.rootCategory=DEBUG, testAppender log4j.appender.testAppender=org.apache.log4j.FileAppender -log4j.appender.testAppender.file=output/temp +log4j.appender.testAppender.file=output/patternlayout log4j.appender.testAppender.Append=false -log4j.appender.testAppender.layout=org.apache.log4j.PatternLayout -log4j.appender.testAppender.layout.ConversionPattern=%-5p - %m%n \ No newline at end of file +log4j.appender.testAppender.layout=org.apache.log4j.PatternLayout +log4j.appender.testAppender.layout.ConversionPattern=%-5p - %m%n diff --git a/src/test/resources/input/patternLayout10.properties b/src/test/resources/input/patternLayout10.properties index a42de7c..4a0f1c6 100644 --- a/src/test/resources/input/patternLayout10.properties +++ b/src/test/resources/input/patternLayout10.properties @@ -15,7 +15,7 @@ # log4j.rootCategory=DEBUG, testAppender log4j.appender.testAppender=org.apache.log4j.FileAppender -log4j.appender.testAppender.File= output/temp +log4j.appender.testAppender.File= output/patternlayout log4j.appender.testAppender.Append= false log4j.appender.testAppender.layout=org.apache.log4j.PatternLayout log4j.appender.testAppender.layout.ConversionPattern=[%t] %-5p %l: %m%n diff --git a/src/test/resources/input/patternLayout11.properties b/src/test/resources/input/patternLayout11.properties index 9a23d57..daa5b5b 100644 --- a/src/test/resources/input/patternLayout11.properties +++ b/src/test/resources/input/patternLayout11.properties @@ -15,7 +15,7 @@ # log4j.rootCategory=DEBUG, testAppender log4j.appender.testAppender=org.apache.log4j.FileAppender -log4j.appender.testAppender.File=output/temp +log4j.appender.testAppender.File=output/patternlayout log4j.appender.testAppender.Append=false log4j.appender.testAppender.layout=org.apache.log4j.PatternLayout log4j.appender.testAppender.layout.ConversionPattern=%-5p [%t] %c{2}: %m%n \ No newline at end of file diff --git a/src/test/resources/input/patternLayout12.properties b/src/test/resources/input/patternLayout12.properties index feb4c32..f7f449a 100644 --- a/src/test/resources/input/patternLayout12.properties +++ b/src/test/resources/input/patternLayout12.properties @@ -15,7 +15,7 @@ # log4j.rootCategory=DEBUG, testAppender log4j.appender.testAppender=org.apache.log4j.FileAppender -log4j.appender.testAppender.File=output/temp +log4j.appender.testAppender.File=output/patternlayout log4j.appender.testAppender.Append=false log4j.appender.testAppender.layout=org.apache.log4j.PatternLayout log4j.appender.testAppender.layout.ConversionPattern=[%t] %-5p %F(%L): %m%n diff --git a/src/test/resources/input/patternLayout2.properties b/src/test/resources/input/patternLayout2.properties index 7cc2bcd..865d14d 100644 --- a/src/test/resources/input/patternLayout2.properties +++ b/src/test/resources/input/patternLayout2.properties @@ -15,7 +15,7 @@ # log4j.rootCategory=DEBUG, testAppender log4j.appender.testAppender=org.apache.log4j.FileAppender -log4j.appender.testAppender.File=output/temp +log4j.appender.testAppender.File=output/patternlayout log4j.appender.testAppender.Append= false log4j.appender.testAppender.layout=org.apache.log4j.PatternLayout log4j.appender.testAppender.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %.16c - %m%n diff --git a/src/test/resources/input/patternLayout4.properties b/src/test/resources/input/patternLayout4.properties index 924e333..0e01859 100644 --- a/src/test/resources/input/patternLayout4.properties +++ b/src/test/resources/input/patternLayout4.properties @@ -15,7 +15,7 @@ # log4j.rootCategory=DEBUG, testAppender log4j.appender.testAppender=org.apache.log4j.FileAppender -log4j.appender.testAppender.File=output/temp +log4j.appender.testAppender.File=output/patternlayout log4j.appender.testAppender.Append=false log4j.appender.testAppender.layout=org.apache.log4j.PatternLayout log4j.appender.testAppender.layout.ConversionPattern=%d{DATE} [%t] %-5p %.16c - %m%n \ No newline at end of file diff --git a/src/test/resources/input/patternLayout5.properties b/src/test/resources/input/patternLayout5.properties index 66a0c06..24b4832 100644 --- a/src/test/resources/input/patternLayout5.properties +++ b/src/test/resources/input/patternLayout5.properties @@ -15,7 +15,7 @@ # log4j.rootCategory=DEBUG, testAppender log4j.appender.testAppender=org.apache.log4j.FileAppender -log4j.appender.testAppender.File=output/temp +log4j.appender.testAppender.File=output/patternlayout log4j.appender.testAppender.Append=false log4j.appender.testAppender.layout=org.apache.log4j.PatternLayout log4j.appender.testAppender.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} [%t] %-5p %.16c - %m%n diff --git a/src/test/resources/input/patternLayout6.properties b/src/test/resources/input/patternLayout6.properties index 2caf150..1d60df4 100644 --- a/src/test/resources/input/patternLayout6.properties +++ b/src/test/resources/input/patternLayout6.properties @@ -15,7 +15,7 @@ # log4j.rootCategory=DEBUG, testAppender log4j.appender.testAppender=org.apache.log4j.FileAppender -log4j.appender.testAppender.File=output/temp +log4j.appender.testAppender.File=output/patternlayout log4j.appender.testAppender.Append=false log4j.appender.testAppender.layout=org.apache.log4j.PatternLayout log4j.appender.testAppender.layout.ConversionPattern=%d{ABSOLUTE} [%t] %-5p %.16c - %m%n \ No newline at end of file diff --git a/src/test/resources/input/patternLayout7.properties b/src/test/resources/input/patternLayout7.properties index 278098d..1e9c387 100644 --- a/src/test/resources/input/patternLayout7.properties +++ b/src/test/resources/input/patternLayout7.properties @@ -15,7 +15,7 @@ # log4j.rootCategory=DEBUG, testAppender log4j.appender.testAppender=org.apache.log4j.FileAppender -log4j.appender.testAppender.File=output/temp +log4j.appender.testAppender.File=output/patternlayout log4j.appender.testAppender.Append=false log4j.appender.testAppender.layout=org.apache.log4j.PatternLayout log4j.appender.testAppender.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%t] %-5p %.16c - %m%n diff --git a/src/test/resources/input/patternLayout8.properties b/src/test/resources/input/patternLayout8.properties index 1426163..d48970c 100644 --- a/src/test/resources/input/patternLayout8.properties +++ b/src/test/resources/input/patternLayout8.properties @@ -15,7 +15,7 @@ # log4j.rootCategory=DEBUG, testAppender log4j.appender.testAppender=org.apache.log4j.FileAppender -log4j.appender.testAppender.File=output/temp +log4j.appender.testAppender.File=output/patternlayout log4j.appender.testAppender.Append=false log4j.appender.testAppender.layout=org.apache.log4j.PatternLayout log4j.appender.testAppender.layout.ConversionPattern=%r [%t] %-5p %.16c - %m%n \ No newline at end of file diff --git a/src/test/resources/input/patternLayout9.properties b/src/test/resources/input/patternLayout9.properties index bdc6623..5a25622 100644 --- a/src/test/resources/input/patternLayout9.properties +++ b/src/test/resources/input/patternLayout9.properties @@ -15,7 +15,7 @@ # log4j.rootCategory=DEBUG, testAppender log4j.appender.testAppender=org.apache.log4j.FileAppender -log4j.appender.testAppender.File=output/temp +log4j.appender.testAppender.File=output/patternlayout log4j.appender.testAppender.Append=false log4j.appender.testAppender.layout=org.apache.log4j.PatternLayout log4j.appender.testAppender.layout.ConversionPattern=[%t] %-5p %.16c : %m%n \ No newline at end of file diff --git a/src/test/resources/input/xml/customLogger1.xml b/src/test/resources/input/xml/customLogger1.xml index 88b677e..2947140 100644 --- a/src/test/resources/input/xml/customLogger1.xml +++ b/src/test/resources/input/xml/customLogger1.xml @@ -23,7 +23,7 @@ - + diff --git a/src/test/resources/input/xml/customLogger2.xml b/src/test/resources/input/xml/customLogger2.xml index 60832a8..c2eec70 100644 --- a/src/test/resources/input/xml/customLogger2.xml +++ b/src/test/resources/input/xml/customLogger2.xml @@ -23,7 +23,7 @@ - + diff --git a/src/test/resources/input/xml/fallback1.xml b/src/test/resources/input/xml/fallback1.xml index b0b8ff8..90072a3 100644 --- a/src/test/resources/input/xml/fallback1.xml +++ b/src/test/resources/input/xml/fallback1.xml @@ -45,7 +45,7 @@ - +