svn commit: r1634649 - /manifoldcf/trunk/framework/build.xml

[kw...@apache.org]

Author: kwright
Date: Mon Oct 27 19:10:53 2014
New Revision: 1634649

URL: http://svn.apache.org/r1634649
Log:
Fix the connector-common test build

Modified:
    manifoldcf/trunk/framework/build.xml

Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1634649&r1=1634648&r2=1634649&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Mon Oct 27 19:10:53 2014
@@ -1650,6 +1650,18 @@
         </javac>
     </target>
 
+    <target name="compile-connector-common-tests" depends="compile-connector-common">
+        <mkdir dir="build/connector-common-tests/classes"/>
+        <javac srcdir="connector-common/src/test/java" destdir="build/connector-common-tests/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+            <classpath>
+                <path refid="framework-classpath"/>
+                <pathelement location="build/core/classes"/>
+                <pathelement location="build/core-tests/classes"/>
+                <pathelement location="build/connector-common/classes"/>
+            </classpath>
+        </javac>
+    </target>
+
     <target name="compile-agents-tests" depends="compile-core-tests,compile-agents">
         <mkdir dir="build/agents-tests/classes"/>
         <javac srcdir="agents/src/test/java" destdir="build/agents-tests/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
@@ -1746,14 +1758,29 @@
             <formatter type="brief" usefile="false"/>
 
             <test name="org.apache.manifoldcf.core.common.DateTest" todir="test-output"/>
-            <test name="org.apache.manifoldcf.core.fuzzyml.TestFuzzyML" todir="test-output"/>
-            <test name="org.apache.manifoldcf.core.jsongen.TestJsonGen" todir="test-output"/>
             <test name="org.apache.manifoldcf.core.lockmanager.TestZooKeeperLocks" todir="test-output"/>
             <test name="org.apache.manifoldcf.core.throttler.TestThrottler" todir="test-output"/>
 
         </junit>
     </target>
 
+    <target name="run-connector-common-tests" depends="compile-connector-common,compile-connector-common-tests,compile-core">
+        <mkdir dir="test-output"/>
+        <junit fork="true" maxmemory="128m" dir="test-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
+            <classpath>
+                <path refid="framework-classpath"/>
+                <pathelement location="build/core/classes"/>
+                <pathelement location="build/connector-common/classes"/>
+                <pathelement location="build/connector-common-tests/classes"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <test name="org.apache.manifoldcf.connectorcommon.fuzzyml.TestFuzzyML" todir="test-output"/>
+            <test name="org.apache.manifoldcf.connectorcommon.jsongen.TestJsonGen" todir="test-output"/>
+
+        </junit>
+    </target>
+
     <target name="run-pull-agent-tests" depends="compile-pull-agent,compile-pull-agent-tests">
         <mkdir dir="test-output"/>
         <junit fork="true" maxmemory="128m" dir="test-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
@@ -1807,7 +1834,7 @@
         </junit>
     </target>
 
-    <target name="run-tests" depends="compile-tests,run-core-tests,run-pull-agent-tests,run-script-engine-tests"/>
+    <target name="run-tests" depends="compile-tests,run-core-tests,run-connector-common-tests,run-pull-agent-tests,run-script-engine-tests"/>
 
     <target name="run-tests-postgresql" depends="compile-tests">
         <mkdir dir="test-postgresql-output"/>