diff options
| author | Dominik Stadler <centic@apache.org> | 2016-12-30 17:00:13 +0000 |
|---|---|---|
| committer | Dominik Stadler <centic@apache.org> | 2016-12-30 17:00:13 +0000 |
| commit | 02f2481d219c156f1acc6a5980550767de342a73 (patch) | |
| tree | 1e64d14b6bf81e65ab6838716a81394e8e4d5178 /build.xml | |
| parent | 2d7f4100bdb43e074697a405bef1b31c9b98280a (diff) | |
| download | poi-02f2481d219c156f1acc6a5980550767de342a73.tar.gz poi-02f2481d219c156f1acc6a5980550767de342a73.zip | |
Allow to set the new --add-opens argument for JDK 9, scratchpad tests require slightly more memory on JDK 9 now, also adjust the Jenkins DSL accordingly.
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1776608 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 52 |
1 files changed, 48 insertions, 4 deletions
@@ -307,6 +307,10 @@ under the License. <property name="maxpermsize" value="-XX:MaxPermSize=256m"/> <property name="java9addmods" value="-Dthis.is.a.dummy=true"/> <property name="java9addmodsvalue" value="-Dthis.is.a.dummy=true"/> + <property name="java9addopens1" value="-Dthis.is.a.dummy=true"/> + <property name="java9addopens2" value="-Dthis.is.a.dummy=true"/> + <property name="java9addopens3" value="-Dthis.is.a.dummy=true"/> + <property name="java9addopens4" value="-Dthis.is.a.dummy=true"/> <path id="main.classpath"> <pathelement location="${main.commons-logging.jar}"/> @@ -1260,6 +1264,11 @@ under the License. <!-- jvmarg value="-Duser.timezone=UTC"/ --> <jvmarg value="${java9addmods}" /> <jvmarg value="${java9addmodsvalue}" /> + <jvmarg value="${java9addopens1}" /> + <jvmarg value="${java9addopens2}" /> + <jvmarg value="${java9addopens3}" /> + <jvmarg value="${java9addopens4}" /> + <jvmarg value="${file.leak.detector}" /> <formatter type="plain"/> <formatter type="xml"/> <batchtest todir="${main.reports.test}"> @@ -1320,6 +1329,10 @@ under the License. <!-- jvmarg value="-Duser.timezone=UTC"/ --> <jvmarg value="${java9addmods}" /> <jvmarg value="${java9addmodsvalue}" /> + <jvmarg value="${java9addopens1}" /> + <jvmarg value="${java9addopens2}" /> + <jvmarg value="${java9addopens3}" /> + <jvmarg value="${java9addopens4}" /> <formatter type="plain"/> <formatter type="xml"/> <batchtest todir="${main.reports.test}"> @@ -1368,9 +1381,13 @@ under the License. Without the line below tests fail on Mac OS X with jdk-1.6.26 and on Windows with jdk-1.5.22 --> - <jvmarg value="-Xmx256M"/> + <jvmarg value="-Xmx512m"/> <jvmarg value="${java9addmods}" /> <jvmarg value="${java9addmodsvalue}" /> + <jvmarg value="${java9addopens1}" /> + <jvmarg value="${java9addopens2}" /> + <jvmarg value="${java9addopens3}" /> + <jvmarg value="${java9addopens4}" /> <formatter type="plain"/> <formatter type="xml"/> <batchtest todir="${scratchpad.reports.test}"> @@ -1413,7 +1430,12 @@ under the License. <jvmarg value="-ea"/> <jvmarg value="${java9addmods}" /> <jvmarg value="${java9addmodsvalue}" /> - <!-- jvmarg value="-Duser.timezone=UTC"/ --> + <jvmarg value="${java9addopens1}" /> + <jvmarg value="${java9addopens2}" /> + <jvmarg value="${java9addopens3}" /> + <jvmarg value="${java9addopens4}" /> + <!-- jvmarg value="-Duser.timezone=UTC"/ --> + <jvmarg value="${file.leak.detector}" /> <formatter type="plain"/> <formatter type="xml"/> <batchtest todir="${ooxml.reports.test}"> @@ -1440,6 +1462,10 @@ under the License. <jvmarg value="-ea"/> <jvmarg value="${java9addmods}" /> <jvmarg value="${java9addmodsvalue}" /> + <jvmarg value="${java9addopens1}" /> + <jvmarg value="${java9addopens2}" /> + <jvmarg value="${java9addopens3}" /> + <jvmarg value="${java9addopens4}" /> <formatter type="plain"/> <formatter type="xml"/> <batchtest todir="${ooxml.reports.test}"> @@ -1485,7 +1511,11 @@ under the License. <jvmarg value="-ea"/> <jvmarg value="${java9addmods}" /> <jvmarg value="${java9addmodsvalue}" /> - <!-- jvmarg value="-Duser.timezone=UTC"/ --> + <jvmarg value="${java9addopens1}" /> + <jvmarg value="${java9addopens2}" /> + <jvmarg value="${java9addopens3}" /> + <jvmarg value="${java9addopens4}" /> + <!-- jvmarg value="-Duser.timezone=UTC"/ --> <formatter type="plain"/> <formatter type="xml"/> <batchtest todir="${ooxml.reports.test}"> @@ -1535,6 +1565,10 @@ under the License. <jvmarg value="-Xmx1512M"/> <jvmarg value="${java9addmods}" /> <jvmarg value="${java9addmodsvalue}" /> + <jvmarg value="${java9addopens1}" /> + <jvmarg value="${java9addopens2}" /> + <jvmarg value="${java9addopens3}" /> + <jvmarg value="${java9addopens4}" /> <formatter type="plain"/> <formatter type="xml"/> <batchtest todir="${integration.reports.test}"> @@ -1589,6 +1623,11 @@ under the License. <jvmarg value="-Xmx512m"/> <jvmarg value="${java9addmods}" /> <jvmarg value="${java9addmodsvalue}" /> + <jvmarg value="${java9addopens1}" /> + <jvmarg value="${java9addopens2}" /> + <jvmarg value="${java9addopens3}" /> + <jvmarg value="${java9addopens4}" /> + <jvmarg value="${file.leak.detector}" /> <arg value="-ooxml"/> <arg value="${ooxml.lite-merged.dir}/ooxml-lite-merged.jar"/> <arg value="-test"/> @@ -1628,6 +1667,11 @@ under the License. <jvmarg value="-ea"/> <jvmarg value="${java9addmods}" /> <jvmarg value="${java9addmodsvalue}" /> + <jvmarg value="${java9addopens1}" /> + <jvmarg value="${java9addopens2}" /> + <jvmarg value="${java9addopens3}" /> + <jvmarg value="${java9addopens4}" /> + <jvmarg value="${file.leak.detector}" /> <formatter type="plain"/> <formatter type="xml"/> <batchtest todir="${excelant.reports.test}"> @@ -2690,4 +2734,4 @@ under the License. </section> ]]></echo> </target> -</project>
\ No newline at end of file +</project> |