JAL-3130 Some fixes to ant build xml, and the modules list file creation (to remove...

[jalview.git] / build-j11.xml

diff --git a/build-j11.xml b/build-j11.xml
index 6ed0b0f..4bc58b4 100755 (executable)
--- a/build-j11.xml
+++ b/build-j11.xml
@@ -324,6 +324,9 @@
   <taskdef resource="testngtasks" classpath="utils/testnglibs/testng.jar" />
 
   <target name="testng" depends="buildTests">
+    <loadfile property="j11modules" srcFile="modules"/>
+    <echo message="j11libDir is '${j11libDir}'" />
+    <echo message="j11modules is '${j11modules}'" />
     <testng outputDir="${reportDir}" haltOnFailure="false" groups="${testng-groups}" mode="testng"
       verbose="2">
       <classpath>
@@ -332,6 +335,7 @@
         <path refid="test.classpath" />
       </classpath>
       <jvmarg value="--module-path=${j11libDir}:${java.home}/jmods" if:set="java11"/>
+      <jvmarg value="--add-modules=${j11modules}" if:set="java11"/>
       <jvmarg value="--add-modules=java.se.ee" if:set="java9"/>
       <jvmarg value="--illegal-access=warn" if:set="java9"/>
       <classfileset dir="${testOutputDir}" includes="**/*.class" />
@@ -344,6 +348,7 @@
     </condition>
     <fail unless="propsSpecified" message="class.name property not specified."/>
     <echo message="testng-groups is '${testng-groups}'" />
+    <loadfile property="j11modules" srcFile="modules"/>
     <testng outputDir="${reportDir}" haltOnFailure="false" groups="${testng-groups}" mode="testng" verbose="2">
       <classpath>
         <pathelement location="${testOutputDir}" />
@@ -351,6 +356,7 @@
         <path refid="test.classpath" />
       </classpath>
       <jvmarg value="--module-path=${j11libDir}:${java.home}/jmods" if:set="java11"/>
+      <jvmarg value="--add-modules=${j11modules}" if:set="java11"/>
       <jvmarg value="--add-modules=java.se.ee" if:set="java9"/>
       <jvmarg value="--illegal-access=warn" if:set="java9"/>
       <classfileset dir="${testOutputDir}" includes="${class.name}" />