From: Ole Streicher <olebole@debian.org>
Date: Mon, 20 Feb 2017 11:01:05 +0100
Subject: Exclude some tests

FormatsTest and StorageTest depend on fits and votable, which shall
not be build-deps to avoid circular dependencies. So, during build we can't
test them. However, for CI tests we have everything available, and they
will be included in the test.

The FormatsTest needs to be adjusted to the supported formats.
---
 build.xml                                           | 9 +++++++++
 src/testcases/uk/ac/starlink/table/FormatsTest.java | 5 -----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index e915a3e..432aba2 100644
--- a/build.xml
+++ b/build.xml
@@ -313,6 +313,11 @@
                classname="uk.ac.starlink.util.DataSource"/>
     <fail message="No Util available" unless="util.present"/>
 
+    <!-- Need Votable and Fits for some testcases, not essential -->
+    <available property="votable.present"
+               classpathref="classpath"
+               classname="uk.ac.starlink.votable.VOTableWriter"/>
+
     <!-- Need JUnit for testcases, not essential -->
     <available property="junit.present"
                classpathref="classpath"
@@ -927,6 +932,8 @@
 
       <classpath refid="tests-classpath"/>
       <exclude name="uk/ac/starlink/table/join/SkyPixellatorTest.java"/>
+      <exclude name="uk/ac/starlink/table/FormatsTest.java" unless="votable.present"/>
+      <exclude name="uk/ac/starlink/table/storage/StorageTest.java" unless="votable.present"/>
 
     </javac>
 
@@ -965,6 +972,8 @@
         <fileset dir="${tests.dir}">
           <include name="**/*Test*"/>
           <exclude name="uk/ac/starlink/table/join/SkyPixellatorTest.java"/>
+          <exclude name="uk/ac/starlink/table/FormatsTest.java" unless="votable.present"/>
+          <exclude name="uk/ac/starlink/table/storage/StorageTest.java" unless="votable.present"/>
         </fileset>
       </batchtest>
 
diff --git a/src/testcases/uk/ac/starlink/table/FormatsTest.java b/src/testcases/uk/ac/starlink/table/FormatsTest.java
index 9004def..cd4de6a 100644
--- a/src/testcases/uk/ac/starlink/table/FormatsTest.java
+++ b/src/testcases/uk/ac/starlink/table/FormatsTest.java
@@ -216,8 +216,6 @@ public class FormatsTest extends TableCase {
             "colfits-basic",
             "FITS",
             "VOTable",
-            "CDF",
-            "GBIN",
         };
         String[] knownFormats = new String[] {
             "FITS-plus",
@@ -225,8 +223,6 @@ public class FormatsTest extends TableCase {
             "colfits-basic",
             "FITS",
             "VOTable",
-            "CDF",
-            "GBIN",
             "ASCII",
             "CSV",
             "TST",
@@ -289,7 +285,6 @@ public class FormatsTest extends TableCase {
             "html-element",
             "latex",
             "latex-document",
-            "mirage",
         };
         String[] gotFormats = new String[ handlers.size() ];
         for ( int j = 0; j < handlers.size(); j++ ) {