Commit e2501fb4 authored by Ole Streicher's avatar Ole Streicher

Use build.xml for CI tests instead of specific one

parent df080031
......@@ -21,11 +21,11 @@ This includes the following changes:
* Don't sign the jarfile
---
build.xml | 72 +++++++++++++++++++++++++--------------------------------------
1 file changed, 28 insertions(+), 44 deletions(-)
build.xml | 73 +++++++++++++++++++++++++--------------------------------------
1 file changed, 29 insertions(+), 44 deletions(-)
diff --git a/build.xml b/build.xml
index 00c4e1f..4d2c5a3 100644
index 00c4e1f..c37f085 100644
--- a/build.xml
+++ b/build.xml
@@ -37,12 +37,6 @@
......@@ -125,7 +125,15 @@ index 00c4e1f..4d2c5a3 100644
<path id="built.classpath">
@@ -374,7 +359,8 @@
@@ -281,6 +266,7 @@
<pathelement location="${tests.dir}"/>
<pathelement location="${tests.etc.dir}"/>
<path refid="classpath"/>
+ <pathelement location="${star.jar.dir}/${name}.jar"/>
</path>
<!-- Turn this path into a string which is passed to the tests -->
@@ -374,7 +360,8 @@
destdir="${build.classes}"
debug="${debug}"
deprecation="${deprecation}"
......@@ -135,7 +143,7 @@ index 00c4e1f..4d2c5a3 100644
optimize="${optimize}">
<classpath refid="classpath"/>
@@ -405,6 +391,10 @@
@@ -405,6 +392,10 @@
description="-> creates the package jar file">
<mkdir dir="${dist.lib.pkg}"/>
......@@ -146,7 +154,7 @@ index 00c4e1f..4d2c5a3 100644
<jar destfile="${dist.lib.pkg}/${name}.jar"
basedir="${build.classes}">
<manifest>
@@ -415,13 +405,6 @@
@@ -415,13 +406,6 @@
<zip destfile="${dist.lib.pkg}/${name}_src.zip" basedir="${java.dir}"/>
......@@ -160,7 +168,7 @@ index 00c4e1f..4d2c5a3 100644
</target>
<!--
@@ -802,7 +785,7 @@
@@ -802,7 +786,7 @@
windowtitle="${Name} API"
doctitle="${Name}"
defaultexcludes="yes"
......@@ -169,7 +177,7 @@ index 00c4e1f..4d2c5a3 100644
classpathref="classpath">
<!-- Get a list of directories that name all the potential
@@ -888,7 +871,8 @@
@@ -888,7 +872,8 @@
<javac srcdir="${tests.dir}"
destdir="${build.tests}"
debug="${debug}"
......
......@@ -12,10 +12,10 @@ Subject: Use latest nom.tam.fits API
6 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/src/main/uk/ac/starlink/fits/AbstractArrayDataIO.java b/src/main/uk/ac/starlink/fits/AbstractArrayDataIO.java
index fe9dfaa..9c04a6d 100644
index 24065f6..8b81173 100644
--- a/src/main/uk/ac/starlink/fits/AbstractArrayDataIO.java
+++ b/src/main/uk/ac/starlink/fits/AbstractArrayDataIO.java
@@ -322,6 +322,10 @@ public abstract class AbstractArrayDataIO
@@ -314,6 +314,10 @@ public abstract class AbstractArrayDataIO
return primitiveArrayRecurse( o, nread );
}
......
Test-Command: ant test -f debian/tests/test-starjava.xml -Dbuild.dir=$ADTTMP -Dcomponent=starlink-fits
Test-Command: ant test -Dbuild.dir=$ADTTMP -Drunonly.install=true -Djunit.present=true -Djava.awt.headless=true
Depends: starlink-fits-java,
ant, ant-optional, default-jdk, junit
<?xml version="1.0"?>
<project name="Starjava CI tests" default="test" basedir=".">
<property name="build.dir" value="build"/>
<property name="src.dir" value="../../src"/>
<property name="build.tests" value="${build.dir}/testcases"/>
<property name="tests.dir" value="${src.dir}/testcases"/>
<property name="debug" value="true"/>
<property name="deprecation" value="false"/>
<property name="junit.fork" value="true"/>
<property name="junit.filtertrace" value="off"/>
<property name="junit.summary" value="no"/>
<path id="tests-classpath">
<pathelement location="/usr/share/java/${component}.jar"/>
<pathelement location="/usr/share/java/junit.jar"/>
<pathelement location="${build.tests}"/>
<pathelement location="${tests.dir}"/>
</path>
<target name="compile-tests">
<mkdir dir="${build.tests}"/>
<javac srcdir="${tests.dir}"
destdir="${build.tests}"
debug="${debug}"
includeantruntime="false"
encoding="cp1252"
deprecation="${deprecation}" >
<classpath refid="tests-classpath"/>
<exclude name="uk/ac/starlink/fits/FitsNdxTest.java"/>
</javac>
</target>
<target name="test" depends="compile-tests">
<junit printsummary="${junit.summary}" haltonfailure="yes"
filtertrace="${junit.filtertrace}"
fork="${junit.fork}">
<jvmarg value="-enableassertions"/>
<classpath refid="tests-classpath"/>
<sysproperty key="java.io.tmpdir" value="${build.tests}"/>
<sysproperty key="build.tests" value="${build.tests}"/>
<sysproperty key="tests-classpath.value"
value="${tests-classpath.value}"/>
<sysproperty key="java.awt.headless" value="true"/>
<formatter type="plain" usefile="false"/>
<batchtest>
<fileset dir="${tests.dir}">
<include name="**/*Test.java"/>
<exclude name="uk/ac/starlink/fits/FitsNdxTest.java"/>
</fileset>
</batchtest>
</junit>
</target>
</project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment