adjust the argline for tycho-maven-plugin

openjdk · Sep 17, 2024 · 816aa4d · 816aa4d
1 parent 311f911
commit 816aa4d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.test/pom.xml b/application/tests/org.openjdk.jmc.flightrecorder.controlpanel.ui.test/pom.xml
@@ -50,7 +50,7 @@
  <artifactId>tycho-surefire-plugin</artifactId>
  <version>${tycho.version}</version>
  <configuration>
- <argLine>${surefireArgLine} -Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Djmc.test.rjmx.serviceURL=service:jmx:rmi:///jndi/rmi://localhost:9999/jmxrmi ${jfr.vmargs}</argLine>
+ <argLine>${tycho.testArgLine.local} -Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Djmc.test.rjmx.serviceURL=service:jmx:rmi:///jndi/rmi://localhost:9999/jmxrmi ${jfr.vmargs}</argLine>
  </configuration>
  </plugin>
  </plugins>

diff --git a/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/pom.xml b/application/tests/org.openjdk.jmc.rjmx.services.jfr.test/pom.xml
@@ -50,7 +50,7 @@
  <artifactId>tycho-surefire-plugin</artifactId>
  <version>${tycho.version}</version>
  <configuration>
- <argLine>${surefireArgLine} -Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Djmc.test.rjmx.serviceURL=service:jmx:rmi:///jndi/rmi://localhost:9999/jmxrmi ${jfr.vmargs}</argLine>
+ <argLine>${tycho.testArgLine.local} -Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Djmc.test.rjmx.serviceURL=service:jmx:rmi:///jndi/rmi://localhost:9999/jmxrmi ${jfr.vmargs}</argLine>
  <failIfNoTests>false</failIfNoTests>
  </configuration>
  </plugin>

diff --git a/application/tests/org.openjdk.jmc.rjmx.test/pom.xml b/application/tests/org.openjdk.jmc.rjmx.test/pom.xml
@@ -50,7 +50,7 @@
  <artifactId>tycho-surefire-plugin</artifactId>
  <version>${tycho.version}</version>
  <configuration>
- <argLine>${surefireArgLine} -Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Djmc.test.rjmx.serviceURL=service:jmx:rmi:///jndi/rmi://localhost:9999/jmxrmi</argLine>
+ <argLine>${tycho.testArgLine.local} -Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Djmc.test.rjmx.serviceURL=service:jmx:rmi:///jndi/rmi://localhost:9999/jmxrmi</argLine>
  </configuration>
  </plugin>
  </plugins>

diff --git a/application/tests/pom.xml b/application/tests/pom.xml
@@ -59,6 +59,7 @@
  <test.excludes.default>**/*$*</test.excludes.default>
  <fail.if.no.tests>true</fail.if.no.tests>
  <jmc.config.path>${project.basedir}/../../configuration</jmc.config.path>
+ <tycho.testArgLine.local></tycho.testArgLine.local>
  </properties>
  <profiles>
  <profile>
@@ -107,6 +108,9 @@
  </profile>
  <profile>
  <id>coverage</id>
+ <properties>
+ <tycho.testArgLine.local>${tycho.testArgLine}</tycho.testArgLine.local>
+ </properties>
  <build>
  <plugins>
  <plugin>
@@ -119,9 +123,6 @@
  <goals>
  <goal>prepare-agent</goal>
  </goals>
- <configuration>
- <propertyName>surefireArgLine</propertyName>
- </configuration>
  </execution>
  <execution>
  <id>post-unit-test</id>
@@ -150,7 +151,6 @@
  <artifactId>tycho-surefire-plugin</artifactId>
  <version>${tycho.version}</version>
  <configuration>
- <argLine>${surefireArgLine}</argLine>
  <appArgLine>-nl en</appArgLine>
  <includes>${test.includes}</includes>
  <excludes>