WIP run tests using gradle test

As of now, the tests fail, likely due to https://saxonica.plan.io/issues/2212. Closes relaxng#269 Signed-off-by: David Thompson <[email protected]>
datho7561 · Sep 27, 2022 · 2100202 · 2100202
1 parent 84ec6ad
commit 2100202
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ doc/
 modbuild.xml
 modules.xml
 *.iml
+.gradle
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -75,6 +75,11 @@ tasks.named("build") {
 	dependsOn(jingTrang)
 }
 
+tasks.named("test") {
+	dependsOn(jingTrang)
+	dependsOn(":ant-test")
+}
+
 val antJar: TaskProvider<Task> = tasks.named("ant-jar")
 
 // https://stackoverflow.com/questions/27993814/only-run-task-if-another-isnt-up-to-date-in-gradle

diff --git a/build.xml b/build.xml
@@ -51,7 +51,7 @@
 </target>
 
 <target name="ant-test" depends="modbuild">
-  <ant antfile="modbuild.xml" target="ant-test"/>
+  <ant antfile="modbuild.xml" target="test"/>
 </target>
 
 <target name="srczip" depends="modbuild">
@@ -275,12 +275,12 @@
   </copy>
   <replace file="${build.dir}/jing-bin/readme.html" token="@VERSION@" value="${version}"/>
   <zip zipfile="${build.dir}/dist/jing-${version}.zip">
-    <zipfileset dir="${build.dir}" includes="jing.jar" prefix="jing-${version}/bin"/> 
+    <zipfileset dir="${build.dir}" includes="jing.jar" prefix="jing-${version}/bin"/>
     <zipfileset dir="lib" includes="saxon9.jar,isorelax.jar,xercesImpl.jar,xml-apis.jar"
-                prefix="jing-${version}/bin"/> 
+                prefix="jing-${version}/bin"/>
     <zipfileset dir="${build.dir}/mod/jing"
 		includes="src.zip"
-		prefix="jing-${version}"/> 
+		prefix="jing-${version}"/>
     <zipfileset dir="${build.dir}" includes="api/**" prefix="jing-${version}/doc"/>
     <zipfileset dir="eg" includes="relaxng.rng,xslt.rng,relaxCore.rng,relaxCoreDatatypes.rng"
                 prefix="jing-${version}/lib"/>
@@ -337,7 +337,7 @@
 		includes="trang.jar"
 		prefix="trang-${version}"/>
     <zipfileset dir="${build.dir}/mod/trang"
-		includes="src.zip" 
+		includes="src.zip"
 		prefix="trang-${version}"/>
   </zip>
   <checksum file="${build.dir}/dist/trang-${version}.zip" algorithm="sha1"/>
@@ -380,7 +380,7 @@
 		includes="dtdinst.jar"
 		prefix="dtdinst-${version}"/>
     <zipfileset dir="${build.dir}/mod/dtdinst"
-		includes="src.zip" 
+		includes="src.zip"
 		prefix="dtdinst-${version}"/>
   </zip>
   <checksum file="${build.dir}/dist/dtdinst-${version}.zip" algorithm="sha1"/>
@@ -430,24 +430,24 @@
 	description="Upload files to Google Code. Run dist before this.">
   <taskdef classname="net.bluecow.googlecode.ant.GoogleCodeUploadTask"
 	   classpath="${lib.dir}/ant-googlecode.jar" name="gcupload"/>
-  <gcupload username="${googlecode.username}" 
-            password="${googlecode.password}" 
-            projectname="jing-trang" 
-            targetfilename="jing-${version}.zip" 
+  <gcupload username="${googlecode.username}"
+            password="${googlecode.password}"
+            projectname="jing-trang"
+            targetfilename="jing-${version}.zip"
             filename="${build.dir}/dist/jing-${version}.zip"
             summary="Jing version ${version} packaged for use with JRE (includes binary, source and documentation)"
             labels="Featured, Type-Archive, OpSys-All, Version-${version}"/>
-  <gcupload username="${googlecode.username}" 
-            password="${googlecode.password}" 
-            projectname="jing-trang" 
-            targetfilename="trang-${version}.zip" 
+  <gcupload username="${googlecode.username}"
+            password="${googlecode.password}"
+            projectname="jing-trang"
+            targetfilename="trang-${version}.zip"
             filename="${build.dir}/dist/trang-${version}.zip"
             summary="Trang version ${version} packaged for use with JRE (includes binary, source and documentation)"
             labels="Featured, Type-Archive, OpSys-All, Version-${version}"/>
-  <gcupload username="${googlecode.username}" 
-            password="${googlecode.password}" 
-            projectname="jing-trang" 
-            targetfilename="dtdinst-${version}.zip" 
+  <gcupload username="${googlecode.username}"
+            password="${googlecode.password}"
+            projectname="jing-trang"
+            targetfilename="dtdinst-${version}.zip"
             filename="${build.dir}/dist/dtdinst-${version}.zip"
             summary="DTDinst version ${version} packaged for use with JRE (includes binary, source and documentation)"
             labels="Type-Archive, OpSys-All, Version-${version}"/>