Merge pull request #141 from melissalinkert/9599

Use relative test target names
ome · Sep 18, 2012 · 2e7644f · 2e7644f
2 parents b111635 + cd70ab3
commit 2e7644f
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 42 deletions.
diff --git a/ant/toplevel.xml b/ant/toplevel.xml
@@ -187,6 +187,10 @@ Type "ant -p" for a list of targets.
     </copy>
   </target>
 
+  <target name="testing-deps"
+          description="performs any work necessary for testing"
+          depends="copy-jars"/>
+
   <!-- LOCI common library -->
 
   <target name="deps-common"/>
@@ -221,7 +225,7 @@ Type "ant -p" for a list of targets.
     <ant dir="components/common" target="common.utils"/>
   </target>
 
-  <target name="test-common" depends="jar-common"
+  <target name="test-common" depends="jar-common, testing-deps"
     description="compile and run tests for LOCI common library">
     <ant dir="components/common" target="test"/>
   </target>
@@ -255,9 +259,9 @@ Type "ant -p" for a list of targets.
     <ant dir="components/forks/jai" target="jai.clean"/>
   </target>
 
-  <target name="test-jai" depends="jar-jai"
+  <target name="test-jai" depends="jar-jai, testing-deps"
     description="compile and run tests for JAI Image I/O Tools library">
-    <ant dir="components/forks/jai" target="jai.test"/>
+    <ant dir="components/forks/jai" target="test"/>
   </target>
 
   <!-- Apache POI Java library -->
@@ -291,9 +295,9 @@ Type "ant -p" for a list of targets.
     <ant dir="components/forks/poi" target="poi-loci.clean"/>
   </target>
 
-  <target name="test-poi-loci" depends="jar-poi-loci"
+  <target name="test-poi-loci" depends="jar-poi-loci, testing-deps"
     description="compile and run tests for Apache POI library">
-    <ant dir="components/forks/poi" target="poi-loci.test"/>
+    <ant dir="components/forks/poi" target="test"/>
   </target>
 
   <!-- MDB Tools Java library -->
@@ -325,9 +329,9 @@ Type "ant -p" for a list of targets.
     <ant dir="components/forks/mdbtools" target="mdbtools.clean"/>
   </target>
 
-  <target name="test-mdbtools" depends="jar-mdbtools"
+  <target name="test-mdbtools" depends="jar-mdbtools, testing-deps"
     description="compile and run tests for MDB Tools Java library">
-    <ant dir="components/forks/mdbtools" target="mdbtools.test"/>
+    <ant dir="components/forks/mdbtools" target="test"/>
   </target>
 
   <!-- Metakit library -->
@@ -361,9 +365,9 @@ Type "ant -p" for a list of targets.
     <ant dir="components/metakit" target="metakit.clean"/>
   </target>
 
-  <target name="test-metakit" depends="jar-metakit"
+  <target name="test-metakit" depends="jar-metakit, testing-deps"
     description="compile and run tests for Metakit Java library">
-    <ant dir="components/metakit" target="metakit.test"/>
+    <ant dir="components/metakit" target="test"/>
   </target>
 
   <!-- OME-XML Java library -->
@@ -395,9 +399,9 @@ Type "ant -p" for a list of targets.
     <ant dir="components/ome-xml" target="ome-xml.clean"/>
   </target>
 
-  <target name="test-ome-xml" depends="jar-ome-xml"
+  <target name="test-ome-xml" depends="jar-ome-xml, testing-deps"
     description="compile and run tests for OME-XML Java library">
-    <ant dir="components/ome-xml" target="ome-xml.test"/>
+    <ant dir="components/ome-xml" target="test"/>
   </target>
 
   <!-- LWF stubs -->
@@ -429,9 +433,9 @@ Type "ant -p" for a list of targets.
     <ant dir="components/stubs/lwf-stubs" target="lwf-stubs.clean"/>
   </target>
 
