Mercurial > hg > openjdk > jdk9 > nashorn

changeset 1835:0a4bc2f04913 jdk-9+148

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8168663: Nashorn: ant testng tests doesn't support external java options Summary: added new run.test.jvmargs.external property Reviewed-by: sundar, hannesw Contributed-by: srinivas.dama@oracle.com
author sundar
date Fri, 02 Dec 2016 05:39:13 -0800
parents b20e7e7adf24
children 4992c36cbd4d a42ebb5ed04b
files make/build.xml make/project.properties
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/make/build.xml	Thu Dec 01 08:12:06 2016 -0800
+++ b/make/build.xml	Fri Dec 02 05:39:13 2016 -0800
@@ -28,6 +28,10 @@
   <import file="code_coverage.xml"/>
 
   <target name="load-properties">
+    <!-- set default values to run.test.jvmargs.external property -->
+    <condition property="run.test.jvmargs.external" value="">
+     <not><isset property="run.test.jvmargs.external"/></not>
+    </condition>     
     <!-- loading locally defined resources and properties. NB they owerwrite default ones defined later -->
     <property file="${user.home}/.nashorn.project.local.properties"/>
 
--- a/make/project.properties	Thu Dec 01 08:12:06 2016 -0800
+++ b/make/project.properties	Fri Dec 02 05:39:13 2016 -0800
@@ -355,6 +355,7 @@
 run.test.jvmargs.common=\
   -server \
   ${test.module.imports} \
+  ${run.test.jvmargs.external} \
   ${nashorn.override.option} \
   -Dfile.encoding=UTF-8 \
   -Duser.language=${run.test.user.language} \