From d6628ee66052601cd7c600ae162f1fb01df93a72 Mon Sep 17 00:00:00 2001
From: Srinivas Dama <srinivas.dama@oracle.com>
Date: Fri, 2 Dec 2016 05:39:13 -0800
Subject: [PATCH] 8168663: Nashorn: ant testng tests doesn't support external
 java options

Added new run.test.jvmargs.external property

Reviewed-by: sundar, hannesw
---
 nashorn/make/build.xml          | 4 ++++
 nashorn/make/project.properties | 1 +
 2 files changed, 5 insertions(+)

diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index 87d22bd4a92..cbf7f29bf22 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/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/nashorn/make/project.properties b/nashorn/make/project.properties
index 6fe7a0538f0..9b61ea87688 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -355,6 +355,7 @@ run.test.user.country=TR
 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} \