-  <target name="test-lwf-stubs" depends="jar-lwf-stubs"
+  <target name="test-lwf-stubs" depends="jar-lwf-stubs, testing-deps"
     description="compile and run tests for LWF stubs">
-    <ant dir="components/stubs/lwf-stubs" target="lwf-stubs.test"/>
+    <ant dir="components/stubs/lwf-stubs" target="test"/>
   </target>
 
   <!-- SCIFIO -->
@@ -471,7 +475,7 @@ Type "ant -p" for a list of targets.
     <ant dir="components/scifio" target="scifio.clean"/>
   </target>
 
-  <target name="test-scifio" depends="jar-scifio"
+  <target name="test-scifio" depends="jar-scifio, testing-deps"
     description="compile and run tests for SCIFIO">
     <ant dir="components/scifio" target="test"/>
   </target>
@@ -522,7 +526,7 @@ Type "ant -p" for a list of targets.
     <ant dir="components/bio-formats" target="formats.utils"/>
   </target>
 
-  <target name="test-formats" depends="jar-formats"
+  <target name="test-formats" depends="jar-formats, testing-deps"
     description="compile and run tests for Bio-Formats">
     <ant dir="components/bio-formats" target="test"/>
   </target>
@@ -560,9 +564,9 @@ Type "ant -p" for a list of targets.
     <ant dir="components/autogen" target="autogen.clean"/>
   </target>
 
-  <target name="test-autogen" depends="jar-autogen"
+  <target name="test-autogen" depends="jar-autogen, testing-deps"
     description="compile and run tests for LOCI autogen">
-    <ant dir="components/autogen" target="autogen.test"/>
+    <ant dir="components/autogen" target="test"/>
   </target>
 
   <!-- LOCI Plugins for ImageJ -->
@@ -607,9 +611,9 @@ Type "ant -p" for a list of targets.
     <ant dir="components/loci-plugins" target="loci-plugins.utils"/>
   </target>
 
-  <target name="test-loci-plugins" depends="jar-loci-plugins"
+  <target name="test-loci-plugins" depends="jar-loci-plugins, testing-deps"
     description="compile and run tests for LOCI Plugins for ImageJ">
-    <ant dir="components/loci-plugins" target="loci-plugins.test"/>
+    <ant dir="components/loci-plugins" target="test"/>
   </target>
 
   <!-- OME I/O -->
@@ -647,7 +651,7 @@ Type "ant -p" for a list of targets.
     <ant dir="components/ome-io" target="ome-io.clean"/>
   </target>
 
-  <target name="test-ome-io" depends="jar-ome-io"
+  <target name="test-ome-io" depends="jar-ome-io, testing-deps"
     description="compile and run tests for OME I/O">
     <ant dir="components/ome-io" target="test"/>
   </target>
@@ -689,9 +693,9 @@ Type "ant -p" for a list of targets.
     <ant dir="components/ome-plugins" target="ome-plugins.clean"/>
   </target>
 
-  <target name="test-ome-plugins" depends="jar-ome-plugins"
+  <target name="test-ome-plugins" depends="jar-ome-plugins, testing-deps"
     description="compile and run tests for OME Plugins for ImageJ">
-    <ant dir="components/ome-plugins" target="ome-plugins.test"/>
+    <ant dir="components/ome-plugins" target="test"/>
   </target>
 
   <!-- LOCI testing framework -->
@@ -733,9 +737,9 @@ Type "ant -p" for a list of targets.
     <ant dir="components/test-suite" target="tests.clean"/>
   </target>
 
-  <target name="test-tests" depends="jar-tests"
+  <target name="test-tests" depends="jar-tests, testing-deps"
     description="compile and run tests for LOCI testing framework">
-    <ant dir="components/test-suite" target="tests.test"/>
+    <ant dir="components/test-suite" target="test"/>
   </target>
 
   <!-- OME Notes -->
@@ -771,9 +775,9 @@ Type "ant -p" for a list of targets.
     <ant dir="components/legacy/ome-notes" target="ome-notes.clean"/>
   </target>
 
