[SUREFIRE-2225] Surefire ITs fail when project directory contains space

This closes #705
apache · Dec 30, 2023 · 4eb0fd5 · 4eb0fd5
1 parent 83c4666
commit 4eb0fd5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
@@ -80,6 +80,10 @@ private List<String> getInitialGoals() {
         goals.add("-Dsurefire.version=" + surefireVersion);
 
         String jacocoAgent = System.getProperty("jacoco.agent", "");
+        // Remove unnecessary backslash escaping for Windows, see https://github.com/jacoco/jacoco/issues/1559
+        jacocoAgent = jacocoAgent.replace("\\\\", "\\");
+        // Remove quotes which will cause a syntax error raised by cmd.exe because of quote escaping
+        jacocoAgent = jacocoAgent.replace("\"", "");
         goals.add("-Djacoco.agent=" + jacocoAgent);
         goals.add("-nsu");
 

diff --git a/surefire-its/src/test/resources/junit47-parallel/pom.xml b/surefire-its/src/test/resources/junit47-parallel/pom.xml
@@ -62,7 +62,7 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <argLine>${argLine} ${jacoco.agent}</argLine>
+          <argLine>${argLine} "${jacoco.agent}"</argLine>
         </configuration>
       </plugin>
     </plugins>

diff --git a/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml b/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml
@@ -43,7 +43,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${surefire.version}</version>
                 <configuration>
-                    <argLine>${argLine} ${jacoco.agent}</argLine>
+                    <argLine>${argLine} "${jacoco.agent}"</argLine>
                     <parallel>methods</parallel>
                     <properties>
                         <property>

diff --git a/surefire-its/src/test/resources/testng-740-parallel/pom.xml b/surefire-its/src/test/resources/testng-740-parallel/pom.xml
@@ -43,7 +43,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${surefire.version}</version>
                 <configuration>
-                    <argLine>${argLine} ${jacoco.agent}</argLine>
+                    <argLine>${argLine} "${jacoco.agent}"</argLine>
                     <parallel>methods</parallel>
                     <threadCount>10</threadCount>
                     <properties>

diff --git a/surefire-its/src/test/resources/testng-simple/pom.xml b/surefire-its/src/test/resources/testng-simple/pom.xml
@@ -87,7 +87,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${surefire.version}</version>
         <configuration>
-          <argLine>${argLine} ${jacoco.agent}</argLine>
+          <argLine>${argLine} "${jacoco.agent}"</argLine>
           <runOrder>reversealphabetical</runOrder>
           <properties>
             <property>