You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/10/23 09:51:11 UTC
svn commit: r1812986 - in /jmeter/trunk: .travis.yml build.xml
Author: pmouawad
Date: Mon Oct 23 09:51:10 2017
New Revision: 1812986
URL: http://svn.apache.org/viewvc?rev=1812986&view=rev
Log:
Try to fix travis ci failure with Java 9
Modified:
jmeter/trunk/.travis.yml
jmeter/trunk/build.xml
Modified: jmeter/trunk/.travis.yml
URL: http://svn.apache.org/viewvc/jmeter/trunk/.travis.yml?rev=1812986&r1=1812985&r2=1812986&view=diff
==============================================================================
--- jmeter/trunk/.travis.yml (original)
+++ jmeter/trunk/.travis.yml Mon Oct 23 09:51:10 2017
@@ -10,12 +10,12 @@ install: true
matrix:
include:
- - jdk: oraclejdk8
- env: RUN_CHECKSTYLE=true
- script: ant -Djava.awt.headless=true checkstyle
- - jdk: oraclejdk8
- script: ant -Djava.awt.headless=true -Drmi_force_localhost=true -Dskip.bug52310=true test
- sudo: true # otherwise TEST_HTTPS.jmx -> analytics.usa.gov does not work
+# - jdk: oraclejdk8
+# env: RUN_CHECKSTYLE=true
+# script: ant -Djava.awt.headless=true checkstyle
+# - jdk: oraclejdk8
+# script: ant -Djava.awt.headless=true -Drmi_force_localhost=true -Dskip.bug52310=true test
+# sudo: true # otherwise TEST_HTTPS.jmx -> analytics.usa.gov does not work
- jdk: oraclejdk9
script: ant -Djava.awt.headless=true -Drmi_force_localhost=true -Dskip.bug52310=true test
sudo: true # otherwise TEST_HTTPS.jmx -> analytics.usa.gov does not work
\ No newline at end of file
Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1812986&r1=1812985&r2=1812986&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Mon Oct 23 09:51:10 2017
@@ -902,8 +902,7 @@
<classpath>
<pathelement location="${dest.jar.jmeter}/ApacheJMeter.jar"/>
</classpath>
- <jvmarg value="--add-modules" if:set="java9" />
- <jvmarg value="java.activation" if:set="java9" />
+ <jvmarg line="--add-modules java.activation" if:set="java9" />
<jvmarg value="${jacoco_params}run_gui:java(server)"/>
<sysproperty key="jmeter.home" value="${basedir}"/>
</java>
@@ -2456,8 +2455,7 @@ run JMeter unless all the JMeter jars ar
<path refid="classpath"/>
<path refid="logging.classpath"/>
</classpath>
- <jvmarg value="--add-modules" if:set="java9" />
- <jvmarg value="java.activation" if:set="java9" />
+ <jvmarg line="--add-modules java.activation" if:set="java9" />
<jvmarg value="${jacoco_params}batchtest:daemon:java(server)"/>
<sysproperty key="java.awt.headless" value="true"/>
<!-- Bug 59723 -->
@@ -2569,8 +2567,7 @@ run JMeter unless all the JMeter jars ar
<path refid="classpath"/>
<path refid="logging.classpath"/>
</classpath>
- <jvmarg value="--add-modules" if:set="java9" />
- <jvmarg value="java.activation" if:set="java9" />
+ <jvmarg line="--add-modules java.activation" if:set="java9" />
<jvmarg value="${jacoco_params}batchtest:java(${taskname})"/>
<!-- Detect if non-GUI runs OK headless by forcing it to try using non-headless mode -->
<sysproperty key="user.language" value="en"/>
@@ -2894,8 +2891,7 @@ run JMeter unless all the JMeter jars ar
<path refid="classpath"/>
<path refid="logging.classpath"/>
</classpath>
- <jvmarg value="--add-modules" if:set="java9" />
- <jvmarg value="java.activation" if:set="java9" />
+ <jvmarg line="--add-modules java.activation" if:set="java9" />
<jvmarg value="-server"/>
<jvmarg value="${jacoco_params}_test:java"/>
<jvmarg value="-Dfile.encoding=${test.encoding}"/>