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: [email protected]
diff --git a/make/build.xml b/make/build.xml
index 87d22bd..cbf7f29 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -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"/>
diff --git a/make/project.properties b/make/project.properties
index 6fe7a05..9b61ea8 100644
--- a/make/project.properties
+++ b/make/project.properties
@@ -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} \
