[netbeans] branch master updated: Do not include jdk.jshell in test mod list by default.

[sd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sdedic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new 19739c84e5 Do not include jdk.jshell in test mod list by default.
     new 030c2f302a Merge pull request #4013 from sdedic/infra/mx-jdk11
19739c84e5 is described below

commit 19739c84e5fb6b8c87a3683be6a5b75bd4df344c
Author: Svata Dedic <sv...@oracle.com>
AuthorDate: Wed Apr 20 13:56:38 2022 +0200

    Do not include jdk.jshell in test mod list by default.
---
 nbbuild/default.xml               | 3 ++-
 nbbuild/templates/projectized.xml | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/nbbuild/default.xml b/nbbuild/default.xml
index a92a9f6d45..f72c31f2b2 100644
--- a/nbbuild/default.xml
+++ b/nbbuild/default.xml
@@ -246,6 +246,7 @@
           </filterchain>
       </loadfile>
       <property name="metabuild.jms-flags" value="${jms-base.flags}${jms-desktop.flags}${jms-compiler.flags}${jms-tools.flags}"/>
-      <property name="metabuild.jms-flags.jvm" value="${jms-base.flags.jvm}${jms-desktop.flags.jvm}${jms-compiler.flags.jvm}${jms-tools.flags.jvm}"/>
+      <!-- Excluding jms-tools.flags, as nbjavac usually overlaps with tools dependencies -->
+      <property name="metabuild.jms-flags.jvm" value="${jms-base.flags.jvm}${jms-desktop.flags.jvm}${jms-compiler.flags.jvm}"/>
   </target>
 </project>
diff --git a/nbbuild/templates/projectized.xml b/nbbuild/templates/projectized.xml
index 8b43dee857..4d6d39fa9e 100644
--- a/nbbuild/templates/projectized.xml
+++ b/nbbuild/templates/projectized.xml
@@ -289,7 +289,8 @@
     </target>
     <target name="test-lib-init" depends="-init-bootclasspath-prepend,init,-build-libs.junit4">
         <path id="test.unit.lib.cp"/>
-        <property name="test.run.args" value="-ea -Xmx700m ${metabuild.jms-flags.jvm} -XX:+IgnoreUnrecognizedVMOptions"/>
+        <property name="test.jms.flags" value=""/>
+        <property name="test.run.args" value="-ea -Xmx700m ${metabuild.jms-flags.jvm} ${test.jms.flags} -XX:+IgnoreUnrecognizedVMOptions"/>
         <property name="extra.test.libs.dir" location="${test.dist.dir}/extralibs"/>
         <macrodef name="test-init-nborg">
             <attribute name="test.type"/>
@@ -886,4 +887,4 @@
         </exec>
     </target>
     
-</project>
\ No newline at end of file
+</project>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists