You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2010/07/15 02:02:59 UTC
svn commit: r964263 - in /incubator/lcf/trunk/modules: build.xml
filesystem-tests/ sharepoint-tests/ tests/
Author: kwright
Date: Thu Jul 15 00:02:59 2010
New Revision: 964263
URL: http://svn.apache.org/viewvc?rev=964263&view=rev
Log:
Move some stuff around so that tests for conditionally compiled connectors can be conditionally run.
Added:
incubator/lcf/trunk/modules/filesystem-tests/
- copied from r963156, incubator/lcf/trunk/modules/tests/
incubator/lcf/trunk/modules/sharepoint-tests/
Removed:
incubator/lcf/trunk/modules/tests/
Modified:
incubator/lcf/trunk/modules/build.xml
Modified: incubator/lcf/trunk/modules/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/build.xml?rev=964263&r1=964262&r2=964263&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/build.xml (original)
+++ incubator/lcf/trunk/modules/build.xml Thu Jul 15 00:02:59 2010
@@ -676,8 +676,8 @@
<jar destfile="dist/example/start.jar" manifest="build/example/manifest"/>
</target>
- <target name="calculate-tests-condition" depends="calculate-filesystem-condition,calculate-nulloutput-condition">
- <condition property="tests.include">
+ <target name="calculate-filesystem-tests-condition" depends="calculate-filesystem-condition,calculate-nulloutput-condition">
+ <condition property="filesystem-tests.include">
<and>
<isset property="filesystem.include"/>
<isset property="nulloutput.include"/>
@@ -685,9 +685,18 @@
</condition>
</target>
- <target name="compile-tests" depends="build-framework,calculate-tests-condition,build-filesystem-connector,build-nulloutput-connector" if="tests.include">
- <mkdir dir="build/tests/classes"/>
- <javac srcdir="tests" destdir="build/tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+ <target name="calculate-sharepoint-tests-condition" depends="calculate-sharepoint-condition,calculate-nulloutput-condition">
+ <condition property="sharepoint-tests.include">
+ <and>
+ <isset property="sharepoint.include"/>
+ <isset property="nulloutput.include"/>
+ </and>
+ </condition>
+ </target>
+
+ <target name="compile-filesystem-tests" depends="build-framework,calculate-filesystem-tests-condition,build-filesystem-connector,build-nulloutput-connector" if="filesystem-tests.include">
+ <mkdir dir="build/filesystem-tests/classes"/>
+ <javac srcdir="filesystem-tests" destdir="build/filesystem-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
<classpath>
<fileset dir="framework/lib">
<include name="*.jar"/>
@@ -703,9 +712,27 @@
</javac>
</target>
- <target name="run-tests" depends="compile-tests,calculate-tests-condition" if="tests.include">
- <mkdir dir="test-output"/>
- <junit fork="true" maxmemory="128m" dir="test-output" showoutput="true">
+ <target name="compile-sharepoint-tests" depends="build-framework,calculate-sharepoint-tests-condition,build-sharepoint-connector,build-nulloutput-connector" if="sharepoint-tests.include">
+ <mkdir dir="build/sharepoint-tests/classes"/>
+ <javac srcdir="sharepoint-tests" destdir="build/sharepoint-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+ <classpath>
+ <fileset dir="framework/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement location="framework/build/core/classes"/>
+ <pathelement location="framework/build/ui-core/classes"/>
+ <pathelement location="framework/build/agents/classes"/>
+ <pathelement location="framework/build/pull-agent/classes"/>
+ <pathelement location="framework/build/tests/classes"/>
+ <pathelement location="connectors/sharepoint/build/connector/classes"/>
+ <pathelement location="connectors/nulloutput/build/connector/classes"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="run-filesystem-tests" depends="compile-filesystem-tests,calculate-filesystem-tests-condition" if="filesystem-tests.include">
+ <mkdir dir="test-output/filesystem"/>
+ <junit fork="true" maxmemory="128m" dir="test-output/filesystem" showoutput="true">
<classpath>
<fileset dir="framework/lib">
<include name="*.jar"/>
@@ -717,13 +744,35 @@
<pathelement location="framework/build/tests/classes"/>
<pathelement location="connectors/filesystem/build/connector/classes"/>
<pathelement location="connectors/nulloutput/build/connector/classes"/>
- <pathelement location="build/tests/classes"/>
+ <pathelement location="build/filesystem-tests/classes"/>
+ </classpath>
+ <test name="org.apache.lcf.tests.Sanity" todir="test-output/filesystem"/>
+ <!-- MHL -->
+ </junit>
+ </target>
+
+ <target name="run-sharepoint-tests" depends="compile-sharepoint-tests,calculate-sharepoint-tests-condition" if="sharepoint-tests.include">
+ <mkdir dir="test-output/sharepoint"/>
+ <junit fork="true" maxmemory="128m" dir="test-output/sharepoint" showoutput="true">
+ <classpath>
+ <fileset dir="framework/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement location="framework/build/core/classes"/>
+ <pathelement location="framework/build/ui-core/classes"/>
+ <pathelement location="framework/build/agents/classes"/>
+ <pathelement location="framework/build/pull-agent/classes"/>
+ <pathelement location="framework/build/tests/classes"/>
+ <pathelement location="connectors/sharepoint/build/connector/classes"/>
+ <pathelement location="connectors/nulloutput/build/connector/classes"/>
+ <pathelement location="build/sharepoint-tests/classes"/>
</classpath>
- <test name="org.apache.lcf.tests.Sanity" todir="test-output"/>
<!-- MHL -->
</junit>
</target>
+ <target name="run-tests" depends="run-filesystem-tests,run-sharepoint-tests"/>
+
<target name="deliver-open-connectors" depends="deliver-activedirectory-connector,deliver-filesystem-connector,deliver-rss-connector,deliver-webcrawler-connector,deliver-jdbc-connector"/>
<target name="deliver-output-connectors" depends="deliver-gts-connector,deliver-solr-connector,deliver-nulloutput-connector"/>