only one thread to avoid flaky tests and fix path of log4j logs to be…

… in target directory Signed-off-by: Olivier Lamy <olamy@apache.org>
apache · Jun 12, 2022 · 6cdeb1f · 6cdeb1f
1 parent 71a11ce
commit 6cdeb1f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
@@ -28,9 +28,9 @@ jobs:
     with:
       jdk-matrix: '[ "8", "11", "17", "18" ]'
       ff-jdk: '18'
-      ff-goal: 'clean install site site:stage -P reporting -nsu -T3'
+      ff-goal: 'clean install site site:stage -P reporting -nsu'
       ff-site-goal: '-v'
-      verify-goal: 'clean install -nsu -P run-its -T3'
+      verify-goal: 'clean install -nsu -P run-its'
       verify-fail-fast: false
       failure-upload-path: |
         surefire-its/target/*/log.txt

diff --git a/.../test/resources/surefire-1744-alwaysIncludeOutputLogs/src/main/resources/log4j.properties b/.../test/resources/surefire-1744-alwaysIncludeOutputLogs/src/main/resources/log4j.properties
@@ -5,20 +5,20 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 
 log4j.appender.xml=org.apache.log4j.FileAppender
-log4j.appender.xml.file=example_xml.log
+log4j.appender.xml.file=target/example_xml.log
 log4j.appender.xml.append=false
 log4j.appender.xml.layout=org.apache.log4j.xml.XMLLayout
 
 # Pattern to output the caller's file name and line number.
 log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
 
 log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=example.log
+log4j.appender.R.File=target/example.log
 
 
 log4j.appender.R.MaxFileSize=100KB
 # Keep one backup file
 log4j.appender.R.MaxBackupIndex=1
 
 log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n
+log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n
diff --git a/...its/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties b/...its/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties
@@ -5,20 +5,20 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 
 log4j.appender.xml=org.apache.log4j.FileAppender
-log4j.appender.xml.file=example_xml.log
+log4j.appender.xml.file=target/example_xml.log
 log4j.appender.xml.append=false
 log4j.appender.xml.layout=org.apache.log4j.xml.XMLLayout
 
 # Pattern to output the caller's file name and line number.
 log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
 
 log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=example.log
+log4j.appender.R.File=target/example.log
 
 
 log4j.appender.R.MaxFileSize=100KB
 # Keep one backup file
 log4j.appender.R.MaxBackupIndex=1
 
 log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n
+log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n