-  <target name="test-ome-notes" depends="jar-ome-notes"
+  <target name="test-ome-notes" depends="jar-ome-notes, testing-deps"
     description="compile and run tests for OME Notes">
-    <ant dir="components/legacy/ome-notes" target="ome-notes.test"/>
+    <ant dir="components/legacy/ome-notes" target="test"/>
   </target>
 
   <!-- OME Metadata Editor -->
@@ -811,9 +815,9 @@ Type "ant -p" for a list of targets.
     <ant dir="components/legacy/ome-editor" target="ome-editor.clean"/>
   </target>
 
-  <target name="test-ome-editor" depends="jar-ome-editor"
+  <target name="test-ome-editor" depends="jar-ome-editor, testing-deps"
     description="compile and run tests for OME Metadata Editor">
-    <ant dir="components/legacy/ome-editor" target="ome-editor.test"/>
+    <ant dir="components/legacy/ome-editor" target="test"/>
   </target>
 
   <!-- Tool collections -->

diff --git a/components/bio-formats/build.xml b/components/bio-formats/build.xml
@@ -22,7 +22,7 @@ Type "ant -p" for a list of targets.
       <classpath>
         <pathelement location="${test-classes.dir}"/>
         <pathelement location="${classes.dir}"/>
-        <pathelement path="${component.classpath}"/>
+        <pathelement path="${component.runtime-cp}"/>
       </classpath>
       <xmlfileset file="${build.dir}/testng.xml"/>
       <jvmarg value="-mx${testng.memory}"/>
@@ -83,7 +83,7 @@ Type "ant -p" for a list of targets.
       <classpath>
         <pathelement location="${test-classes.dir}"/>
         <pathelement location="${classes.dir}"/>
-        <pathelement path="${component.classpath}"/>
+        <pathelement path="${component.runtime-cp}"/>
       </classpath>
       <classfileset file="${test-classes.dir}/loci/formats/utests/MetadataConfigurableTest.class"/>
       <sysproperty key="testng.filename" value="${testng.filename}"/>

diff --git a/components/ome-io/build.xml b/components/ome-io/build.xml
@@ -20,7 +20,7 @@ Type "ant -p" for a list of targets.
       <classpath>
         <pathelement location="${test-classes.dir}"/>
         <pathelement location="${classes.dir}"/>
-        <pathelement path="${component.classpath}"/>
+        <pathelement path="${component.runtime-cp}"/>
       </classpath>
       <xmlfileset file="${build.dir}/testng.xml"/>
       <jvmarg value="-mx${testng.memory}"/>

diff --git a/components/scifio/build.xml b/components/scifio/build.xml
@@ -22,7 +22,7 @@ Type "ant -p" for a list of targets.
       <classpath>
         <pathelement location="${test-classes.dir}"/>
         <pathelement location="${classes.dir}"/>
-        <pathelement path="${component.classpath}"/>
+        <pathelement path="${component.runtime-cp}"/>
       </classpath>
       <xmlfileset file="${build.dir}/testng.xml"/>
       <jvmarg value="-Dlurawave.license=XXX"/>

diff --git a/components/test-suite/build.xml b/components/test-suite/build.xml
@@ -58,7 +58,7 @@ Type "ant -p" for a list of targets.
       failureProperty="failedTest">
       <classpath>
         <pathelement location="${classes.dir}"/>
-        <pathelement path="${component.classpath}"/>
+        <pathelement path="${component.runtime-cp}"/>
       </classpath>
       <classfileset file="${classes.dir}/loci/tests/testng/CompressDecompressTest.class"/>
     </testng>
@@ -74,7 +74,7 @@ Type "ant -p" for a list of targets.
       failureProperty="failedTest">
       <classpath>
         <pathelement location="${classes.dir}"/>
-        <pathelement path="${component.classpath}"/>
+        <pathelement path="${component.runtime-cp}"/>
       </classpath>
       <classfileset file="${classes.dir}/${writer-test.class}"/>
       <sysproperty key="testng.filename" value="${testng.filename}"/>
@@ -94,7 +94,7 @@ Type "ant -p" for a list of targets.
       failureProperty="failedTest" useDefaultListeners="false">
       <classpath>
         <pathelement location="${classes.dir}"/>
-        <pathelement path="${component.classpath}"/>
+        <pathelement path="${component.runtime-cp}"/>
       </classpath>
       <classfileset file="${classes.dir}/${reader-test.class}"/>
       <sysproperty key="testng.toplevel-config" value="${testng.toplevel-config}"/>
@@ -119,7 +119,7 @@ Type "ant -p" for a list of targets.
       failureProperty="failedTest">
       <classpath>
         <pathelement location="${classes.dir}"/>
-        <pathelement path="${component.classpath}"/>
+        <pathelement path="${component.runtime-cp}"/>
       </classpath>
       <classfileset file="${classes.dir}/${reader-test.class}"/>
       <sysproperty key="testng.toplevel-config" value="${testng.toplevel-config}"/>
@@ -144,7 +144,7 @@ Type "ant -p" for a list of targets.
       failureProperty="failedTest" useDefaultListeners="false">
       <classpath>
         <pathelement location="${classes.dir}"/>
-        <pathelement path="${component.classpath}"/>
+        <pathelement path="${component.runtime-cp}"/>
       </classpath>
       <classfileset file="${classes.dir}/${reader-test.class}"/>
       <sysproperty key="testng.toplevel-config" value="${testng.toplevel-config}"/>
@@ -169,7 +169,7 @@ Type "ant -p" for a list of targets.
       failureProperty="failedTest">
       <classpath>
         <pathelement location="${classes.dir}"/>
-        <pathelement path="${component.classpath}"/>
+        <pathelement path="${component.runtime-cp}"/>
       </classpath>
       <classfileset file="${classes.dir}/${reader-test.class}"/>
       <sysproperty key="testng.toplevel-config" value="${testng.toplevel-config}"/>
@@ -194,7 +194,7 @@ Type "ant -p" for a list of targets.
       failureProperty="failedTest">
       <classpath>
         <pathelement location="${classes.dir}"/>
-        <pathelement path="${component.classpath}"/>
+        <pathelement path="${component.runtime-cp}"/>
       </classpath>
       <classfileset file="${classes.dir}/${reader-test.class}"/>
       <sysproperty key="testng.toplevel-config" value="${testng.toplevel-config}"/>
@@ -219,7 +219,7 @@ Type "ant -p" for a list of targets.
       failureProperty="failedTest">
       <classpath>
         <pathelement location="${classes.dir}"/>
-        <pathelement path="${component.classpath}"/>
+        <pathelement path="${component.runtime-cp}"/>
       </classpath>
       <classfileset file="${classes.dir}/${reader-test.class}"/>
       <sysproperty key="testng.toplevel-config" value="${testng.toplevel-config}"/>
@@ -244,7 +244,7 @@ Type "ant -p" for a list of targets.
       failureProperty="failedTest">
       <classpath>
         <pathelement location="${classes.dir}"/>
-        <pathelement path="${component.classpath}"/>
+        <pathelement path="${component.runtime-cp}"/>
       </classpath>
       <classfileset file="${classes.dir}/${reader-test.class}"/>
       <sysproperty key="testng.toplevel-config" value="${testng.toplevel-config}"/>
@@ -269,7 +269,7 @@ Type "ant -p" for a list of targets.
       failureProperty="failedTest">
       <classpath>
         <pathelement location="${classes.dir}"/>
-        <pathelement path="${component.classpath}"/>
+        <pathelement path="${component.runtime-cp}"/>
       </classpath>
       <classfileset file="${classes.dir}/${reader-test.class}"/>
       <sysproperty key="testng.toplevel-config" value="${testng.toplevel-config}"/>